diff options
-rw-r--r-- | common/vim.nix | 8 | ||||
-rw-r--r-- | dotfiles/vim-dev.lua | 16 |
2 files changed, 23 insertions, 1 deletions
diff --git a/common/vim.nix b/common/vim.nix index cc772c3..24afca9 100644 --- a/common/vim.nix +++ b/common/vim.nix | |||
@@ -127,6 +127,7 @@ let | |||
127 | vim-abolish | 127 | vim-abolish |
128 | vim-oscyank | 128 | vim-oscyank |
129 | comment-nvim | 129 | comment-nvim |
130 | null-ls-nvim | ||
130 | ] ++ config.vim.extraPlugins; | 131 | ] ++ config.vim.extraPlugins; |
131 | }; | 132 | }; |
132 | }; | 133 | }; |
@@ -182,8 +183,13 @@ in | |||
182 | }; | 183 | }; |
183 | }; | 184 | }; |
184 | 185 | ||
185 | environment.systemPackages = with pkgs; [ | 186 | environment.systemPackages = with pkgs.unstable; [ |
186 | myNeovim | 187 | myNeovim |
188 | |||
189 | deadnix | ||
190 | statix | ||
191 | # TODO: add global vale config | ||
192 | vale | ||
187 | ]; | 193 | ]; |
188 | 194 | ||
189 | environment.sessionVariables = { | 195 | environment.sessionVariables = { |
diff --git a/dotfiles/vim-dev.lua b/dotfiles/vim-dev.lua index 0b9773d..84b8e6e 100644 --- a/dotfiles/vim-dev.lua +++ b/dotfiles/vim-dev.lua | |||
@@ -80,3 +80,19 @@ require("nlua.lsp.nvim").setup(lspconfig, { | |||
80 | }, | 80 | }, |
81 | on_attach = on_attach, | 81 | on_attach = on_attach, |
82 | }) | 82 | }) |
83 | |||
84 | -- Null LSP | ||
85 | |||
86 | require("null-ls").setup({ | ||
87 | sources = { | ||
88 | require("null-ls").builtins.code_actions.shellcheck, | ||
89 | require("null-ls").builtins.code_actions.statix, | ||
90 | require("null-ls").builtins.diagnostics.deadnix, | ||
91 | require("null-ls").builtins.diagnostics.shellcheck, | ||
92 | require("null-ls").builtins.diagnostics.statix, | ||
93 | require("null-ls").builtins.diagnostics.vale.with { | ||
94 | filetypes = { "markdown", "pandoc", "tex", "asciidoc" }, | ||
95 | }, | ||
96 | }, | ||
97 | on_attach = on_attach, | ||
98 | }) | ||