NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 22:36:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

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

29
modules/plugins/languages/xml.nix
View file

@ -4,27 +4,16 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib) genAttrs;
cfg = config.vim.languages.xml; cfg = config.vim.languages.xml;
defaultServers = ["lemminx"]; defaultServers = ["lemminx"];
servers = { servers = ["lemminx"];
lemminx = {
enable = true;
cmd = [
(getExe pkgs.lemminx)
];
filetypes = ["xml"];
root_markers = [".git"];
};
};
in { in {
options.vim.languages.xml = { options.vim.languages.xml = {
enable = mkEnableOption "XML language support"; enable = mkEnableOption "XML language support";
@ -47,7 +36,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = listOf (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "XML LSP server to use"; description = "XML LSP server to use";
}; };
@ -61,12 +50,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (name: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
inherit name; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${name}; filetypes = ["xml"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }