NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-06-13 16:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Factor out diagnostics like LSPs"

Browse source
This commit is contained in:
Ching Pei Yang 2026-06-12 22:22:21 +02:00 • committed by GitHub
commit 6cddf8560b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
55 changed files with 662 additions and 1023 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/extra/deprecations.nix
View file

@ -388,13 +388,5 @@ in {
nvim-tree.lua removed system_open and now uses Neovim's vim.ui.open().
'')
]
# 2026-06-12
[
(mkRemovedOptionModule ["vim" "languages" "sql" "dialect"] ''
This option interfered with project level configurations.
Linters can still be customized via `vim.diagnostics.nvim-lint.<name>.args`
'')
]
];
}

5
modules/plugins/diagnostics/default.nix
View file

@ -1,6 +1,3 @@
{
imports = [
./nvim-lint
./presets
];
imports = [./nvim-lint];
}

20
modules/plugins/diagnostics/presets/biomejs.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.biomejs;
in {
options.vim.diagnostics.presets.biomejs = {
enable = mkDiagnosticsPresetEnableOption "biomejs" "Biome";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.biomejs.cmd = getExe pkgs.biome;
};
}

20
modules/plugins/diagnostics/presets/checkmake.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.checkmake;
in {
options.vim.diagnostics.presets.checkmake = {
enable = mkDiagnosticsPresetEnableOption "checkmake" "Checkmake";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.checkmake.cmd = getExe pkgs.checkmake;
};
}

20
modules/plugins/diagnostics/presets/cpplint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.cpplint;
in {
options.vim.diagnostics.presets.cpplint = {
enable = mkDiagnosticsPresetEnableOption "cpplint" "cpplint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.cpplint.cmd = getExe pkgs.cpplint;
};
}

20
modules/plugins/diagnostics/presets/deadnix.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.deadnix;
in {
options.vim.diagnostics.presets.deadnix = {
enable = mkDiagnosticsPresetEnableOption "deadnix" "Deadnix";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.deadnix.cmd = getExe pkgs.deadnix;
};
}

29
modules/plugins/diagnostics/presets/default.nix
View file

@ -1,29 +0,0 @@
{
imports = [
./biomejs.nix
./checkmake.nix
./cpplint.nix
./deadnix.nix
./djlint.nix
./dotenv-linter.nix
./eslint_d.nix
./golangci-lint.nix
./hadolint.nix
./htmlhint.nix
./ktlint.nix
./luacheck.nix
./markdownlint-cli2.nix
./mypy.nix
./phpstan.nix
./rubocop.nix
./rumdl.nix
./selene.nix
./shellcheck.nix
./sqlfluff.nix
./sqruff.nix
./statix.nix
./stylelint.nix
./taplo.nix
./tombi.nix
];
}

20
modules/plugins/diagnostics/presets/djlint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.djlint;
in {
options.vim.diagnostics.presets.djlint = {
enable = mkDiagnosticsPresetEnableOption "djlint" "djLint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.djlint.cmd = getExe pkgs.djlint;
};
}

20
modules/plugins/diagnostics/presets/dotenv-linter.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.dotenv-linter;
in {
options.vim.diagnostics.presets.dotenv-linter = {
enable = mkDiagnosticsPresetEnableOption "dotenv-linter" "Dotenv Linter";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.dotenv-linter.cmd = getExe pkgs.dotenv-linter;
};
}

30
modules/plugins/diagnostics/presets/eslint_d.nix
View file

@ -1,30 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.eslint_d;
in {
options.vim.diagnostics.presets.eslint_d = {
enable = mkDiagnosticsPresetEnableOption "eslint_d" "Eslint Daemon";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.eslint_d = {
cmd = getExe pkgs.eslint_d;
required_files = [
"eslint.config.js"
"eslint.config.mjs"
".eslintrc"
".eslintrc.json"
".eslintrc.js"
".eslintrc.yml"
];
};
};
}

114
modules/plugins/diagnostics/presets/golangci-lint.nix
View file

