♻️ refactor(nvim): use new mason and treesitter ensure_installed

.config/nvim/lua/plugins/extras/formatting/prettier-extended.lua

@@ -2,9 +2,11 @@ return {
   { import = "lazyvim.plugins.extras.formatting.prettier" },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      table.insert(opts.ensure_installed, "prettierd")
+      ensure_installed = {
-    end,
+        "prettierd",
+      },
+    },
   },
   {
     "stevearc/conform.nvim",

.config/nvim/lua/plugins/extras/formatting/ruff.lua

@@ -10,9 +10,10 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "ruff" })
+        "ruff",
-    end,
+      },
+    },
   },
 }

.config/nvim/lua/plugins/extras/formatting/rustywind.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "rustywind" })
+        "rustywind",
-    end,
+      },
+    },
   },
   {
     "stevearc/conform.nvim",

.config/nvim/lua/plugins/extras/formatting/shfmt.lua

@@ -21,9 +21,10 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "shfmt" })
+        "shfmt",
-    end,
+      },
+    },
   },
 }

.config/nvim/lua/plugins/extras/lang/ansible-extended.lua

@@ -22,10 +22,11 @@ return {
   { import = "lazyvim.plugins.extras.lang.ansible" },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "ansible-language-server" })
+        "ansible-language-server",
-    end,
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/lang/bash.lua

@@ -1,11 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "bash" })
+        "bash",
-      end
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -17,10 +17,12 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "bash-language-server", "shellcheck" })
+        "bash-language-server",
-    end,
+        "shellcheck",
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/lang/go-extended.lua

@@ -2,10 +2,11 @@ return {
   { import = "lazyvim.plugins.extras.lang.go" },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "golangci-lint" })
+        "golangci-lint",
-    end,
+      },
+    },
   },
   {
     "ray-x/go.nvim",

.config/nvim/lua/plugins/extras/lang/julia.lua

@@ -1,11 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "julia" })
+        "julia",
-      end
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -17,10 +17,11 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "julia-lsp" })
+        "julia-lsp",
-    end,
+      },
+    },
   },
   {
     "hrsh7th/nvim-cmp",

.config/nvim/lua/plugins/extras/lang/python-extended.lua

@@ -61,11 +61,11 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "requirements" })
+        "requirements",
-      end
+      },
-    end,
+    },
   },
   {
     "MeanderingProgrammer/py-requirements.nvim",

.config/nvim/lua/plugins/extras/lang/web/graphql.lua

@@ -2,11 +2,11 @@ return {
   { import = "plugins.extras.lang.web.typescript-extended" },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      vim.list_extend(opts.ensure_installed, {
+      ensure_installed = {
         "graphql-language-service-cli",
-      })
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",

.config/nvim/lua/plugins/extras/lang/web/html-css.lua

@@ -1,13 +1,13 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      vim.list_extend(opts.ensure_installed, {
+      ensure_installed = {
         "html",
         "css",
         "scss",
-      })
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -42,9 +42,8 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, {
         "emmet-language-server",
         "html-lsp",
         "cssmodules-language-server",
@@ -52,8 +51,8 @@ return {
         "css-lsp",
         "htmlhint",
         "stylelint",
-      })
+      },
-    end,
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/lang/web/htmx.lua

@@ -9,9 +9,10 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "htmx-lsp" })
+        "htmx-lsp",
-    end,
+      },
+    },
   },
 }

.config/nvim/lua/plugins/extras/lang/web/php.lua

@@ -1,28 +1,19 @@
 return {
+  { import = "lazyvim.plugins.extras.lang.php" },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      vim.list_extend(opts.ensure_installed, {
+      ensure_installed = {
-        "php",
         "phpdoc",
-      })
+      },
-    end,
+    },
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      vim.list_extend(opts.ensure_installed, {
+      ensure_installed = {
-        "phpactor",
         "php-cs-fixer",
         "phpcs",
-      })
-    end,
-  },
-  {
-    "neovim/nvim-lspconfig",
-    opts = {
-      servers = {
-        phpactor = {},
       },
     },
   },
