fix(nvim): fix mason keymaps

1 files changed, 14 insertions, 31 deletions

diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
index e25e132..02db5ac 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
@@ -8,16 +8,18 @@ local M = {
 	},
 }
 
-function M.config()
-	local mason = require("mason")
+function M.init()
+	vim.keymap.set("n", "<leader>i", function()
+		require("mason.api.command").Mason()
+	end, { desc = "mason" })
 
-	local nil_wrap = function(func)
-		return function(opts)
-			func(vim.F.if_nil(opts, {}))
-		end
-	end
+	vim.keymap.set("n", "<leader>I", function()
+		require("mason.api.command").MasonLog()
+	end, { desc = "log" })
+end
 
-	mason.setup({
+function M.config()
+	require("mason").setup({
 		ui = {
 			border = "single",
 			icons = {
@@ -28,29 +30,10 @@ function M.config()
 		},
 	})
 
-	local mason_update_all = require("mason-update-all")
-	local mason_lspconfig = require("mason-lspconfig.api.command")
-	local mason_null_ls = require("mason-null-ls.api.command")
-	local mason_nvim_dap = require("mason-nvim-dap.api.command")
-
-	local api = require("mason.api.command")
-	api.UpdateAll = mason_update_all.update_all
-	api.LspInstall = nil_wrap(mason_lspconfig.LspInstall)
-	api.LspUninstall = nil_wrap(mason_lspconfig.LspUninstall)
-	api.NullLsInstall = nil_wrap(mason_null_ls.NullLsInstall)
-	api.NullLsUninstall = nil_wrap(mason_null_ls.NullLsUninstall)
-	api.DapInstall = nil_wrap(mason_nvim_dap.DapInstall)
-	api.DapUninstall = nil_wrap(mason_nvim_dap.DapUninstall)
-
-	vim.keymap.set("n", "<leader>ii", api.Mason, { desc = "mason" })
-	vim.keymap.set("n", "<leader>iI", api.MasonLog, { desc = "log" })
-	vim.keymap.set("n", "<leader>iu", api.UpdateAll, { desc = "update all" })
-	vim.keymap.set("n", "<leader>il", api.LspInstall, { desc = "lsp install" })
-	vim.keymap.set("n", "<leader>iL", api.LspUninstall, { desc = "lsp uninstall" })
-	vim.keymap.set("n", "<leader>in", api.NullLsInstall, { desc = "null-ls install" })
-	vim.keymap.set("n", "<leader>iN", api.NullLsUninstall, { desc = "null-ls uninstall" })
-	vim.keymap.set("n", "<leader>id", api.DapInstall, { desc = "dap install" })
-	vim.keymap.set("n", "<leader>iD", api.DapUninstall, { desc = "dap uninstall" })
+	require("mason-update-all").setup()
+	require("mason-lspconfig").setup()
+	require("mason-null-ls").setup()
+	require("mason-nvim-dap").setup()
 end
 
 return M