diff --git a/home-modules/explicit-configs/nvim/init.lua b/home-modules/explicit-configs/nvim/init.lua index 11e067a..efd9e23 100644 --- a/home-modules/explicit-configs/nvim/init.lua +++ b/home-modules/explicit-configs/nvim/init.lua @@ -13,12 +13,9 @@ require('lsp.typescript-ls') require('lsp.python-ls') require('lsp.lua-ls') require('lsp.go-ls') -require('lsp.ocaml-ls') -require('lsp.sml-ls') -require('lsp.arduino-ls') -require('lsp.roc-ls') require('lsp.zls-ls') require('lsp.clang-ls') +require('lsp.rust-analyzer') -- Completion require('completion') diff --git a/home-modules/explicit-configs/nvim/lua/lsp/go-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/go-ls.lua index 065229c..0c6033b 100644 --- a/home-modules/explicit-configs/nvim/lua/lsp/go-ls.lua +++ b/home-modules/explicit-configs/nvim/lua/lsp/go-ls.lua @@ -1,6 +1,5 @@ -local lspconfig = require "lspconfig" -- local capabilities = require('cmp_nvim_lsp').default_capabilities() -lspconfig.gopls.setup { +vim.lsp.config('gopls', { on_attach = function(client, bufnr) require "lsp_signature".on_attach({ bind = true, @@ -24,11 +23,12 @@ lspconfig.gopls.setup { }, }, autostart = true, - root_dir = lspconfig.util.root_pattern(".git","go.mod"), + root_dir = require('lspconfig').util.root_pattern(".git","go.mod"), init_options = {usePlaceholders = false, completeUnimported = true}, -- capabilities = capabilities, single_file_support = true; -} +}) +vim.lsp.enable('gopls') ------ Configre vim-go diff --git a/home-modules/explicit-configs/nvim/lua/lsp/lua-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/lua-ls.lua index f1590f0..e706f99 100644 --- a/home-modules/explicit-configs/nvim/lua/lsp/lua-ls.lua +++ b/home-modules/explicit-configs/nvim/lua/lsp/lua-ls.lua @@ -1,5 +1,5 @@ local capabilities = require('cmp_nvim_lsp').default_capabilities() -require'lspconfig'.lua_ls.setup { +vim.lsp.config('lua_ls', { on_init = function(client) if client.workspace_folders then local path = client.workspace_folders[1].name @@ -32,4 +32,5 @@ require'lspconfig'.lua_ls.setup { Lua = {} }, capabilities = capabilities, -} +}) +vim.lsp.enable('lua_ls') diff --git a/home-modules/explicit-configs/nvim/lua/lsp/rust-analyzer.lua b/home-modules/explicit-configs/nvim/lua/lsp/rust-analyzer.lua new file mode 100644 index 0000000..66c5e7d --- /dev/null +++ b/home-modules/explicit-configs/nvim/lua/lsp/rust-analyzer.lua @@ -0,0 +1 @@ +vim.lsp.enable('rust_analyzer') diff --git a/home-modules/explicit-configs/nvim/lua/lsp/typescript-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/typescript-ls.lua index 0506d00..ea458a7 100644 --- a/home-modules/explicit-configs/nvim/lua/lsp/typescript-ls.lua +++ b/home-modules/explicit-configs/nvim/lua/lsp/typescript-ls.lua @@ -1,4 +1,5 @@ -require'lspconfig'.ts_ls.setup{ +vim.lsp.config('ts_ls', { filetypes = { "javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx" }, root_dir = require('lspconfig/util').root_pattern("package.json", "tsconfig.json", "jsconfig.json", ".git") -} +}) +vim.lsp.enable('ts_ls') diff --git a/home-modules/explicit-configs/nvim/lua/lsp/zls-ls.lua b/home-modules/explicit-configs/nvim/lua/lsp/zls-ls.lua index 266805a..405b47d 100644 --- a/home-modules/explicit-configs/nvim/lua/lsp/zls-ls.lua +++ b/home-modules/explicit-configs/nvim/lua/lsp/zls-ls.lua @@ -1 +1 @@ - require'lspconfig'.zls.setup{} + vim.lsp.enable('zls')