@@ -34,27 +25,6 @@ return {
       return opts
     end,
   },
-  {
-    "mfussenegger/nvim-dap",
-    optional = true,
-    dependencies = {
-      "williamboman/mason.nvim",
-      opts = function(_, opts)
-        if type(opts.ensure_installed) == "table" then
-          table.insert(opts.ensure_installed, "php-debug-adapter")
-        end
-      end,
-    },
-    opts = function()
-      local dap = require("dap")
-      local path = require("mason-registry").get_package("php-debug-adapter"):get_install_path()
-      dap.adapters.php = {
-        type = "executable",
-        command = "node",
-        args = { path .. "/extension/out/phpDebug.js" },
-      }
-    end,
-  },
   {
     "nvim-neotest/neotest",
     optional = true,

.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua

@@ -3,10 +3,11 @@ return {
   { import = "plugins.extras.lang.json-extended" },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "deno" })
+        "deno",
-    end,
+      },
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -31,12 +32,12 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      vim.list_extend(opts.ensure_installed, {
+      ensure_installed = {
         "javascript",
         "jsdoc",
-      })
+      },
-    end,
+    },
   },
   {
     "dmmulroy/tsc.nvim",

.config/nvim/lua/plugins/extras/lang/web/vue-2.lua

@@ -1,11 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "vue" })
+        "vue",
-      end
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -20,10 +20,11 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "vetur-vls" })
+        "vetur-vls",
-    end,
+      },
+    },
   },
   {
     "luckasRanarison/nvim-devdocs",

.config/nvim/lua/plugins/extras/lang/web/vue-3-extended.lua

@@ -39,13 +39,6 @@ return {
     "dmmulroy/ts-error-translator.nvim",
     opts = {},
   },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = opts.ensure_installed or {}
-      vim.list_extend(opts.ensure_installed, { "vue-language-server" })
-    end,
-  },
   {
     "luckasRanarison/nvim-devdocs",
     optional = true,

.config/nvim/lua/plugins/extras/lang/xml.lua

@@ -1,11 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "xml" })
+        "xml",
-      end
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -17,9 +17,10 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "lemminx" })
+        "lemminx",
-    end,
+      },
+    },
   },
 }

.config/nvim/lua/plugins/extras/lang/zig.lua

@@ -1,11 +1,11 @@
 return {
   {
     "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
+    opts = {
-      if type(opts.ensure_installed) == "table" then
+      ensure_installed = {
-        vim.list_extend(opts.ensure_installed, { "zig" })
+        "zig",
-      end
+      },
-    end,
+    },
   },
   {
     "neovim/nvim-lspconfig",
@@ -17,10 +17,12 @@ return {
   },
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "zls", "codelldb" })
+        "zls",
-    end,
+        "codelldb",
+      },
+    },
   },
   {
     "nvim-neotest/neotest",

.config/nvim/lua/plugins/extras/linting/biome.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "biome" })
+        "biome",
-    end,
+      },
+    },
   },
   {
     "neovim/nvim-lspconfig",

.config/nvim/lua/plugins/extras/linting/pylint.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "pylint" })
+        "pylint",
-    end,
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/linting/selene.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "selene" })
+        "selene",
-    end,
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/linting/typos.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "typos" })
+        "typos",
-    end,
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",

.config/nvim/lua/plugins/extras/linting/vale.lua

@@ -1,10 +1,11 @@
 return {
   {
     "williamboman/mason.nvim",
-    opts = function(_, opts)
+    opts = {
-      opts.ensure_installed = opts.ensure_installed or {}
+      ensure_installed = {
-      vim.list_extend(opts.ensure_installed, { "vale" })
+        "vale",
-    end,
+      },
+    },
   },
   {
     "mfussenegger/nvim-lint",