From c9e9d9a2096f40c12de4482a6d36f4ac00ac1519 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Mon, 12 Sep 2022 08:39:30 +0200 Subject: Add mason tool installer to have a defined list --- after/plugin/lsp_lines.lua | 19 ------------------- after/plugin/mason.lua | 42 ++++++++++++++++++++++++++++++++++++++++++ after/plugin/null-ls.lua | 1 + 3 files changed, 43 insertions(+), 19 deletions(-) delete mode 100644 after/plugin/lsp_lines.lua (limited to 'after/plugin') diff --git a/after/plugin/lsp_lines.lua b/after/plugin/lsp_lines.lua deleted file mode 100644 index 5cb97b5..0000000 --- a/after/plugin/lsp_lines.lua +++ /dev/null @@ -1,19 +0,0 @@ -local ok, lsp_lines = pcall(require, "lsp_lines") -if not ok then - return -end - -vim.diagnostic.config({ - virtual_text = false, -}) - -vim.diagnostic.config({ virtual_lines = { only_current_line = true } }) - -lsp_lines.setup() - -vim.keymap.set( - "", - "l", - require("lsp_lines").toggle, - { desc = "Toggle lsp_lines" } -) diff --git a/after/plugin/mason.lua b/after/plugin/mason.lua index d757d62..d12f3f0 100644 --- a/after/plugin/mason.lua +++ b/after/plugin/mason.lua @@ -18,3 +18,45 @@ mason.setup({ mason_lspconfig.setup({ automatic_installation = true, }) + +require('mason-tool-installer').setup { + + -- a list of all tools you want to ensure are installed upon + -- start; they should be the names Mason uses for each tool + ensure_installed = { + "blade-formatter", + "codespell", + "dockerfile-language-server", + "emmet-ls", + "go-debug-adapter", + "golangci-lint", + "gopls", + "html-lsp", + "intelephense", + "json-lsp", + "lua-language-server", + "php-debug-adapter", + "rust-analyzer", + "stylua", + "typescript-language-server", + "vue-language-server", + }, + + -- if set to true this will check each tool for updates. If updates + -- are available the tool will be updated. This setting does not + -- affect :MasonToolsUpdate or :MasonToolsInstall. + -- Default: false + auto_update = false, + + -- automatically install / update on startup. If set to false nothing + -- will happen on startup. You can use :MasonToolsInstall or + -- :MasonToolsUpdate to install tools and check for updates. + -- Default: true + run_on_start = true, + + -- set a delay (in ms) before the installation starts. This is only + -- effective if run_on_start is set to true. + -- e.g.: 5000 = 5 second delay, 10000 = 10 second delay, etc... + -- Default: 0 + start_delay = 3000, -- 3 second delay +} diff --git a/after/plugin/null-ls.lua b/after/plugin/null-ls.lua index a5371f4..f6a1c5b 100644 --- a/after/plugin/null-ls.lua +++ b/after/plugin/null-ls.lua @@ -13,6 +13,7 @@ local sources = { -- null_ls.builtins.formatting.phpcsfixer, -- null_ls.builtins.formatting.pint, null_ls.builtins.diagnostics.golangci_lint, + null_ls.builtins.diagnostics.codespell, -- null_ls.builtins.formatting.goimports, null_ls.builtins.formatting.jq, null_ls.builtins.code_actions.gitrebase, -- cgit v1.2.3