update filetypes for yaml languages

lazy-lock.json

@@ -9,7 +9,6 @@
   "gitsigns.nvim": { "branch": "main", "commit": "6bd29494e3f79ff08be1d35bc1926ed23c22ed9a" },
   "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
-  "hererocks": { "branch": "master", "commit": "3856f1b4fb69a9f683f1eb146a4cd49a67478419" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
   "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },

lua/crentist/filetype.lua

@@ -1,27 +1,25 @@
 vim.filetype.add({
     extension = {
         ['tf'] = 'terraform',
-    },
-    pattern = {
-        ['.*/playbooks/.*%.ya?ml'] = 'yaml_ansible',
-        ['.*/roles/.*%.ya?ml'] = 'yaml_ansible',
-        ['.*/tasks/.*%.ya?ml'] = 'yaml_ansible',
-        ['.*/plays/.*%.ya?ml'] = 'yaml_ansible',
-    },
-})
-
-vim.filetype.add({
-    extension = {
         j2 = 'jinja',
         jinja = 'jinja',
         jinja2 = 'jinja',
-    }
+    },
-})
-
-vim.filetype.add({
     pattern = {
-    ['%.gitlab%-ci%.ya?ml'] = 'yaml_gitlab',
+        ['.*/playbooks/.*%.ya?ml'] = 'yaml.ansible',
-    ['pipelines/.*%.ya?ml'] = 'yaml_gitlab',
+        ['.*/roles/.*%.ya?ml'] = 'yaml.ansible',
+        ['.*/tasks/.*%.ya?ml'] = 'yaml.ansible',
+        ['.*/plays/.*%.ya?ml'] = 'yaml.ansible',
+        -- templates
+        ['.*/templates/.*%.ya?ml'] = 'helm',
+        ['.*/templates/.*%.tpl'] = 'helm',
+        ['helmfile%.ya?ml'] = 'helm',
+        -- values files
+        ['.*/helm/.*values.*%.ya?ml'] = 'yaml.helm-values',
+        ['values%.ya?ml'] = 'yaml.helm-values',
+        -- gitlab-ci
+        ['%.gitlab%-ci%.ya?ml'] = 'yaml.gitlab',
+        ['pipelines/.*%.ya?ml'] = 'yaml.gitlab',
       },
 })
 

lua/crentist/lazy/lsp.lua

@@ -33,8 +33,6 @@ return {
         ---@type MasonLspconfigSettings
         require('mason-lspconfig').setup({
             automatic_enable = true,
-            -- Replace the language servers listed here
-            -- with the ones you want to install
             ensure_installed = {
                 'ts_ls',
                 'lua_ls',
@@ -58,7 +56,7 @@ return {
         ---@type lspconfig.Config
         vim.lsp.config('pylsp', {
             settings = {
-                ['pylsp'] = {
+                pylsp = {
                     plugins = {
                         autopep8 = {
                             enabled = false,
@@ -77,13 +75,19 @@ return {
 
         vim.lsp.config('helm_ls', {
             settings = {
-                ['helm_ls'] = {
+                helm_ls = {
-                    helmLint = { enabled = false },
                     yamlls = { enabled = false },
                 },
             }
         })
 
+        vim.lsp.config('yamlls', {
+            filetypes = { 'yaml' },
+            settings = {
+                yaml = { enable = true, },
+            }
+        })
+
         vim.lsp.config('terraformls', {
             filetypes = { 'terraform', 'terraform-vars' },
             -- run terraformls once for a git repo

lua/crentist/lazy/treesitter.lua

@@ -22,7 +22,6 @@ return {
             "vimdoc",
             "latex",
             "json",
-            "yaml",
             "git_config",
             "git_rebase",
             "gitattributes",
@@ -43,6 +42,7 @@ return {
         }
         ts.setup()
         ts.install(installed_parsers)
+        vim.treesitter.language.register('yaml', 'yaml_gitlab')
     end
 }