home: vim: move 'on_attach' to 'ambroisie.lsp'

home/vim/plugin/settings/lspconfig.vim

@@ -1,5 +1,6 @@
 lua << EOF
 local lspconfig = require("lspconfig")
+local lsp = require("ambroisie.lsp")
 local utils = require("ambroisie.utils")
 
 -- Inform servers we are able to do completion, snippets, etc...
@@ -10,7 +11,7 @@ capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities)
 if utils.is_executable("clangd") then
     lspconfig.clangd.setup({
         capabilities = capabilities,
-        on_attach = utils.on_attach,
+        on_attach = lsp.on_attach,
     })
 end
 
@@ -18,7 +19,7 @@ end
 if utils.is_executable("rnix-lsp") then
     lspconfig.rnix.setup({
         capabilities = capabilities,
-        on_attach = utils.on_attach,
+        on_attach = lsp.on_attach,
     })
 end
 
@@ -26,7 +27,7 @@ end
 if utils.is_executable("pyright") then
     lspconfig.pyright.setup({
         capabilities = capabilities,
-        on_attach = utils.on_attach,
+        on_attach = lsp.on_attach,
     })
 end
 
@@ -34,7 +35,7 @@ end
 if utils.is_executable("rust-analyzer") then
     lspconfig.rust_analyzer.setup({
         capabilities = capabilities,
-        on_attach = utils.on_attach,
+        on_attach = lsp.on_attach,
     })
 end
 EOF

home/vim/plugin/settings/null-ls.vim

@@ -1,9 +1,10 @@
 lua << EOF
 local null_ls = require("null-ls")
+local lsp = require("ambroisie.lsp")
 local utils = require("ambroisie.utils")
 
 null_ls.setup({
-    on_attach = utils.on_attach,
+    on_attach = lsp.on_attach,
 })
 
 -- C, C++