From abb12585dea563eff272334295c7532c1b3d2d7b Mon Sep 17 00:00:00 2001 From: long Date: Mon, 18 May 2026 04:54:10 -0500 Subject: [PATCH] Configured mason for auto-installation (currently does not work) - added dockerfile treesitter --- lua/plugins/config.lua | 3 ++- lua/plugins/lsp_setup.lua | 48 +++++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/lua/plugins/config.lua b/lua/plugins/config.lua index 6f63d7a..3e7a273 100644 --- a/lua/plugins/config.lua +++ b/lua/plugins/config.lua @@ -289,7 +289,8 @@ function M.nvim_treesitter_new() "vim", "yaml", "toml", - "php", + "php", + "dockerfile", } local run_langs = vim.tbl_extend("force", install_langs, { "htmlangular", diff --git a/lua/plugins/lsp_setup.lua b/lua/plugins/lsp_setup.lua index 1572bf3..ee0adb2 100644 --- a/lua/plugins/lsp_setup.lua +++ b/lua/plugins/lsp_setup.lua @@ -138,7 +138,35 @@ cmp.setup({ mapping = cmp.mapping.preset.insert(mapping), }) +local lsps = { + "bashls", + "clangd", + "cssls", + "gopls", + "html", + --"htmx", + "jsonls", + "lua_ls", + "pyright", + "svelte", + "tailwindcss", + "taplo", + "templ", + "ts_ls", + "zls", + "csharp_ls", + "intelephense", + "php-cs-fixer", +} + +local local_lsp_configs = { + "angular-language-server", +} + require("mason").setup({ + ensure_installed = lsps, + automatic_installation = true, + automatic_enable = false, registries = { "github:mason-org/mason-registry", "github:Crashdummyy/mason-registry", @@ -160,22 +188,4 @@ vim.lsp.config("html", { filetypes = html_filetypes, }) -vim.lsp.enable({ - "angular-language-server", - "bashls", - "clangd", - "cssls", - "gopls", - "html", - --"htmx", - "jsonls", - "lua_ls", - "pyright", - "svelte", - "tailwindcss", - "taplo", - "templ", - "ts_ls", - "zls", - "csharp_ls", -}) +vim.lsp.enable(vim.tbl_extend("force", lsps, local_lsp_configs))