diff options
| -rw-r--r-- | lua/lvim/lsp/init.lua | 8 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua index b997b171..0fea876a 100644 --- a/lua/lvim/lsp/init.lua +++ b/lua/lvim/lsp/init.lua @@ -110,14 +110,6 @@ function M.setup() require("nlspsettings").setup(lvim.lsp.nlsp_settings.setup) end) - pcall(function() - require("mason-lspconfig").setup(lvim.lsp.installer.setup) - - -- automatic_installation is handled by lsp-manager - local settings = require "mason-lspconfig.settings" - settings.current.automatic_installation = false - end) - require("lvim.lsp.null-ls").setup() autocmds.configure_format_on_save() diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index d2efaf33..a1ed58f1 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -9,6 +9,13 @@ local core_plugins = { { "williamboman/mason-lspconfig.nvim", cmd = { "LspInstall", "LspUninstall" }, + config = function() + require("mason-lspconfig").setup(lvim.lsp.installer.setup) + + -- automatic_installation is handled by lsp-manager + local settings = require "mason-lspconfig.settings" + settings.current.automatic_installation = false + end, lazy = true, dependencies = "mason.nvim", }, @@ -122,7 +129,15 @@ local core_plugins = { vim.opt.rtp:prepend(path) -- treesitter needs to be before nvim's runtime in rtp require("lvim.core.treesitter").setup() end, - cmd = { "TSInstall", "TSUninstall", "TSUpdate", "TSInstallInfo", "TSInstallSync", "TSInstallFromGrammar" }, + cmd = { + "TSInstall", + "TSUninstall", + "TSUpdate", + "TSUpdateSync", + "TSInstallInfo", + "TSInstallSync", + "TSInstallFromGrammar", + }, event = "User FileOpened", }, { |