re-add mason, but use less shit

wrapperup · Jan 24, 2025 · 12e4aaf · 12e4aaf
1 parent cf3773d
commit 12e4aaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/lua/wrap/lazy.lua b/lua/wrap/lazy.lua
@@ -68,17 +68,12 @@ require('lazy').setup({
     { 'numToStr/Comment.nvim' },
 
     -- lsp
-    {'neovim/nvim-lspconfig'},
-    {'hrsh7th/cmp-nvim-lsp'},
-    {'hrsh7th/nvim-cmp'},
-    -- { 'L3MON4D3/LuaSnip', event = "VeryLazy" },
-    {                            -- Optional
-        'williamboman/mason.nvim',
-        build = function()
-            pcall(vim.cmd, 'MasonUpdate')
-        end,
-    },
-    { 'williamboman/mason-lspconfig.nvim' }, -- Optional
+    { "neovim/nvim-lspconfig" },
+    { "hrsh7th/cmp-nvim-lsp" },
+    { "hrsh7th/nvim-cmp" },
+    -- {  "L3MON4D3/LuaSnip" },
+    { "williamboman/mason.nvim" },
+    { "williamboman/mason-lspconfig.nvim" },
 
     {
         "ray-x/lsp_signature.nvim",

diff --git a/lua/wrap/lsp.lua b/lua/wrap/lsp.lua
@@ -123,6 +123,8 @@ require("conform").setup({
     },
 })
 
+require("mason").setup()
+
 local lspconfig = require('lspconfig')
 
 lspconfig.ols.setup {}
-Original file line number
+Diff line change
@@ Expand Up / @@ -123,6 +123,8 @@ require("conform").setup({ @@
         },
     })
+    require("mason").setup()
     local lspconfig = require('lspconfig')
     lspconfig.ols.setup {}
@@ Expand Down @@