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

This commit is contained in:
Snoweuph 2026-04-12 15:37:03 +02:00
commit 66b0d3c6fd
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55

View file

@ -4,26 +4,16 @@
lib, lib,
... ...
}: let }: let
inherit (builtins) attrNames;
inherit (lib.options) mkEnableOption mkOption literalExpression; inherit (lib.options) mkEnableOption mkOption literalExpression;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.meta) getExe; inherit (lib) genAttrs;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.elm; cfg = config.vim.languages.elm;
defaultServers = ["elm-language-server"]; defaultServers = ["elm-language-server"];
servers = { servers = ["elm-language-server"];
elm-language-server = {
enable = true;
cmd = [(getExe pkgs.elmPackages.elm-language-server)];
filetypes = ["elm"];
root_markers = ["elm.json"];
workspace_required = false;
};
};
in { in {
options.vim.languages.elm = { options.vim.languages.elm = {
enable = mkEnableOption "Elm language support"; enable = mkEnableOption "Elm language support";
@ -47,7 +37,7 @@ in {
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.elm.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Elm LSP servers to use"; description = "Elm LSP servers to use";
}; };
@ -63,13 +53,11 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim = { vim.lsp = {
lsp.servers = presets = genAttrs cfg.lsp.servers (_: {enable = true;});
mapListToAttrs (n: { servers = genAttrs cfg.lsp.servers (_: {
name = n; filetypes = ["elm"];
value = servers.${n}; });
})
cfg.lsp.servers;
}; };
}) })
]); ]);