diff options
author | Toby Vincent <tobyv13@gmail.com> | 2022-05-27 13:18:06 -0500 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2022-05-27 13:18:06 -0500 |
commit | 2900f76121e55c807d40b45ea44ce2cc6bdf5590 (patch) | |
tree | ead52b396c6407ee64e60b42615152a264bbfed7 | |
parent | 2c7609410d81cfa87cc4e41c17e8d07395f42a5f (diff) |
feat(nvim): added lsp-installer
-rw-r--r-- | nvim/.config/nvim/lua/plugins.lua | 9 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/lspconfig.lua | 19 |
2 files changed, 12 insertions, 16 deletions
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 2b30884..94e0215 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -81,14 +81,10 @@ return packer.startup(function(use) "neovim/nvim-lspconfig", config = [[require('plugins/lspconfig')]], }) - use({ "lukas-reineke/virt-column.nvim", config = [[require("virt-column").setup()]] }) - -- use({ - -- "williamboman/nvim-lsp-installer", - -- config = [[require('plugins/lsp-installer')]], - -- }) + use("williamboman/nvim-lsp-installer") use("nvim-lua/lsp_extensions.nvim") - use("simrat39/rust-tools.nvim") + use({ "simrat39/rust-tools.nvim", branch = "modularize_and_inlay_rewrite" }) use("simrat39/symbols-outline.nvim") use({ @@ -151,6 +147,7 @@ return packer.startup(function(use) config = [[require('plugins/blankline')]], }) + use({ "lukas-reineke/virt-column.nvim", config = [[require("virt-column").setup()]] }) use("tpope/vim-eunuch") use({ diff --git a/nvim/.config/nvim/lua/plugins/lspconfig.lua b/nvim/.config/nvim/lua/plugins/lspconfig.lua index 4fba148..7e152b9 100644 --- a/nvim/.config/nvim/lua/plugins/lspconfig.lua +++ b/nvim/.config/nvim/lua/plugins/lspconfig.lua @@ -3,6 +3,13 @@ if not status_ok then return end +local installer_ok, installer = pcall(require, "nvim-lsp-installer") +if installer_ok then + require("nvim-lsp-installer").setup({ + automatic_installation = true, -- automatically detect which servers to install (based on which servers are set up via lspconfig) + }) +end + local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true @@ -47,12 +54,6 @@ lspconfig.sumneko_lua.setup({ }, format = { enable = false, - -- Put format options here - -- NOTE: the value should be STRING!! - -- defaultConfig = { - -- indent_style = "space", - -- indent_size = "2", - -- }, }, }, }, @@ -62,7 +63,7 @@ lspconfig.sumneko_lua.setup({ end, }) -local rustopts = { +require("rust-tools").setup({ tools = { autoSetHints = true, hover_with_actions = true, @@ -87,9 +88,7 @@ local rustopts = { }, }, }, -} - -require("rust-tools").setup(rustopts) +}) local opts = { -- whether to highlight the currently hovered symbol |