From c1482fa2c74e9b13588b93c7dbce2a99cd9f261d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20La=C3=ADn?= Date: Sat, 8 Jun 2024 12:39:35 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20use=20ne?= =?UTF-8?q?w=20mason=20and=20treesitter=20ensure=5Finstalled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extras/formatting/prettier-extended.lua | 8 ++-- .../lua/plugins/extras/formatting/ruff.lua | 9 ++-- .../plugins/extras/formatting/rustywind.lua | 9 ++-- .../lua/plugins/extras/formatting/shfmt.lua | 9 ++-- .../plugins/extras/lang/ansible-extended.lua | 9 ++-- .config/nvim/lua/plugins/extras/lang/bash.lua | 20 +++++---- .../lua/plugins/extras/lang/go-extended.lua | 9 ++-- .../nvim/lua/plugins/extras/lang/julia.lua | 19 ++++---- .../plugins/extras/lang/python-extended.lua | 10 ++--- .../lua/plugins/extras/lang/web/graphql.lua | 8 ++-- .../lua/plugins/extras/lang/web/html-css.lua | 17 ++++--- .../nvim/lua/plugins/extras/lang/web/htmx.lua | 9 ++-- .../nvim/lua/plugins/extras/lang/web/php.lua | 44 +++---------------- .../extras/lang/web/typescript-extended.lua | 17 +++---- .../lua/plugins/extras/lang/web/vue-2.lua | 19 ++++---- .../extras/lang/web/vue-3-extended.lua | 7 --- .config/nvim/lua/plugins/extras/lang/xml.lua | 19 ++++---- .config/nvim/lua/plugins/extras/lang/zig.lua | 20 +++++---- .../nvim/lua/plugins/extras/linting/biome.lua | 9 ++-- .../lua/plugins/extras/linting/pylint.lua | 9 ++-- .../lua/plugins/extras/linting/selene.lua | 9 ++-- .../nvim/lua/plugins/extras/linting/typos.lua | 9 ++-- .../nvim/lua/plugins/extras/linting/vale.lua | 9 ++-- 23 files changed, 145 insertions(+), 162 deletions(-) diff --git a/.config/nvim/lua/plugins/extras/formatting/prettier-extended.lua b/.config/nvim/lua/plugins/extras/formatting/prettier-extended.lua index 883cb394..cbf47333 100644 --- a/.config/nvim/lua/plugins/extras/formatting/prettier-extended.lua +++ b/.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) - table.insert(opts.ensure_installed, "prettierd") - end, + opts = { + ensure_installed = { + "prettierd", + }, + }, }, { "stevearc/conform.nvim", diff --git a/.config/nvim/lua/plugins/extras/formatting/ruff.lua b/.config/nvim/lua/plugins/extras/formatting/ruff.lua index 781d00d0..e1b576a7 100644 --- a/.config/nvim/lua/plugins/extras/formatting/ruff.lua +++ b/.config/nvim/lua/plugins/extras/formatting/ruff.lua @@ -10,9 +10,10 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "ruff" }) - end, + opts = { + ensure_installed = { + "ruff", + }, + }, }, } diff --git a/.config/nvim/lua/plugins/extras/formatting/rustywind.lua b/.config/nvim/lua/plugins/extras/formatting/rustywind.lua index 633f296e..e5ff3802 100644 --- a/.config/nvim/lua/plugins/extras/formatting/rustywind.lua +++ b/.config/nvim/lua/plugins/extras/formatting/rustywind.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "rustywind" }) - end, + opts = { + ensure_installed = { + "rustywind", + }, + }, }, { "stevearc/conform.nvim", diff --git a/.config/nvim/lua/plugins/extras/formatting/shfmt.lua b/.config/nvim/lua/plugins/extras/formatting/shfmt.lua index b1fb8d72..db1ce36a 100644 --- a/.config/nvim/lua/plugins/extras/formatting/shfmt.lua +++ b/.config/nvim/lua/plugins/extras/formatting/shfmt.lua @@ -21,9 +21,10 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "shfmt" }) - end, + opts = { + ensure_installed = { + "shfmt", + }, + }, }, } diff --git a/.config/nvim/lua/plugins/extras/lang/ansible-extended.lua b/.config/nvim/lua/plugins/extras/lang/ansible-extended.lua index 68cddb08..42ac6a39 100644 --- a/.config/nvim/lua/plugins/extras/lang/ansible-extended.lua +++ b/.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.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "ansible-language-server" }) - end, + opts = { + ensure_installed = { + "ansible-language-server", + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/lang/bash.lua b/.config/nvim/lua/plugins/extras/lang/bash.lua index 96c5893d..3232f134 100644 --- a/.config/nvim/lua/plugins/extras/lang/bash.lua +++ b/.config/nvim/lua/plugins/extras/lang/bash.lua @@ -1,11 +1,11 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "bash" }) - end - end, + opts = { + ensure_installed = { + "bash", + }, + }, }, { "neovim/nvim-lspconfig", @@ -17,10 +17,12 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "bash-language-server", "shellcheck" }) - end, + opts = { + ensure_installed = { + "bash-language-server", + "shellcheck", + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/lang/go-extended.lua b/.config/nvim/lua/plugins/extras/lang/go-extended.lua index 925ed179..72a84cf7 100644 --- a/.config/nvim/lua/plugins/extras/lang/go-extended.lua +++ b/.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.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "golangci-lint" }) - end, + opts = { + ensure_installed = { + "golangci-lint", + }, + }, }, { "ray-x/go.nvim", diff --git a/.config/nvim/lua/plugins/extras/lang/julia.lua b/.config/nvim/lua/plugins/extras/lang/julia.lua index 5bc8e352..9f00915b 100644 --- a/.config/nvim/lua/plugins/extras/lang/julia.lua +++ b/.config/nvim/lua/plugins/extras/lang/julia.lua @@ -1,11 +1,11 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "julia" }) - end - end, + opts = { + ensure_installed = { + "julia", + }, + }, }, { "neovim/nvim-lspconfig", @@ -17,10 +17,11 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "julia-lsp" }) - end, + opts = { + ensure_installed = { + "julia-lsp", + }, + }, }, { "hrsh7th/nvim-cmp", diff --git a/.config/nvim/lua/plugins/extras/lang/python-extended.lua b/.config/nvim/lua/plugins/extras/lang/python-extended.lua index 47a6fa8d..320e73d1 100644 --- a/.config/nvim/lua/plugins/extras/lang/python-extended.lua +++ b/.config/nvim/lua/plugins/extras/lang/python-extended.lua @@ -61,11 +61,11 @@ return { }, { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "requirements" }) - end - end, + opts = { + ensure_installed = { + "requirements", + }, + }, }, { "MeanderingProgrammer/py-requirements.nvim", diff --git a/.config/nvim/lua/plugins/extras/lang/web/graphql.lua b/.config/nvim/lua/plugins/extras/lang/web/graphql.lua index 18b07e87..caeeea75 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/graphql.lua +++ b/.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) - vim.list_extend(opts.ensure_installed, { + opts = { + ensure_installed = { "graphql-language-service-cli", - }) - end, + }, + }, }, { "neovim/nvim-lspconfig", diff --git a/.config/nvim/lua/plugins/extras/lang/web/html-css.lua b/.config/nvim/lua/plugins/extras/lang/web/html-css.lua index 275ff9fb..44dca9d9 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/html-css.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/html-css.lua @@ -1,13 +1,13 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { + opts = { + ensure_installed = { "html", "css", "scss", - }) - end, + }, + }, }, { "neovim/nvim-lspconfig", @@ -42,9 +42,8 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { + opts = { + ensure_installed = { "emmet-language-server", "html-lsp", "cssmodules-language-server", @@ -52,8 +51,8 @@ return { "css-lsp", "htmlhint", "stylelint", - }) - end, + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/lang/web/htmx.lua b/.config/nvim/lua/plugins/extras/lang/web/htmx.lua index bfaafdc3..265b69b0 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/htmx.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/htmx.lua @@ -9,9 +9,10 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "htmx-lsp" }) - end, + opts = { + ensure_installed = { + "htmx-lsp", + }, + }, }, } diff --git a/.config/nvim/lua/plugins/extras/lang/web/php.lua b/.config/nvim/lua/plugins/extras/lang/web/php.lua index 69354ccf..0d25d594 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/php.lua +++ b/.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) - vim.list_extend(opts.ensure_installed, { - "php", + opts = { + ensure_installed = { "phpdoc", - }) - end, + }, + }, }, { "williamboman/mason.nvim", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { - "phpactor", + opts = { + ensure_installed = { "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, diff --git a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua index 43c486ea..11542bed 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua +++ b/.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.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "deno" }) - end, + opts = { + ensure_installed = { + "deno", + }, + }, }, { "neovim/nvim-lspconfig", @@ -31,12 +32,12 @@ return { }, { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - vim.list_extend(opts.ensure_installed, { + opts = { + ensure_installed = { "javascript", "jsdoc", - }) - end, + }, + }, }, { "dmmulroy/tsc.nvim", diff --git a/.config/nvim/lua/plugins/extras/lang/web/vue-2.lua b/.config/nvim/lua/plugins/extras/lang/web/vue-2.lua index a9285c75..075385a0 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/vue-2.lua +++ b/.config/nvim/lua/plugins/extras/lang/web/vue-2.lua @@ -1,11 +1,11 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "vue" }) - end - end, + opts = { + ensure_installed = { + "vue", + }, + }, }, { "neovim/nvim-lspconfig", @@ -20,10 +20,11 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "vetur-vls" }) - end, + opts = { + ensure_installed = { + "vetur-vls", + }, + }, }, { "luckasRanarison/nvim-devdocs", diff --git a/.config/nvim/lua/plugins/extras/lang/web/vue-3-extended.lua b/.config/nvim/lua/plugins/extras/lang/web/vue-3-extended.lua index c0613d70..b7719e58 100644 --- a/.config/nvim/lua/plugins/extras/lang/web/vue-3-extended.lua +++ b/.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, diff --git a/.config/nvim/lua/plugins/extras/lang/xml.lua b/.config/nvim/lua/plugins/extras/lang/xml.lua index cecdd330..a93cd7c2 100644 --- a/.config/nvim/lua/plugins/extras/lang/xml.lua +++ b/.config/nvim/lua/plugins/extras/lang/xml.lua @@ -1,11 +1,11 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "xml" }) - end - end, + opts = { + ensure_installed = { + "xml", + }, + }, }, { "neovim/nvim-lspconfig", @@ -17,9 +17,10 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "lemminx" }) - end, + opts = { + ensure_installed = { + "lemminx", + }, + }, }, } diff --git a/.config/nvim/lua/plugins/extras/lang/zig.lua b/.config/nvim/lua/plugins/extras/lang/zig.lua index 972663f1..2798d7d5 100644 --- a/.config/nvim/lua/plugins/extras/lang/zig.lua +++ b/.config/nvim/lua/plugins/extras/lang/zig.lua @@ -1,11 +1,11 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - if type(opts.ensure_installed) == "table" then - vim.list_extend(opts.ensure_installed, { "zig" }) - end - end, + opts = { + ensure_installed = { + "zig", + }, + }, }, { "neovim/nvim-lspconfig", @@ -17,10 +17,12 @@ return { }, { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "zls", "codelldb" }) - end, + opts = { + ensure_installed = { + "zls", + "codelldb", + }, + }, }, { "nvim-neotest/neotest", diff --git a/.config/nvim/lua/plugins/extras/linting/biome.lua b/.config/nvim/lua/plugins/extras/linting/biome.lua index 030e27ec..9b0914ea 100644 --- a/.config/nvim/lua/plugins/extras/linting/biome.lua +++ b/.config/nvim/lua/plugins/extras/linting/biome.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "biome" }) - end, + opts = { + ensure_installed = { + "biome", + }, + }, }, { "neovim/nvim-lspconfig", diff --git a/.config/nvim/lua/plugins/extras/linting/pylint.lua b/.config/nvim/lua/plugins/extras/linting/pylint.lua index c854d17c..5bb42887 100644 --- a/.config/nvim/lua/plugins/extras/linting/pylint.lua +++ b/.config/nvim/lua/plugins/extras/linting/pylint.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "pylint" }) - end, + opts = { + ensure_installed = { + "pylint", + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/linting/selene.lua b/.config/nvim/lua/plugins/extras/linting/selene.lua index c2dde11f..2aa4dce9 100644 --- a/.config/nvim/lua/plugins/extras/linting/selene.lua +++ b/.config/nvim/lua/plugins/extras/linting/selene.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "selene" }) - end, + opts = { + ensure_installed = { + "selene", + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/linting/typos.lua b/.config/nvim/lua/plugins/extras/linting/typos.lua index cfc1ec6a..633d46ef 100644 --- a/.config/nvim/lua/plugins/extras/linting/typos.lua +++ b/.config/nvim/lua/plugins/extras/linting/typos.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "typos" }) - end, + opts = { + ensure_installed = { + "typos", + }, + }, }, { "mfussenegger/nvim-lint", diff --git a/.config/nvim/lua/plugins/extras/linting/vale.lua b/.config/nvim/lua/plugins/extras/linting/vale.lua index a24dfd75..b17f5cc5 100644 --- a/.config/nvim/lua/plugins/extras/linting/vale.lua +++ b/.config/nvim/lua/plugins/extras/linting/vale.lua @@ -1,10 +1,11 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "vale" }) - end, + opts = { + ensure_installed = { + "vale", + }, + }, }, { "mfussenegger/nvim-lint",