NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 02:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages/html: remove null_ls usage

Browse source 
Remove usage of null_ls and replace it with new standards.
This commit is contained in:
Cool-Game-Dev 2025-08-13 19:53:41 -05:00 • committed by Poseidon
commit 3aadd2f3ce
1 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,22 +35,13 @@
};
};
};
defaultDiagnosticsProvider = ["htmlhint"];
diagnosticsProviders = {
htmlhint = {
package = pkgs.htmlhint;
nullConfig = pkg: ''
table.insert(
ls_sources,
null_ls.builtins.diagnostics.htmlhint.with({
command = "${pkg}/bin/htmlhint"
})
)
'';
config.cmd = getExe pkgs.htmlhint;
};
};
in {
options.vim.languages.html = {
enable = mkEnableOption "HTML language support";
@ -91,7 +82,7 @@ in {
extraDiagnostics = {
enable = mkEnableOption "extra HTML diagnostics" // {default = config.vim.languages.enableExtraDiagnostics;};
types = diagnostics {
langDesc = "HTML";
inherit diagnosticsProviders;
@ -99,7 +90,7 @@ in {
};
};
};
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.treesitter.enable {
vim = {
@ -117,7 +108,7 @@ in {
})
(mkIf cfg.lsp.enable {
vim.lsp.servers =
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
@ -140,9 +131,9 @@ in {
enable = true;
linters_by_ft.html = cfg.extraDiagnostics.types;
linters = mkMerge (map (name: {
${name}.cmd = getExe diagnosticsProviders.${name}.package;
})
cfg.extraDiagnostics.types);
${name} = diagnosticsProviders.${name}.config;
})
cfg.extraDiagnostics.types);
};
})
]);