@ -1,114 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.golangci-lint;
in {
options.vim.diagnostics.presets.golangci-lint = {
enable = mkDiagnosticsPresetEnableOption "golangci-lint" "GolangCI Lint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.golangci-lint = {
cmd = getExe pkgs.golangci-lint;
args = [
"run"
"--output.json.path=stdout"
"--issues-exit-code=0"
"--show-stats=false"
"--fix=false"
"--path-mode=abs"
# Overwrite values that could be configured and result in unwanted writes
"--output.text.path="
"--output.tab.path="
"--output.html.path="
"--output.checkstyle.path="
"--output.code-climate.path="
"--output.junit-xml.path="
"--output.teamcity.path="
"--output.sarif.path="
(mkLuaInline ''
-- Run on current file only if go.mod is missing
function()
local fnmod = ":p";
local cmd = {"${getExe pkgs.go}", "env", "GOMOD"};
local ok, gomod = pcall(vim.fn.system, cmd);
gomod = gomod:gsub("%s+", "")
if ok and gomod ~= "" and gomod ~= "/dev/null" then
fnmod = ":h";
end
return vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), fnmod)
end
'')
];
append_fname = false;
parser = mkLuaInline ''
function(output, bufnr)
local SOURCE = "golangci-lint";
local function display_tool_error(msg)
return{
{
bufnr = bufnr,
lnum = 0,
col = 0,
message = string.format("[%s] %s", SOURCE, msg),
severity = vim.diagnostic.severity.ERROR,
source = SOURCE,
},
}
end
if output == "" then
return display_tool_error("no output provided")
end
local ok, decoded = pcall(vim.json.decode, output)
if not ok then
return display_tool_error("failed to parse JSON output")
end
if not decoded or not decoded.Issues then
return display_tool_error("unexpected output format")
end
local severity_map = {
error = vim.diagnostic.severity.ERROR,
warning = vim.diagnostic.severity.WARN,
info = vim.diagnostic.severity.INFO,
hint = vim.diagnostic.severity.HINT,
}
local diagnostics = {}
for _, issue in ipairs(decoded.Issues) do
local sev = vim.diagnostic.severity.ERROR
if issue.Severity and issue.Severity ~= "" then
local normalized = issue.Severity:lower()
sev = severity_map[normalized] or vim.diagnostic.severity.ERROR
end
local buffer = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(bufnr), ":p")
if vim.fs.normalize(buffer) == vim.fs.normalize(issue.Pos.Filename) then
table.insert(diagnostics, {
bufnr = bufnr,
lnum = issue.Pos.Line - 1,
col = issue.Pos.Column - 1,
message = issue.Text,
code = issue.FromLinter,
severity = sev,
source = SOURCE,
})
end
end
return diagnostics
end
'';
};
};
}

20
modules/plugins/diagnostics/presets/hadolint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.hadolint;
in {
options.vim.diagnostics.presets.hadolint = {
enable = mkDiagnosticsPresetEnableOption "hadolint" "Hadolint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.hadolint.cmd = getExe pkgs.hadolint;
};
}

20
modules/plugins/diagnostics/presets/htmlhint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.htmlhint;
in {
options.vim.diagnostics.presets.htmlhint = {
enable = mkDiagnosticsPresetEnableOption "htmlhint" "HTMLHint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.htmlhint.cmd = getExe pkgs.htmlhint;
};
}

20
modules/plugins/diagnostics/presets/ktlint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.ktlint;
in {
options.vim.diagnostics.presets.ktlint = {
enable = mkDiagnosticsPresetEnableOption "ktlint" "ktlint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.ktlint.cmd = getExe pkgs.ktlint;
};
}

20
modules/plugins/diagnostics/presets/luacheck.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.luacheck;
in {
options.vim.diagnostics.presets.luacheck = {
enable = mkDiagnosticsPresetEnableOption "luacheck" "Luacheck";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.luacheck.cmd = getExe pkgs.luajitPackages.luacheck;
};
}

20
modules/plugins/diagnostics/presets/markdownlint-cli2.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.markdownlint-cli2;
in {
options.vim.diagnostics.presets.markdownlint-cli2 = {
enable = mkDiagnosticsPresetEnableOption "markdownlint-cli2" "Markdownlint CLI 2";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.markdownlint-cli2.cmd = getExe pkgs.markdownlint-cli2;
};
}

20
modules/plugins/diagnostics/presets/mypy.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe';
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.mypy;
in {
options.vim.diagnostics.presets.mypy = {
enable = mkDiagnosticsPresetEnableOption "mypy" "Mypy";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.mypy.cmd = getExe' pkgs.mypy "mypy";
};
}

20
modules/plugins/diagnostics/presets/phpstan.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.phpstan;
in {
options.vim.diagnostics.presets.phpstan = {
enable = mkDiagnosticsPresetEnableOption "phpstan" "PHPStan";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.phpstan.cmd = getExe pkgs.phpstan;
};
}

20
modules/plugins/diagnostics/presets/rubocop.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.rubocop;
in {
options.vim.diagnostics.presets.rubocop = {
enable = mkDiagnosticsPresetEnableOption "rubocop" "RuboCop";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.rubocop.cmd = getExe pkgs.rubyPackages.rubocop;
};
}

20
modules/plugins/diagnostics/presets/rumdl.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.rumdl;
in {
options.vim.diagnostics.presets.rumdl = {
enable = mkDiagnosticsPresetEnableOption "rumdl" "Rumdl";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.rumdl.cmd = getExe pkgs.rumdl;
};
}

20
modules/plugins/diagnostics/presets/selene.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.selene;
in {
options.vim.diagnostics.presets.selene = {
enable = mkDiagnosticsPresetEnableOption "selene" "Selene";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.selene.cmd = getExe pkgs.selene;
};
}

