init.lua @ 3713a0c2732f960d07afa1de911db7fb600b58a8

M filetype.lua

@@ -5,6 +5,7 @@
 vim.filetype.add {
   extension = {
     lock = "yaml",
+    gotmpl = "gotmpl",
   },
   filename = {
     [".gitignore"] = "conf",

M lua/plugins/lsp/servers.lua

@@ -1,20 +1,21 @@
 local lspconfig = require "lspconfig"
+local html_ft = {
+  "html",
+  "typescriptreact",
+  "javascriptreact",
+  "css",
+  "scss",
+  "astro",
+  "gotmpl",
+}
 
 return {
   denols = { root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc") },
   tsserver = { root_dir = lspconfig.util.root_pattern "package.json" },
   rust_analyzer = {},
   clojure_lsp = {},
-  emmet_ls = {
-    filetypes = {
-      "html",
-      "typescriptreact",
-      "javascriptreact",
-      "css",
-      "scss",
-      "astro",
-    },
-  },
+  html = { filetypes = html_ft },
+  emmet_language_server = { filetypes = html_ft },
   astro = {},
   dockerls = {},
   gopls = {

M lua/plugins/treesitter.lua

@@ -14,12 +14,11 @@ end)
   end,
   config = function()
     require("nvim-treesitter.parsers").get_parser_configs().gotmpl = {
+      filetype = "gotmpl",
       install_info = {
         url = "https://github.com/ngalaiko/tree-sitter-go-template",
         files = { "src/parser.c" },
       },
-      filetype = "gotmpl",
-      used_by = { "gohtmltmpl", "gotexttmpl", "gotmpl", "yaml" },
     }
 
     require("nvim-treesitter.configs").setup {
@@ -34,6 +33,9 @@ "fish",
         "gitignore",
         "gitcommit",
         "query",
+        "sql",
+        "html",
+        "json",
       },
       indent = { enable = true, disable = { "python" } },
       highlight = { enable = true, additional_vim_regex_highlighting = false },