diff options
Diffstat (limited to 'nvim')
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp.lua | 1 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/configs.lua | 1 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins.lua | 10 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua | 2 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua | 10 |
5 files changed, 5 insertions, 19 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp.lua b/nvim/.config/nvim/lua/tobyvin/lsp.lua index 04566ba..2d60f82 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp.lua @@ -1,4 +1,5 @@ local lsp = { + default_config = {}, configs = require("tobyvin.lsp.configs"), handlers = require("tobyvin.lsp.handlers"), highlighting = require("tobyvin.lsp.highlighting"), diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua index a2d4f49..4226f92 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua @@ -1,5 +1,4 @@ local configs = { - default = {}, bashls = {}, taplo = {}, yamlls = {}, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index 875d198..ae69d31 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -177,19 +177,9 @@ M.plugins = function(use) use({ "neovim/nvim-lspconfig", after = { - "mason-lspconfig.nvim", "neodev.nvim", - "rust-tools.nvim", "cmp-nvim-lsp", }, - requires = { - "folke/neodev.nvim", - "simrat39/rust-tools.nvim", - "hrsh7th/cmp-nvim-lsp", - "ray-x/lsp_signature.nvim", - "SmiteshP/nvim-navic", - "barreiroleo/ltex-extra.nvim", - }, config = function() require("tobyvin.plugins.lspconfig").setup() end, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua index fa81044..d21ec7a 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua @@ -22,7 +22,7 @@ M.setup = function() return end - lsp.configs.default = vim.tbl_extend("force", lsp.configs.default, { + lsp.default_config = vim.tbl_extend("force", lsp.default_config, { capabilities = require("cmp_nvim_lsp").default_capabilities(), }) diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua index 5a415c2..80efb8e 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua @@ -1,11 +1,6 @@ local lsp = require("tobyvin.lsp") local M = {} -M.is_setup = function(name) - local available_servers = require("lspconfig").util.available_servers() - return name == "default" or vim.tbl_contains(available_servers, name) -end - M.setup = function() local status_ok, lspconfig = pcall(require, "lspconfig") if not status_ok then @@ -15,10 +10,11 @@ M.setup = function() require("lspconfig.ui.windows").default_options.border = "single" - lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, lsp.configs.default) + lspconfig.util.default_config = vim.tbl_extend("force", lspconfig.util.default_config, lsp.default_config) + local available = lspconfig.util.available_servers() for name, config in pairs(lsp.configs) do - if not M.is_setup(name) then + if not vim.tbl_contains(available, name) then lspconfig[name].setup(config) end end |