From d45706cd8656a7d5d1c1bd54b5dff7c68e040906 Mon Sep 17 00:00:00 2001 From: Alexander Gehrke Date: Mon, 2 Jun 2025 22:47:43 +0200 Subject: [PATCH] Fix mason-lspconfig --- lazy-lock.json | 5 ++--- lua/plugins/chroma.lua | 1 - lua/plugins/lspconfig.lua | 39 +++++++++++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 11d502b..bfdd30f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -23,8 +23,8 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, "lush.nvim": { "branch": "main", "commit": "45a79ec4acb5af783a6a29673a999ce37f00497e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4cad8f67d9594565549442e2e8c68556761ab7a9" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, "neoconf.nvim": { "branch": "main", "commit": "cc95f47a2b0f8384cfb21aed85c797bcc4911438" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, @@ -70,7 +70,6 @@ "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-textobj-comment": { "branch": "master", "commit": "58ae4571b76a5bf74850698f23d235eef991dd4b" }, "vim-textobj-user": { "branch": "master", "commit": "41a675ddbeefd6a93664a4dc52f302fe3086a933" }, - "vim-theme-chroma": { "branch": "lush", "commit": "0ad7be22f2244f99a877edfd6261eaba47952b6f" }, "vimtex": { "branch": "master", "commit": "c50ba2f90ba8bd22fe607a799f74943c708a25c9" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, "workspace-diagnostics.nvim": { "branch": "main", "commit": "60f9175b2501ae3f8b1aba9719c0df8827610c8e" } diff --git a/lua/plugins/chroma.lua b/lua/plugins/chroma.lua index dec027e..562c445 100644 --- a/lua/plugins/chroma.lua +++ b/lua/plugins/chroma.lua @@ -1,6 +1,5 @@ return { "crater2150/vim-theme-chroma", - dev = true, lazy = false, branch = "lush", priority = 1000, diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 0f545d1..76c0134 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -6,8 +6,7 @@ return { dependencies = { { "folke/neoconf.nvim", cmd = "Neoconf", config = true }, { "folke/neodev.nvim", opts = {} }, - "mason.nvim", - "williamboman/mason-lspconfig.nvim", + "williamboman/mason.nvim", "hrsh7th/cmp-nvim-lsp", }, ---@class PluginLspOpts @@ -113,10 +112,42 @@ return { cmd = "Mason", opts = { ensure_installed = { - "jdtls", - "lua-language-server", + "stylua", + "htmlbeautifier", + "prettier", + "prettierd", + "ansible-lint", + "clang-format", + "xmlformatter", + "eslint_d", }, }, }, "mfussenegger/nvim-jdtls", + { + "williamboman/mason-lspconfig.nvim", + dependencies = { + { "mason-org/mason.nvim", opts = {} }, + "neovim/nvim-lspconfig", + }, + opts = { + ensure_installed = { + "ansiblels", + "cssls", + "eslint", + "html", + "jdtls", + "jsonls", + "lemminx", + "lua_ls", + "openscad_lsp", + "oxlint", + "pylsp", + "somesass_ls", + "tinymist", + "ts_ls", + }, + automatic_installation = true, + }, + }, }