20
modules/plugins/diagnostics/presets/shellcheck.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.shellcheck;
in {
options.vim.diagnostics.presets.shellcheck = {
enable = mkDiagnosticsPresetEnableOption "shellcheck" "Shellcheck";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.shellcheck.cmd = getExe pkgs.shellcheck;
};
}

23
modules/plugins/diagnostics/presets/sqlfluff.nix
View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.sqlfluff;
in {
options.vim.diagnostics.presets.sqlfluff = {
enable = mkDiagnosticsPresetEnableOption "sqlfluff" "SQLFluff";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.sqlfluff = {
cmd = getExe pkgs.sqlfluff;
args = ["lint" "--format=json"];
};
};
}

23
modules/plugins/diagnostics/presets/sqruff.nix
View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.sqruff;
in {
options.vim.diagnostics.presets.sqruff = {
enable = mkDiagnosticsPresetEnableOption "sqruff" "Sqruff";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.sqruff = {
cmd = getExe pkgs.sqruff;
args = ["lint" "--format=json" "-"];
};
};
}

20
modules/plugins/diagnostics/presets/statix.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.statix;
in {
options.vim.diagnostics.presets.statix = {
enable = mkDiagnosticsPresetEnableOption "statix" "Statix";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.statix.cmd = getExe pkgs.statix;
};
}

20
modules/plugins/diagnostics/presets/stylelint.nix
View file

@ -1,20 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.stylelint;
in {
options.vim.diagnostics.presets.stylelint = {
enable = mkDiagnosticsPresetEnableOption "stylelint" "Stylelint";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.stylelint.cmd = getExe pkgs.stylelint;
};
}

23
modules/plugins/diagnostics/presets/taplo.nix
View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.taplo;
in {
options.vim.diagnostics.presets.taplo = {
enable = mkDiagnosticsPresetEnableOption "taplo" "Taplo";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.taplo = {
cmd = getExe pkgs.taplo;
args = ["lint"];
};
};
}

23
modules/plugins/diagnostics/presets/tombi.nix
View file

@ -1,23 +0,0 @@
{
config,
lib,
pkgs,
...
}: let
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf;
inherit (lib.nvim.types) mkDiagnosticsPresetEnableOption;
cfg = config.vim.diagnostics.presets.tombi;
in {
options.vim.diagnostics.presets.tombi = {
enable = mkDiagnosticsPresetEnableOption "tombi" "Tombi";
};
config = mkIf cfg.enable {
vim.diagnostics.nvim-lint.linters.tombi = {
cmd = getExe pkgs.tombi;
args = ["lint"];
};
};
}

43
modules/plugins/languages/astro.nix
View file

@ -11,7 +11,7 @@
inherit (lib.meta) getExe;
inherit (lib.types) enum coercedTo listOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf enumWithRename;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf enumWithRename;
inherit (lib) genAttrs;
cfg = config.vim.languages.astro;
@ -35,7 +35,24 @@
};
defaultDiagnosticsProvider = ["eslint_d"];
diagnosticsProviders = ["eslint_d"];
diagnosticsProviders = {
eslint_d = let
pkg = pkgs.eslint_d;
in {
package = pkg;
config = {
cmd = getExe pkg;
required_files = [
"eslint.config.js"
"eslint.config.mjs"
".eslintrc"
".eslintrc.json"
".eslintrc.js"
".eslintrc.yml"
];
};
};
};
formatType =
deprecatedSingleOrListOf
@ -96,16 +113,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Astro diagnostics via nvim-lint"
mkEnableOption "extra Astro diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Astro diagnostics providers";
types = diagnostics {
langDesc = "Astro";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -141,12 +158,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.astro = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.astro = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

36
modules/plugins/languages/bash.nix
View file

@ -10,7 +10,7 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum bool listOf;
inherit (lib) genAttrs;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf enumWithRename;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf enumWithRename;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.bash;
@ -26,7 +26,11 @@
};
defaultDiagnosticsProvider = ["shellcheck"];
diagnosticsProviders = ["shellcheck"];
diagnosticsProviders = {
shellcheck = {
package = pkgs.shellcheck;
};
};
in {
options.vim.languages.bash = {
enable = mkEnableOption "Bash language support";
@ -76,16 +80,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Shell diagnostics via nvim-lint"
mkEnableOption "extra Bash diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Shell diagnostics providers";
types = diagnostics {
langDesc = "Bash";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -125,16 +128,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
sh = cfg.extraDiagnostics.types;
bash = cfg.extraDiagnostics.types;
zsh = cfg.extraDiagnostics.types;
};
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.sh = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})
]);

31
modules/plugins/languages/clang.nix
View file

