diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index 870b7553..fa8dcfe5 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -51,7 +51,6 @@ "plugins.extras.formatting.isort", "plugins.extras.formatting.rustfmt", "plugins.extras.formatting.rustywind", - "plugins.extras.formatting.shellharden", "plugins.extras.formatting.sqlfmt", "plugins.extras.lang.bash", "plugins.extras.lang.css", @@ -63,6 +62,7 @@ "plugins.extras.lang.tailwindcss-extended", "plugins.extras.lang.typescript-extended", "plugins.extras.linting.pylint", + "plugins.extras.linting.shellcheck", "plugins.extras.lsp.compiler", "plugins.extras.lsp.lens", "plugins.extras.lsp.lightbulb", @@ -95,4 +95,5 @@ "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} + diff --git a/.config/nvim/lua/plugins/extras/formatting/shellharden.lua b/.config/nvim/lua/plugins/extras/formatting/shellharden.lua deleted file mode 100644 index 14df16d5..00000000 --- a/.config/nvim/lua/plugins/extras/formatting/shellharden.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - { - "williamboman/mason.nvim", - opts = function(_, opts) - opts.ensure_installed = opts.ensure_installed or {} - vim.list_extend(opts.ensure_installed, { "shellharden" }) - end, - }, - { - "stevearc/conform.nvim", - opts = function(_, opts) - opts.formatters_by_ft.bash = opts.formatters_by_ft.bash or {} - table.insert(opts.formatters_by_ft.bash, "shellharden") - return opts - end, - }, -} diff --git a/.config/nvim/lua/plugins/extras/lang/ansible.lua b/.config/nvim/lua/plugins/extras/lang/ansible.lua index 36eb23f8..82a54abf 100644 --- a/.config/nvim/lua/plugins/extras/lang/ansible.lua +++ b/.config/nvim/lua/plugins/extras/lang/ansible.lua @@ -11,7 +11,6 @@ return { "williamboman/mason.nvim", opts = function(_, opts) opts.ensure_installed = opts.ensure_installed or {} - -- for ansiblels validation vim.list_extend(opts.ensure_installed, { "ansible-lint", "ansible-language-server" }) end, }, diff --git a/.config/nvim/lua/plugins/extras/lang/go-extended.lua b/.config/nvim/lua/plugins/extras/lang/go-extended.lua new file mode 100644 index 00000000..f68f9969 --- /dev/null +++ b/.config/nvim/lua/plugins/extras/lang/go-extended.lua @@ -0,0 +1,12 @@ +return { + "ray-x/go.nvim", + dependencies = { + "ray-x/guihua.lua", + "neovim/nvim-lspconfig", + "nvim-treesitter/nvim-treesitter", + }, + opts = {}, + event = { "CmdlineEnter" }, + ft = { "go", "gomod" }, + build = ':lua require("go.install").update_all_sync()', +} diff --git a/.config/nvim/lua/plugins/extras/lang/nix.lua b/.config/nvim/lua/plugins/extras/lang/nix.lua new file mode 100644 index 00000000..bce5a54b --- /dev/null +++ b/.config/nvim/lua/plugins/extras/lang/nix.lua @@ -0,0 +1,26 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + vim.list_extend(opts.ensure_installed, { + "nix", + }) + end, + }, + { + "williamboman/mason.nvim", + opts = function(_, opts) + vim.list_extend(opts.ensure_installed, { + "rnix-lsp", + }) + end, + }, + { + "neovim/nvim-lspconfig", + opts = { + servers = { + rnix = {}, + }, + }, + }, +} diff --git a/.config/nvim/lua/plugins/extras/linting/shellcheck.lua b/.config/nvim/lua/plugins/extras/linting/shellcheck.lua new file mode 100644 index 00000000..41fb447b --- /dev/null +++ b/.config/nvim/lua/plugins/extras/linting/shellcheck.lua @@ -0,0 +1,17 @@ +return { + { + "williamboman/mason.nvim", + opts = function(_, opts) + opts.ensure_installed = opts.ensure_installed or {} + vim.list_extend(opts.ensure_installed, { "shellcheck" }) + end, + }, + { + "mfussenegger/nvim-lint", + opts = function(_, opts) + opts.linters_by_ft.bash = opts.linters_by_ft.bash or {} + table.insert(opts.linters_by_ft.bash, "shellcheck") + return opts + end, + }, +}