NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-14 08:36:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

diagnostics/presets: init

Browse source
This commit is contained in:
Snoweuph 2026-05-11 23:25:02 +02:00
commit 92d33a5dc9
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
55 changed files with 1023 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/plugins/languages/nix.nix
View file

@ -10,7 +10,7 @@
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.nix;
@ -30,31 +30,7 @@
};
defaultDiagnosticsProvider = ["statix" "deadnix"];
diagnosticsProviders = {
statix = {
package = pkgs.statix;
nullConfig = pkg: ''
table.insert(
ls_sources,
null_ls.builtins.diagnostics.statix.with({
command = "${pkg}/bin/statix",
})
)
'';
};
deadnix = {
package = pkgs.deadnix;
nullConfig = pkg: ''
table.insert(
ls_sources,
null_ls.builtins.diagnostics.deadnix.with({
command = "${pkg}/bin/deadnix",
})
)
'';
};
};
diagnosticsProviders = ["statix" "deadnix"];
in {
options.vim.languages.nix = {
enable = mkEnableOption "Nix language support";
@ -100,16 +76,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Nix diagnostics"
mkEnableOption "extra Nix diagnostics via nvim-lint"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = diagnostics {
langDesc = "Nix";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Nix diagnostics providers";
};
};
};
@ -220,13 +196,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.nix = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.nix = cfg.extraDiagnostics.types;
};
};
})
]);