@ -96,9 +96,6 @@
};
clang-format.command = getExe' pkgs.clang-tools "clang-format";
};
defaultDiagnosticsProvider = ["cpplint"];
diagnosticsProviders = ["cpplint"];
in {
options.vim.languages.clang = {
enable = mkEnableOption "C/C++ language support";
@ -171,21 +168,6 @@ in {
description = "C formatter to use";
};
};
extraDiagnostics = {
enable =
mkEnableOption "extra C/C++ diagnostics via nvim-lint"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra C/C++ diagnostics providers";
};
};
};
config = mkIf cfg.enable (mkMerge [
@ -229,18 +211,5 @@ in {
};
};
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
c = cfg.extraDiagnostics.types;
cpp = cfg.extraDiagnostics.types;
};
};
};
})
]);
}

43
modules/plugins/languages/docker.nix
View file

@ -4,12 +4,13 @@
lib,
...
}: let
inherit (lib.attrsets) attrNames genAttrs;
inherit (builtins) attrNames;
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.docker;
@ -25,7 +26,17 @@
};
defaultDiagnosticsProvider = ["hadolint"];
diagnosticsProviders = ["hadolint"];
diagnosticsProviders = {
hadolint = {
config.cmd = getExe (
pkgs.writeShellApplication {
name = "hadolint";
runtimeInputs = [pkgs.hadolint];
text = "hadolint -";
}
);
};
};
in {
options.vim.languages.docker = {
enable = mkEnableOption "Docker language support";
@ -70,16 +81,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Docker diagnostics via nvim-lint"
mkEnableOption "extra Dockerfile diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostic";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Docker diagnostics providers";
types = diagnostics {
langDesc = "Dockerfile";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -141,12 +151,15 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.dockerfile = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.dockerfile = cfg.extraDiagnostics.types;
linters = mkMerge (
map (name: {
${name} = diagnosticsProviders.${name}.config;
})
cfg.extraDiagnostics.types
);
};
})
]);

43
modules/plugins/languages/env.nix
View file

@ -1,33 +1,42 @@
{
config,
pkgs,
lib,
...
}: let
inherit (lib.options) mkEnableOption literalExpression mkOption;
inherit (lib.options) mkEnableOption literalExpression;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.attrsets) genAttrs;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) diagnostics;
cfg = config.vim.languages.env;
defaultDiagnosticsProvider = ["dotenv-linter"];
diagnosticsProviders = ["dotenv-linter"];
diagnosticsProviders = {
dotenv-linter = let
pkg = pkgs.dotenv-linter;
in {
package = pkg;
config = {
cmd = getExe pkg;
};
};
};
in {
options.vim.languages.env = {
enable = mkEnableOption "Env language support";
extraDiagnostics = {
enable =
mkEnableOption "extra Env diagnostics via nvim-lint"
mkEnableOption "extra Env diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostic";
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Env diagnostics providers";
types = diagnostics {
langDesc = "Env";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -49,12 +58,12 @@ in {
}
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.env = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.env = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

127
modules/plugins/languages/go.nix
View file

@ -10,8 +10,9 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib) genAttrs;
inherit (lib.generators) mkLuaInline;
inherit (lib.types) enum package str listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf mkPluginSetupOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf mkPluginSetupOption;
inherit (lib.nvim.dag) entryAfter;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -43,7 +44,107 @@
};
defaultDiagnosticsProvider = ["golangci-lint"];
diagnosticsProviders = ["golangci-lint"];
diagnosticsProviders = {
golangci-lint = let
pkg = pkgs.golangci-lint;
in {
package = pkg;
config = {
cmd = getExe pkg;
args = [
"run"
"--output.json.path=stdout"
"--issues-exit-code=0"
"--show-stats=false"
"--fix=false"
"--path-mode=abs"
# Overwrite values that could be configured and result in unwanted writes
"--output.text.path="
"--output.tab.path="
"--output.html.path="
"--output.checkstyle.path="
"--output.code-climate.path="
"--output.junit-xml.path="
"--output.teamcity.path="
"--output.sarif.path="
(mkLuaInline ''
-- Run on current file only if go.mod is missing
function()
local fnmod = ":p";
local cmd = {"${getExe pkgs.go}", "env", "GOMOD"};
local ok, gomod = pcall(vim.fn.system, cmd);
gomod = gomod:gsub("%s+", "")
if ok and gomod ~= "" and gomod ~= "/dev/null" then
fnmod = ":h";
end
return vim.fn.fnamemodify(vim.api.nvim_buf_get_name(0), fnmod)
end
'')
];
append_fname = false;
parser = mkLuaInline ''
function(output, bufnr)
local SOURCE = "golangci-lint";
local function display_tool_error(msg)
return{
{
bufnr = bufnr,
lnum = 0,
col = 0,
message = string.format("[%s] %s", SOURCE, msg),
severity = vim.diagnostic.severity.ERROR,
source = SOURCE,
},
}
end
if output == "" then
return display_tool_error("no output provided")
end
local ok, decoded = pcall(vim.json.decode, output)
if not ok then
return display_tool_error("failed to parse JSON output")
end
if not decoded or not decoded.Issues then
return display_tool_error("unexpected output format")
end
local severity_map = {
error = vim.diagnostic.severity.ERROR,
warning = vim.diagnostic.severity.WARN,
info = vim.diagnostic.severity.INFO,
hint = vim.diagnostic.severity.HINT,
}
local diagnostics = {}
for _, issue in ipairs(decoded.Issues) do
local sev = vim.diagnostic.severity.ERROR
if issue.Severity and issue.Severity ~= "" then
local normalized = issue.Severity:lower()
sev = severity_map[normalized] or vim.diagnostic.severity.ERROR
end
local buffer = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(bufnr), ":p")
if vim.fs.normalize(buffer) == vim.fs.normalize(issue.Pos.Filename) then
table.insert(diagnostics, {
bufnr = bufnr,
lnum = issue.Pos.Line - 1,
col = issue.Pos.Column - 1,
message = issue.Text,
code = issue.FromLinter,
severity = sev,
source = SOURCE,
})
end
end
return diagnostics
end
'';
};
};
};
in {
options.vim.languages.go = {
enable = mkEnableOption "Go language support";
@ -125,16 +226,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Go diagnostics via nvim-lint"
mkEnableOption "extra Go diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostic";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Go diagnostics providers";
types = diagnostics {
langDesc = "Go";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
@ -256,12 +357,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.go = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.go = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})

32
modules/plugins/languages/html.nix
View file

@ -5,12 +5,13 @@
...
}: let
inherit (builtins) attrNames;
inherit (lib.meta) getExe;
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) bool enum listOf;
inherit (lib) genAttrs;
inherit (lib.lists) optional;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -28,7 +29,11 @@
};
defaultDiagnosticsProvider = ["htmlhint"];
diagnosticsProviders = ["htmlhint"];
diagnosticsProviders = {
htmlhint = {
config.cmd = getExe pkgs.htmlhint;
};
};
in {
options.vim.languages.html = {
enable = mkEnableOption "HTML language support";
@ -78,16 +83,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra HTML diagnostics via nvim-lint"
mkEnableOption "extra HTML diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra HTML diagnostics providers";
types = diagnostics {
langDesc = "HTML";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -133,12 +138,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.html = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.html = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name} = diagnosticsProviders.${name}.config;
})
cfg.extraDiagnostics.types);
};
})
]);

