xaked/nvim
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions 1 Packages Projects Releases 11 Wiki Activity

Add hcl configuration, test hcl formatter

Browse Source
This commit is contained in:
Mykhailo Nikiforov
2023-08-26 21:30:47 +03:00
parent f3a1558cd1
commit 0030230429
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1692799911,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -77,11 +77,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1687193290, "lastModified": 1692986144,
"narHash": "sha256-3bknptEbd9LLlCiFRFkMwmciHB+QXET41gH/RX+Nr1A=", "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad157fe26e74211e7dde0456cb3fd9ab78b6e552", "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@@ -69,6 +69,7 @@
golangci-lint # go lint golangci-lint # go lint
golangci-lint-langserver # go lint golangci-lint-langserver # go lint
gopls # google go lsp gopls # google go lsp
packer # hcl formatter
]; ];
neovim-augmented = recursiveMerge [ neovim-augmented = recursiveMerge [
pkgs.neovim-unwrapped pkgs.neovim-unwrapped

2
pwnvim/filetypes.lua
View File

@@ -36,7 +36,7 @@ M.config = function()
autocmd("FileType", autocmd("FileType",
{ {
pattern = { "c", "ruby", "php", "php3", "perl", "python", "mason", "vim", "sh", "zsh", "scala", "javascript", 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, callback = function() require('pwnvim.options').programming() end,
group = filetypes group = filetypes
}) })

14
pwnvim/plugins.lua
View File

@@ -238,6 +238,7 @@ M.diagnostics = function(groovyls_cmd, groovy_lsp_settings)
formatting.alejandra, -- for nix formatting.alejandra, -- for nix
formatting.prismaFmt, -- for node prisma db orm formatting.prismaFmt, -- for node prisma db orm
formatting.npm_groovy_lint, -- groovy lsp formatting.npm_groovy_lint, -- groovy lsp
formatting.packer, -- hcl formatter
formatting.prettier.with { formatting.prettier.with {
-- extra_args = { -- extra_args = {
@@ -251,14 +252,19 @@ M.diagnostics = function(groovyls_cmd, groovy_lsp_settings)
"json", "jsonc", "yaml", "graphql", "handlebars", "svelte" "json", "jsonc", "yaml", "graphql", "handlebars", "svelte"
}, },
disabled_filetypes = { "markdown" } disabled_filetypes = { "markdown" }
}, diagnostics.eslint_d.with { },
diagnostics.eslint_d.with {
args = { args = {
"-f", "json", "--stdin", "--stdin-filename", "$FILENAME" "-f", "json", "--stdin", "--stdin-filename", "$FILENAME"
} }
}, -- diagnostics.vale, },
codeactions.eslint_d, codeactions.gitsigns, codeactions.statix, -- for nix -- diagnostics.vale,
codeactions.eslint_d, -- for nix
codeactions.gitsigns, -- for nix
codeactions.statix, -- for nix
diagnostics.statix, -- for nix diagnostics.statix, -- for nix
null_ls.builtins.hover.dictionary, codeactions.shellcheck, null_ls.builtins.hover.dictionary,
codeactions.shellcheck,
diagnostics.shellcheck, diagnostics.shellcheck,
diagnostics.npm_groovy_lint -- groovy lsp diagnostics.npm_groovy_lint -- groovy lsp
-- removed formatting.rustfmt since rust_analyzer seems to do the same thing -- removed formatting.rustfmt since rust_analyzer seems to do the same thing