NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-04-27 03:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

languages/html: refactor lsp.servers to use lsp/presets/<name>

Browse source
This commit is contained in:
Snoweuph 2026-04-12 00:54:08 +02:00
commit baedca4807
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,8 @@
inherit (lib.meta) getExe;
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) bool enum;
inherit (lib.types) bool enum listOf;
inherit (lib) genAttrs;
inherit (lib.lists) optional;
inherit (lib.nvim.types) mkGrammarOption diagnostics deprecatedSingleOrListOf;
inherit (lib.nvim.dag) entryAnywhere;
@ -17,18 +18,7 @@
cfg = config.vim.languages.html;
defaultServers = ["superhtml"];
servers = {
superhtml = {
cmd = [(getExe pkgs.superhtml) "lsp"];
filetypes = ["html" "shtml" "htm"];
root_markers = ["index.html" ".git"];
};
emmet-ls = {
cmd = [(getExe pkgs.emmet-ls) "--stdio"];
filetypes = ["html" "shtml" "htm"];
root_markers = ["index.html" ".git"];
};
};
servers = ["superhtml" "emmet-ls"];
defaultFormat = ["superhtml"];
formats = {
@ -70,7 +60,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable";
};
servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.html.lsp.servers" (enum (attrNames servers));
type = listOf (enum servers);
default = defaultServers;
description = "HTML LSP server to use";
};
@ -124,12 +114,12 @@ in {
})
(mkIf cfg.lsp.enable {
vim.lsp.servers =
mapListToAttrs (n: {
name = n;
value = servers.${n};
})
cfg.lsp.servers;
vim.lsp = {
presets = genAttrs cfg.lsp.servers (_: {enable = true;});
servers = genAttrs cfg.lsp.servers (_: {
filetypes = ["html" "shtml" "xhtml" "htm"];
});
};
})
(mkIf (cfg.format.enable && !cfg.lsp.enable) {