33
modules/plugins/languages/kotlin.nix
View file

@ -6,9 +6,11 @@
}: let
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.meta) getExe;
inherit (lib) genAttrs;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.kotlin;
@ -16,7 +18,11 @@
servers = ["kotlin-language-server"];
defaultDiagnosticsProvider = ["ktlint"];
diagnosticsProviders = ["ktlint"];
diagnosticsProviders = {
ktlint = {
package = pkgs.ktlint;
};
};
in {
options.vim.languages.kotlin = {
enable = mkEnableOption "Kotlin/HCL support";
@ -47,16 +53,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Kotlin diagnostics via nvim-lint"
mkEnableOption "extra Kotlin diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Kotlin diagnostics providers";
types = diagnostics {
langDesc = "Kotlin";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -67,12 +73,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.kotlin = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.kotlin = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})

34
modules/plugins/languages/lua.nix
View file

@ -10,7 +10,7 @@
inherit (lib.meta) getExe;
inherit (lib) genAttrs;
inherit (lib.types) bool enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) diagnostics mkGrammarOption;
inherit (lib.nvim.dag) entryBefore;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -27,7 +27,14 @@
};
defaultDiagnosticsProvider = ["luacheck"];
diagnosticsProviders = ["luacheck" "selene"];
diagnosticsProviders = {
luacheck = {
package = pkgs.luajitPackages.luacheck;
};
selene = {
package = pkgs.selene;
};
};
in {
imports = [
(lib.mkRemovedOptionModule ["vim" "languages" "lua" "lsp" "neodev"] ''
@ -79,15 +86,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Lua diagnostics via nvim-lint"
mkEnableOption "extra Lua diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Lua diagnostics providers";
types = diagnostics {
langDesc = "Lua";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -136,12 +143,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.lua = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.lua = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})
]))

34
modules/plugins/languages/make.nix
View file

