Move LSP management to mason.nvim.

miltonllera · Jan 17, 2023 · 1a57c8c · 1a57c8c
1 parent 5c2bdaa
commit 1a57c8c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -26,14 +26,20 @@ return require('packer').startup(function(use)
   -- Let Packer manage itself
   use({'wbthomason/packer.nvim', opt = true})
 
+  -- LSP management (must come first as per mason-lspconfig.nvim's instructions)
+  use "williamboman/mason.nvim"
+  use ({
+    "williamboman/mason-lspconfig.nvim",
+    config = function() require('plugins.mason-lspconfig') end,
+  })
+
   -- LSP server
   use({
     'neovim/nvim-lspconfig',
     config = function() require('plugins.lspconfig') end
   })
-  use 'williamboman/nvim-lsp-installer'  -- Helper for installing most language servers
 
-  -- Autocomplete
+    -- Autocomplete
   use({
     "hrsh7th/nvim-cmp",
     -- Sources for nvim-cmp

diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
@@ -7,7 +7,14 @@ local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 
 -- Enable language servers with common settings
-local servers = {"bashls", "clangd", "pyright", "jsonls", "dockerls"}
+local servers = {
+  "bashls",
+  "clangd",
+  "dockerls",
+  "jsonls",
+  "pyright",
+  "texlab",
+}
 for _, lsp in ipairs(servers) do
   nvim_lsp[lsp].setup({
     on_attach = common_on_attach,

diff --git a/lua/plugins/mason-lspconfig.lua b/lua/plugins/mason-lspconfig.lua
@@ -0,0 +1,12 @@
+require("mason-lspconfig").setup {
+    ensure_installed = {
+      "bashls",
+      "clangd",
+      "jsonls",
+      "julials",
+      "pyright",
+      "sumneko_lua",
+      "texlab",
+    },
+    automatic_installation= true,
+}
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
@@ -1,7 +1,10 @@
 -- Treesitter configuration
 
 require('nvim-treesitter.configs').setup({
-	highlight = { enable = true, additional_vim_regex_highlighting = false},
+	highlight = {
+    enable = true,
+    additional_vim_regex_highlighting = false
+  },
   -- We must manually specify which parsers to install
 	ensure_installed = {
     "bash",
@@ -14,5 +17,6 @@ require('nvim-treesitter.configs').setup({
     "python",
     "yaml",
     "vim",
+    "latex",
 	},
 })