diff --git a/flake.lock b/flake.lock index 356d5bb..3a91650 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687193290, - "narHash": "sha256-3bknptEbd9LLlCiFRFkMwmciHB+QXET41gH/RX+Nr1A=", + "lastModified": 1692986144, + "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad157fe26e74211e7dde0456cb3fd9ab78b6e552", + "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0b755e4..6644009 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,7 @@ golangci-lint # go lint golangci-lint-langserver # go lint gopls # google go lsp + packer # hcl formatter ]; neovim-augmented = recursiveMerge [ pkgs.neovim-unwrapped diff --git a/pwnvim/filetypes.lua b/pwnvim/filetypes.lua index 707c730..4206a11 100644 --- a/pwnvim/filetypes.lua +++ b/pwnvim/filetypes.lua @@ -36,7 +36,7 @@ M.config = function() autocmd("FileType", { pattern = { "c", "ruby", "php", "php3", "perl", "python", "mason", "vim", "sh", "zsh", "scala", "javascript", - "javascriptreact", "typescript", "typescriptreact", "html", "svelte", "css", "nix", "terraform" }, + "javascriptreact", "typescript", "typescriptreact", "html", "svelte", "css", "nix", "terraform", "hcl" }, callback = function() require('pwnvim.options').programming() end, group = filetypes }) diff --git a/pwnvim/plugins.lua b/pwnvim/plugins.lua index 9764c14..6add1b4 100644 --- a/pwnvim/plugins.lua +++ b/pwnvim/plugins.lua @@ -238,6 +238,7 @@ M.diagnostics = function(groovyls_cmd, groovy_lsp_settings) formatting.alejandra, -- for nix formatting.prismaFmt, -- for node prisma db orm formatting.npm_groovy_lint, -- groovy lsp + formatting.packer, -- hcl formatter formatting.prettier.with { -- extra_args = { @@ -251,14 +252,19 @@ M.diagnostics = function(groovyls_cmd, groovy_lsp_settings) "json", "jsonc", "yaml", "graphql", "handlebars", "svelte" }, disabled_filetypes = { "markdown" } - }, diagnostics.eslint_d.with { - args = { - "-f", "json", "--stdin", "--stdin-filename", "$FILENAME" - } - }, -- diagnostics.vale, - codeactions.eslint_d, codeactions.gitsigns, codeactions.statix, -- for nix - diagnostics.statix, -- for nix - null_ls.builtins.hover.dictionary, codeactions.shellcheck, + }, + diagnostics.eslint_d.with { + args = { + "-f", "json", "--stdin", "--stdin-filename", "$FILENAME" + } + }, + -- diagnostics.vale, + codeactions.eslint_d, -- for nix + codeactions.gitsigns, -- for nix + codeactions.statix, -- for nix + diagnostics.statix, -- for nix + null_ls.builtins.hover.dictionary, + codeactions.shellcheck, diagnostics.shellcheck, diagnostics.npm_groovy_lint -- groovy lsp -- removed formatting.rustfmt since rust_analyzer seems to do the same thing