@ -6,10 +6,10 @@
}: let
inherit (builtins) attrNames;
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.meta) getExe;
inherit (lib.types) listOf enum;
inherit (lib) genAttrs;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.make;
@ -22,7 +22,13 @@
};
defaultDiagnosticsProvider = ["checkmake"];
diagnosticsProviders = ["checkmake"];
diagnosticsProviders = {
checkmake = {
config = {
cmd = getExe pkgs.checkmake;
};
};
};
in {
options.vim.languages.make = {
enable = mkEnableOption "Make support";
@ -53,15 +59,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Make diagnostics via nvim-lint"
mkEnableOption "extra Make diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Make diagnostics providers";
types = diagnostics {
langDesc = "Make";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -90,12 +96,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.make = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.make = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

34
modules/plugins/languages/markdown.nix
View file

@ -11,7 +11,7 @@
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.types) bool enum listOf str nullOr;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption mkPluginSetupOption deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAnywhere;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.trivial) warn;
@ -46,7 +46,14 @@
};
};
defaultDiagnosticsProvider = ["markdownlint-cli2"];
diagnosticsProviders = ["markdownlint-cli2" "rumdl"];
diagnosticsProviders = {
markdownlint-cli2 = {
package = pkgs.markdownlint-cli2;
};
rumdl = {
package = pkgs.rumdl;
};
};
in {
options.vim.languages.markdown = {
enable = mkEnableOption "Markdown markup language support";
@ -139,15 +146,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Markdown diagnostics via nvim-lint"
mkEnableOption "extra Markdown diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Markdown diagnostics providers";
types = diagnostics {
langDesc = "Markdown";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -207,12 +214,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.markdown = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.markdown = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})
]);

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 deprecatedSingleOrListOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.nix;
@ -30,7 +30,31 @@
};
defaultDiagnosticsProvider = ["statix" "deadnix"];
diagnosticsProviders = ["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",
})
)
'';
};
};
in {
options.vim.languages.nix = {
enable = mkEnableOption "Nix language support";
@ -76,16 +100,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Nix diagnostics via nvim-lint"
mkEnableOption "extra Nix diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Nix diagnostics providers";
types = diagnostics {
langDesc = "Nix";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -196,12 +220,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.nix = cfg.extraDiagnostics.types;
};
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);
};
})
]);

36
modules/plugins/languages/php.nix
View file

@ -4,14 +4,14 @@
lib,
...
}: let
inherit (builtins) attrNames;
inherit (builtins) attrNames toString;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum int attrs listOf;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.php;
@ -35,7 +35,12 @@
};
defaultDiagnosticsProvider = ["phpstan"];
diagnosticsProviders = ["phpstan"];
diagnosticsProviders = {
phpstan = {
config.cmd = getExe pkgs.phpstan;
};
};
in {
options.vim.languages.php = {
enable = mkEnableOption "PHP language support";
@ -109,15 +114,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra PHP diagnostics via nvim-lint"
mkEnableOption "extra PHP diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostic";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra PHP diagnostics providers";
types = diagnostics {
langDesc = "PHP";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -173,12 +179,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.php = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.php = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

34
modules/plugins/languages/python.nix
View file

@ -8,11 +8,11 @@
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.lists) flatten;
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package bool listOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) deprecatedSingleOrListOf;
inherit (lib.nvim.types) deprecatedSingleOrListOf diagnostics;
inherit (lib.trivial) warn;
cfg = config.vim.languages.python;
@ -112,7 +112,13 @@
};
};
defaultDiagnosticsProvider = ["mypy"];
diagnosticsProviders = ["mypy"];
diagnosticsProviders = {
mypy = {
config = {
cmd = getExe' pkgs.mypy "mypy";
};
};
};
in {
options.vim.languages.python = {
enable = mkEnableOption "Python language support";
@ -189,15 +195,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Python diagnostics via nvim-lint"
mkEnableOption "extra Python diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Python diagnostics providers";
types = diagnostics {
langDesc = "Python";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -255,12 +261,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.python = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.python = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

34
modules/plugins/languages/ruby.nix
View file

@ -9,7 +9,7 @@
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf enumWithRename;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf enumWithRename;
inherit (lib.types) enum listOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
@ -28,7 +28,11 @@
};
defaultDiagnosticsProvider = ["rubocop"];
diagnosticsProviders = ["rubocop"];
diagnosticsProviders = {
rubocop = {
package = pkgs.rubyPackages.rubocop;
};
};
in {
options.vim.languages.ruby = {
enable = mkEnableOption "Ruby language support";
@ -75,13 +79,13 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "Ruby extra diagnostics via nvim-lint"
mkEnableOption "Ruby extra diagnostics support"
// {default = config.vim.languages.enableExtraDiagnostics;};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Ruby diagnostics providers";
types = diagnostics {
langDesc = "Ruby";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -117,15 +121,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
ruby = cfg.extraDiagnostics.types;
eruby = cfg.extraDiagnostics.types;
};
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.ruby = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
};
})
]);

36
modules/plugins/languages/scss.nix
View file

