Fixed mason.nvim and nvim-lspconfig startup issues.

miltonllera · May 7, 2024 · f9bcf4a · f9bcf4a
1 parent 2627ea5
commit f9bcf4a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/lazy-lock.json b/lazy-lock.json
@@ -12,14 +12,14 @@
   "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" },
   "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
   "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
-  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+  "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" },
   "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
   "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
   "material.nvim": { "branch": "main", "commit": "772e41a7f33743224f30799a3a887dc7dd853f8d" },
   "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9a5a3ebd63b0bf7f8528ed2ca65c8c8bcd2bbeae" },
+  "nvim-lspconfig": { "branch": "master", "commit": "2beb3e9cac3ed9335f8972eb6082f380a4f1f124" },
   "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" },
   "nvim-treesitter": { "branch": "master", "commit": "da0efd7398713a3177da5ce8690f0e5c5415763d" },
   "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
@@ -28,7 +28,7 @@
   "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
-  "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" },
+  "tokyonight.nvim": { "branch": "main", "commit": "67afeaf7fd6ebba000633e89f63c31694057edde" },
   "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
   "vim-black": { "branch": "main", "commit": "e9486a54b63939da162cbbd4f9838f7319842910" },
   "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" },

diff --git a/lua/plugins.lua b/lua/plugins.lua
@@ -26,15 +26,14 @@ local plugins = {
 
   { 'marko-cerovac/material.nvim' },
 
-  {
-    "williamboman/mason.nvim",
-    build = ':MasonUpdate',
-  },
+  { "williamboman/mason.nvim", config = function() require("mason").setup() end },
+  { "williamboman/mason-lspconfig.nvim" , config = function() require("mason-lspconfig").setup() end },
+
+  -- Signature help
+  {"ray-x/lsp_signature.nvim", config = function() require("lsp_signature").setup() end },
 
-  { "williamboman/mason-lspconfig.nvim" },
-  { "neovim/nvim-lspconfig" },
 
-  -- require("plugins.lspconfig")
+  { "neovim/nvim-lspconfig", config = function() require('plugins.lspconfig') end },
 
     -- Autocomplete
   {
@@ -64,9 +63,6 @@ local plugins = {
   {"L3MON4D3/LuaSnip", config = function() require('plugins.snippets') end},
   {"rafamadriz/friendly-snippets"},
 
-  -- Signature help
-  {"ray-x/lsp_signature.nvim"},
-
   -- Telescope
   {
     'nvim-telescope/telescope.nvim',

diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
@@ -1,6 +1,3 @@
-require("mason").setup()
-require "lsp_signature".setup()
-
 local mason_lspconfig = require("mason-lspconfig")
 local lspconfig = require("lspconfig")
 local common_on_attach = require("lsp.utils").common_on_attach