dotfiles

commit 8b6e861558e60e3e94ecb2f0dac030912627cb99
parent 1f0966e1f00fbef6025edd0be42fb0d9ad563299
Author: Michał M. Sapka <michal@sapka.me>
Date:   Fri,  2 Sep 2022 21:37:13 +0200

chore(depts): migate to mason

Diffstat:
M
nvim/.config/nvim/lua/user/lsp/configs.lua
 | 
19
+++++++++++--------
M
nvim/.config/nvim/lua/user/plugins.lua
 | 
3
++-
M
nvim/.config/nvim/plugin/packer_compiled.lua
 | 
20
+++++++++++++-------

3 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/nvim/.config/nvim/lua/user/lsp/configs.lua b/nvim/.config/nvim/lua/user/lsp/configs.lua
@@ -1,16 +1,19 @@
-local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
-if not status_ok then
-	return
-end
+local status, mason = pcall(require, "mason")
+if (not status) then return end
 
-local lspconfig = require("lspconfig")
+mason.setup {}
 
-local servers = { "terraformls", "jsonls", "sumneko_lua", "gopls", "solargraph", "jdtls" }
+local status2, mason_lsp = pcall(require, "mason-lspconfig")
+if (not status2) then return end
 
-lsp_installer.setup {
-	ensure_installed = servers
+local servers = { "terraformls", "jsonls", "sumneko_lua", "gopls", "solargraph", "jdtls" }
+mason_lsp.setup {
+  ensure_installed = servers
 }
 
+local status3, lspconfig = pcall(require, "lspconfig")
+if (not status3) then return end
+
 for _, server in pairs(servers) do
 	local opts = {
 		on_attach = require("user.lsp.handlers").on_attach,
diff --git a/nvim/.config/nvim/lua/user/plugins.lua b/nvim/.config/nvim/lua/user/plugins.lua
@@ -82,7 +82,8 @@ return packer.startup(function(use)
 	use "rafamadriz/friendly-snippets"
 
 	use "neovim/nvim-lspconfig" -- enable LSP
-  use "williamboman/nvim-lsp-installer" -- simple to use language server installer
+  use "williamboman/mason.nvim" -- simple to use language server installer
+  use "williamboman/mason-lspconfig.nvim" -- simple to use language server installer
   use "tamago324/nlsp-settings.nvim" -- language server settings defined in json for
   use "jose-elias-alvarez/null-ls.nvim" -- for formatters and linters
 
diff --git a/nvim/.config/nvim/plugin/packer_compiled.lua b/nvim/.config/nvim/plugin/packer_compiled.lua
@@ -125,6 +125,16 @@ _G.packer_plugins = {
     path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/lualine.nvim",
     url = "https://github.com/nvim-lualine/lualine.nvim"
   },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
   ["nlsp-settings.nvim"] = {
     loaded = true,
     path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/nlsp-settings.nvim",
@@ -140,11 +150,6 @@ _G.packer_plugins = {
     path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
-  ["nvim-lsp-installer"] = {
-    loaded = true,
-    path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
-    url = "https://github.com/williamboman/nvim-lsp-installer"
-  },
   ["nvim-lspconfig"] = {
     loaded = true,
     path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
@@ -161,8 +166,9 @@ _G.packer_plugins = {
     url = "https://github.com/nvim-treesitter/nvim-treesitter"
   },
   ["nvim-web-devicons"] = {
-    loaded = true,
-    path = "/Users/msapka/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    loaded = false,
+    needs_bufread = false,
+    path = "/Users/msapka/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
     url = "https://github.com/kyazdani42/nvim-web-devicons"
   },
   ["packer.nvim"] = {