kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sergio Laín 2024-06-08 12:39:35 +02:00
parent 74adfbcc2f
commit c1482fa2c7
No known key found for this signature in database
GPG key ID: FB00AF7015FFE76B
23 changed files with 145 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.config/nvim/lua/plugins/extras/formatting/prettier-extended.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/formatting/ruff.lua
View file

@ -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",
},
},
},
}

9
.config/nvim/lua/plugins/extras/formatting/rustywind.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/formatting/shfmt.lua
View file

@ -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",
},
},
},
}

9
.config/nvim/lua/plugins/extras/lang/ansible-extended.lua
View file

@ -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",

20
.config/nvim/lua/plugins/extras/lang/bash.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/lang/go-extended.lua
View file

@ -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",

19
.config/nvim/lua/plugins/extras/lang/julia.lua
View file

@ -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",

10
.config/nvim/lua/plugins/extras/lang/python-extended.lua
View file

@ -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",

8
.config/nvim/lua/plugins/extras/lang/web/graphql.lua
View file

@ -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",

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

@ -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",

9
.config/nvim/lua/plugins/extras/lang/web/htmx.lua
View file

@ -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",
},
},
},
}

44
.config/nvim/lua/plugins/extras/lang/web/php.lua
View file

@ -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,

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

@ -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",

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

@ -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",

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

@ -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,

19
.config/nvim/lua/plugins/extras/lang/xml.lua
View file

@ -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",
},
},
},
}

20
.config/nvim/lua/plugins/extras/lang/zig.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/linting/biome.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/linting/pylint.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/linting/selene.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/linting/typos.lua
View file

@ -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",

9
.config/nvim/lua/plugins/extras/linting/vale.lua
View file

@ -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",