@ -10,7 +10,7 @@
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.scss;
@ -30,7 +30,13 @@
};
defaultDiagnosticsProvider = ["stylelint"];
diagnosticsProviders = ["stylelint"];
diagnosticsProviders = {
stylelint = {
config = {
cmd = getExe pkgs.stylelint;
};
};
};
in {
options.vim.languages.scss = {
enable = mkEnableOption "SCSS/SASS language support";
@ -76,15 +82,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra SCSS/SASS diagnostics via nvim-lint"
mkEnableOption "extra SCSS/SASS diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra SCSS/SASS diagnostics providers";
types = diagnostics {
langDesc = "SCSS";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -124,15 +130,13 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
scss = cfg.extraDiagnostics.types;
sass = cfg.extraDiagnostics.types;
};
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.scss = cfg.extraDiagnostics.types;
linters_by_ft.sass = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

53
modules/plugins/languages/sql.nix
View file

@ -9,8 +9,8 @@
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum package listOf;
inherit (lib.nvim.types) deprecatedSingleOrListOf;
inherit (lib.types) enum package str listOf;
inherit (lib.nvim.types) diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.sql;
@ -24,18 +24,41 @@
formats = {
sqlfluff = {
command = getExe sqlfluffDefault;
append_args = ["--dialect=${cfg.dialect}"];
};
sqruff = {
command = getExe sqruffDefault;
append_args = ["--dialect=${cfg.dialect}"];
};
};
defaultDiagnosticsProvider = ["sqlfluff"];
diagnosticsProviders = ["sqlfluff" "sqruff"];
diagnosticsProviders = {
sqlfluff = {
package = sqlfluffDefault;
config = {
cmd = getExe sqlfluffDefault;
args = ["lint" "--format=json" "--dialect=${cfg.dialect}"];
};
};
sqruff = {
package = sqruffDefault;
config = {
cmd = getExe sqruffDefault;
args = ["lint" "--format=json" "--dialect=${cfg.dialect}" "-"];
};
};
};
in {
options.vim.languages.sql = {
enable = mkEnableOption "SQL language support";
dialect = mkOption {
type = str;
default = "ansi";
description = "SQL dialect for formatters and diagnostics (if used)";
};
treesitter = {
enable =
mkEnableOption "SQL treesitter"
@ -83,16 +106,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra SQL diagnostics via nvim-lint"
mkEnableOption "extra SQL diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra SQL diagnostics providers";
types = diagnostics {
langDesc = "SQL";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -130,14 +153,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {
enable = true;
});
nvim-lint = {
enable = true;
linters_by_ft.sql = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.sql = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

44
modules/plugins/languages/svelte.nix
View file

@ -11,7 +11,7 @@
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.types) enum coercedTo listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.svelte;
@ -35,8 +35,26 @@
};
};
# TODO: specify packages
defaultDiagnosticsProvider = ["eslint_d"];
diagnosticsProviders = ["eslint_d"];
diagnosticsProviders = {
eslint_d = let
pkg = pkgs.eslint_d;
in {
package = pkg;
config = {
cmd = getExe pkg;
required_files = [
"eslint.config.js"
"eslint.config.mjs"
".eslintrc"
".eslintrc.json"
".eslintrc.js"
".eslintrc.yml"
];
};
};
};
formatType =
deprecatedSingleOrListOf
@ -93,16 +111,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Svelte diagnostics via nvim-lint"
mkEnableOption "extra Svelte diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Svelte diagnostics providers";
types = diagnostics {
langDesc = "Svelte";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -138,12 +156,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.svelte = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.svelte = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

34
modules/plugins/languages/toml.nix
View file

@ -10,7 +10,7 @@
inherit (lib.modules) mkIf mkMerge;
inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.types) diagnostics mkGrammarOption deprecatedSingleOrListOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.toml;
@ -39,7 +39,12 @@
};
};
defaultDiagnosticsProvider = ["tombi"];
diagnosticsProviders = ["tombi" "taplo"];
diagnosticsProviders = {
tombi = {
package = pkgs.tombi;
args = ["lint"];
};
};
in {
options.vim.languages.toml = {
enable = mkEnableOption "TOML configuration language support";
@ -86,15 +91,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra TOML diagnostics via nvim-lint"
mkEnableOption "extra TOML diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra TOML diagnostics providers";
types = diagnostics {
langDesc = "TOML";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -132,12 +137,15 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.toml = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.toml = cfg.extraDiagnostics.types;
linters = mkMerge (
map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types
);
};
})
]);

39
modules/plugins/languages/tsx.nix
View file

