From abfe5b5b1175132845b8050b22f84a69a8eb70fc Mon Sep 17 00:00:00 2001 From: elkowar Date: Sun, 7 Jul 2024 17:59:37 +0200 Subject: [PATCH] Fix mason --- nvim/.config/nvim/fnl/dots/plugins/lsp.fnl | 2 +- nvim/.config/nvim/lua/dots/plugins/lsp.lua | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index c18d862..2642fed 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -257,7 +257,7 @@ (tset result :contents new-contents) (previous-handler a result b c))))))) -[(utils.plugin :williamboman/mason.nvim {:config true}) +[(utils.plugin :williamboman/mason.nvim {:config #((. (require :mason) :setup))}) (utils.plugin :williamboman/mason-lspconfig.nvim {:config {:ensure_installed ["rust_analyzer"]}}) (utils.plugin :neovim/nvim-lspconfig {:event "VeryLazy" :lazy true :config setup})] ; vim:foldmarker=<<<<<,>>>>> diff --git a/nvim/.config/nvim/lua/dots/plugins/lsp.lua b/nvim/.config/nvim/lua/dots/plugins/lsp.lua index 6497108..b16ce3e 100644 --- a/nvim/.config/nvim/lua/dots/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/dots/plugins/lsp.lua @@ -160,4 +160,7 @@ local function setup() vim.lsp.handlers["textDocument/hover"] = _16_ return nil end -return {utils.plugin("neovim/nvim-lspconfig", {event = "VeryLazy", lazy = true, config = setup})} +local function _18_() + return (require("mason")).setup() +end +return {utils.plugin("williamboman/mason.nvim", {config = _18_}), utils.plugin("williamboman/mason-lspconfig.nvim", {config = {ensure_installed = {"rust_analyzer"}}}), utils.plugin("neovim/nvim-lspconfig", {event = "VeryLazy", lazy = true, config = setup})}