stuff and stuff

mosheavni · Apr 30, 2024 · 5204a47 · 5204a47
1 parent 45b90db
commit 5204a47
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 41 deletions.
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
@@ -24,8 +24,8 @@
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
   "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
   "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
-  "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" },
-  "fzf-lua": { "branch": "main", "commit": "2a1bb74da8e409d8c534a8f43d7fb0f8acc85207" },
+  "friendly-snippets": { "branch": "main", "commit": "d5f74ce4dfdd82848f3f4eac65fe6e29ac5df4c2" },
+  "fzf-lua": { "branch": "main", "commit": "da3e7e1fc07286d3534185cc80438e2a2f82bfcc" },
   "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
   "git-dev.nvim": { "branch": "master", "commit": "5808fe220441a7ed70a2882d91912353337c6035" },
   "global-note.nvim": { "branch": "main", "commit": "1e0d4bba425d971ed3ce40d182c574a25507115c" },
@@ -57,33 +57,33 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
   "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
   "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
-  "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
+  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
   "nvim-hlslens": { "branch": "main", "commit": "3e8fceb2b030100857ee72741a8f48c9a1d8595e" },
   "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
   "nvim-lsp-basics": { "branch": "main", "commit": "632714bd3ab355eb6e725b5a78cd8730f12d14d2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
+  "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
   "nvim-lua-gf": { "branch": "main", "commit": "ca712497b2bab6351518917be219e9bfd8d63e4f" },
   "nvim-luaref": { "branch": "main", "commit": "9cd3ed50d5752ffd56d88dd9e395ddd3dc2c7127" },
-  "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
+  "nvim-nio": { "branch": "master", "commit": "79e8968769d4422c08d514a413815bea6c1f67f9" },
   "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
   "nvim-pqf": { "branch": "main", "commit": "ba0e291cb5c0249838132e197dac082777bdc7d6" },
-  "nvim-tree.lua": { "branch": "master", "commit": "5a18b9827491aa1aea710bc9b85c6b63ed0dad14" },
-  "nvim-treesitter": { "branch": "master", "commit": "0883ff05655117a3fc79ab295a640c4984cfd415" },
+  "nvim-tree.lua": { "branch": "master", "commit": "347e1eb35264677f66a79466bb5e3d111968e12c" },
+  "nvim-treesitter": { "branch": "master", "commit": "121d0c4c6718833ccbaaa4c32a9be0d0a6aab7c1" },
   "nvim-treesitter-context": { "branch": "master", "commit": "4fe0a54e86859744968e1a5c7867b49c86855774" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "156d5782b3a68845f824156e45fc5bb038211e7b" },
   "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" },
   "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" },
   "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
-  "nvim-web-devicons": { "branch": "master", "commit": "27eac98fd6675d29d0e19d4d0622fd7a3968483a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" },
   "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
   "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
   "sonokai": { "branch": "master", "commit": "da162343354fbd9bf9cd49293a856f0e3761e8ac" },
   "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" },
-  "statuscol.nvim": { "branch": "0.10", "commit": "e9e4c30b68abe456d80a0b144149ebf3f4527ed8" },
+  "statuscol.nvim": { "branch": "0.10", "commit": "ef3617d0c8cfaa29f7bcdaa8b7cc35df2a409bae" },
   "switch.vim": { "branch": "main", "commit": "68d269301181835788dcdcb6d5bca337fb954395" },
   "template-string.nvim": { "branch": "main", "commit": "419bfb2e4d5f0e6ddd0d4435f85b69da0d88d524" },
   "treemonkey.nvim": { "branch": "main", "commit": "1fe117cc25b283c33209136e8d48cea078939d6d" },

diff --git a/.config/nvim/lua/plugins/cmpconf.lua b/.config/nvim/lua/plugins/cmpconf.lua
@@ -180,13 +180,13 @@ M.config = function()
       },
     },
     sources = cmp.config.sources {
-      { name = 'nvim_lsp', priority = 100 },
+      { name = 'nvim_lsp',               priority = 100 },
       { name = 'luasnip' },
       { name = 'nvim_lua' },
       { name = 'nvim_lsp_signature_help' },
       { name = 'cmp_tabnine' },
       { name = 'path' },
-      { name = 'buffer', keyword_length = 4 },
+      { name = 'buffer',                 keyword_length = 4 },
     },
     snippet = {
       expand = function(args)

diff --git a/.config/nvim/lua/user/lsp/servers.lua b/.config/nvim/lua/user/lsp/servers.lua
@@ -172,7 +172,7 @@ M.setup = function()
         cmd = { 'helm_ls', 'serve' },
         filetypes = { 'helm', 'gotmpl' },
         root_dir = function(fname)
-          return util.root_pattern 'Chart.yaml'(fname)
+          return util.root_pattern 'Chart.yaml' (fname)
         end,
       },
     }
@@ -182,6 +182,36 @@ M.setup = function()
     capabilities = capabilities,
   }
 
+  local yaml_lspconfig = {
+    on_attach = function(c, b)
+      local filetype = vim.api.nvim_get_option_value('filetype', { buf = b })
+      local buftype = vim.api.nvim_get_option_value('buftype', { buf = b })
+      local disabled_fts = { 'helm', 'yaml.gotexttmpl', 'gotmpl' }
+      if buftype ~= '' or filetype == '' or vim.tbl_contains(disabled_fts, filetype) then
+        vim.diagnostic.enable(false, b)
+        vim.defer_fn(function()
+          vim.diagnostic.reset(nil, b)
+        end, 1000)
+      end
+      default_on_attach(c, b)
+    end,
+    capabilities = vim.tbl_deep_extend('force', capabilities, {
+      textDocument = {
+        foldingRange = {
+          dynamicRegistration = true,
+        },
+      },
+    }),
+    cmd = { 'node', vim.fn.expand '~/Repos/yaml-language-server/out/server/src/server.js', '--stdio' },
+    settings = {
+      yaml = {
+        schemas = {
+          kubernetes = '/*',
+        },
+      },
+    },
+  }
+
   local yaml_cfg = require('yaml-companion').setup {
     builtin_matchers = {
       -- Detects Kubernetes files based on content
@@ -197,35 +227,7 @@ M.setup = function()
         uri = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.26.14-standalone-strict/all.json',
       },
     },
-    lspconfig = {
-      on_attach = function(c, b)
-        local filetype = vim.api.nvim_get_option_value('filetype', { buf = b })
-        local buftype = vim.api.nvim_get_option_value('buftype', { buf = b })
-        local disabled_fts = { 'helm', 'yaml.gotexttmpl', 'gotmpl' }
-        if buftype ~= '' or filetype == '' or vim.tbl_contains(disabled_fts, filetype) then
-          vim.diagnostic.enable(false, b)
-          vim.defer_fn(function()
-            vim.diagnostic.reset(nil, b)
-          end, 1000)
-        end
-        default_on_attach(c, b)
-      end,
-      capabilities = vim.tbl_deep_extend('force', capabilities, {
-        textDocument = {
-          foldingRange = {
-            dynamicRegistration = true,
-          },
-        },
-      }),
-      cmd = { 'node', vim.fn.expand '~/Repos/yaml-language-server/out/server/src/server.js', '--stdio' },
-      settings = {
-        yaml = {
-          schemas = {
-            kubernetes = '/*',
-          },
-        },
-      },
-    },
+    lspconfig = yaml_lspconfig,
   }
   require('lspconfig')['yamlls'].setup(yaml_cfg)
 end