@ -10,7 +10,7 @@
inherit (lib.attrsets) attrNames genAttrs;
inherit (lib.meta) getExe;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
cfg = config.vim.languages.tsx;
@ -41,7 +41,16 @@
};
defaultDiagnosticsProvider = ["biomejs"];
diagnosticsProviders = ["biomejs"];
diagnosticsProviders = {
biomejs = let
pkg = pkgs.biome;
in {
package = pkg;
config = {
cmd = getExe pkg;
};
};
};
in {
options.vim.languages.tsx = {
enable = mkEnableOption "Typescript XML (TSX) language support";
@ -86,12 +95,12 @@ in {
};
extraDiagnostics = {
enable = mkEnableOption "extra Typescript XML (TSX) diagnostics via nvim-lint" // {default = config.vim.languages.enableExtraDiagnostics;};
enable = mkEnableOption "extra Typescript XML (TSX) diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Typescript XML (TSX) diagnostics providers";
types = diagnostics {
langDesc = "Typescript XML (TSX)";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -135,15 +144,15 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
typescriptreact = cfg.extraDiagnostics.types;
javascriptreact = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft = {
typescriptreact = cfg.extraDiagnostics.types;
javascriptreact = cfg.extraDiagnostics.types;
};
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

34
modules/plugins/languages/twig.nix
View file

@ -10,7 +10,7 @@
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.types) listOf enum;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.twig;
@ -26,8 +26,14 @@
# TODO: if twig-cs-fixer gets packaged for nix, add it and default to it.
};
defaultDiagnosticsProvider = ["djlint"];
# TODO: if curlylint gets packaged for nix, add it.
diagnosticsProviders = ["djlint"];
diagnosticsProviders = {
djlint = {
config = {
cmd = getExe pkgs.djlint;
};
};
# TODO: if curlylint gets packaged for nix, add it.
};
in {
options.vim.languages.twig = {
enable = mkEnableOption "Twig templating language support";
@ -72,15 +78,15 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Twig diagnostics via nvim-lint"
mkEnableOption "extra Twig diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Twig diagnostics providers";
types = diagnostics {
langDesc = "Twig";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -116,12 +122,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.twig = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.twig = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})
]);

53
modules/plugins/languages/typescript.nix
View file

@ -12,7 +12,7 @@
inherit (lib.types) enum bool listOf;
inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption enumWithRename;
inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption enumWithRename;
inherit (lib.nvim.dag) entryAnywhere;
cfg = config.vim.languages.typescript;
@ -44,8 +44,35 @@
};
};
# TODO: specify packages
defaultDiagnosticsProvider = ["eslint_d"];
diagnosticsProviders = ["eslint_d" "biomejs"];
diagnosticsProviders = {
eslint_d = let
pkg = pkgs.eslint_d;
in {
package = pkg;
config = {
cmd = getExe pkg;
required_files = [
"eslint.config.js"
"eslint.config.mjs"
".eslintrc"
".eslintrc.cjs"
".eslintrc.json"
".eslintrc.js"
".eslintrc.yml"
];
};
};
biomejs = let
pkg = pkgs.biome;
in {
package = pkg;
config = {
cmd = getExe pkg;
};
};
};
in {
options.vim.languages.typescript = {
enable = mkEnableOption "Typescript/Javascript language support";
@ -101,10 +128,10 @@ in {
extraDiagnostics = {
enable = mkEnableOption "extra Typescript/Javascript diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Typescript/Javascript diagnostics providers";
types = diagnostics {
langDesc = "Typescript/Javascript";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
@ -170,14 +197,12 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft = {
typescript = cfg.extraDiagnostics.types;
};
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.typescript = cfg.extraDiagnostics.types;
linters =
mkMerge (map (name: {${name} = diagnosticsProviders.${name}.config;})
cfg.extraDiagnostics.types);
};
})

38
modules/plugins/languages/vue.nix
View file

@ -10,7 +10,7 @@
inherit (lib) genAttrs;
inherit (lib.meta) getExe;
inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.types) mkGrammarOption diagnostics;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.vue;
@ -34,7 +34,16 @@
};
defaultDiagnosticsProvider = ["biomejs"];
diagnosticsProviders = ["biomejs"];
diagnosticsProviders = {
biomejs = let
pkg = pkgs.biome;
in {
package = pkg;
config = {
cmd = getExe pkg;
};
};
};
in {
options.vim.languages.vue = {
enable = mkEnableOption "Vue.js language support";
@ -82,16 +91,16 @@ in {
extraDiagnostics = {
enable =
mkEnableOption "extra Vue.js diagnostics via nvim-lint"
mkEnableOption "extra Vue.js diagnostics"
// {
default = config.vim.languages.enableExtraDiagnostics;
defaultText = literalExpression "config.vim.languages.enableExtraDiagnostics";
};
types = mkOption {
type = listOf (enum diagnosticsProviders);
default = defaultDiagnosticsProvider;
description = "extra Vue.js diagnostics providers";
types = diagnostics {
langDesc = "Vue.js";
inherit diagnosticsProviders;
inherit defaultDiagnosticsProvider;
};
};
};
@ -127,12 +136,15 @@ in {
})
(mkIf cfg.extraDiagnostics.enable {
vim.diagnostics = {
presets = genAttrs cfg.extraDiagnostics.types (_: {enable = true;});
nvim-lint = {
enable = true;
linters_by_ft.vue = cfg.extraDiagnostics.types;
};
vim.diagnostics.nvim-lint = {
enable = true;
linters_by_ft.vue = cfg.extraDiagnostics.types;
linters = mkMerge (
map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types
);
};
})
]);