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

This commit is contained in:
Snoweuph 2026-04-12 15:34:30 +02:00
commit 56b62f79ea
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55

View file

@ -4,25 +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.meta) getExe; inherit (lib) genAttrs;
inherit (lib.types) enum; inherit (lib.types) enum listOf;
inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf; inherit (lib.nvim.types) mkGrammarOption;
inherit (lib.nvim.attrsets) mapListToAttrs;
cfg = config.vim.languages.gleam; cfg = config.vim.languages.gleam;
defaultServers = ["gleam"]; defaultServers = ["gleam"];
servers = { servers = ["gleam"];
gleam = {
enable = true;
cmd = [(getExe pkgs.gleam) "lsp"];
filetypes = ["gleam"];
root_markers = ["gleam.toml" ".git"];
};
};
in { in {
options.vim.languages.gleam = { options.vim.languages.gleam = {
enable = mkEnableOption "Gleam language support"; enable = mkEnableOption "Gleam language support";
@ -45,7 +36,7 @@ in {
defaultText = literalExpression "config.vim.lsp.enable"; defaultText = literalExpression "config.vim.lsp.enable";
}; };
servers = mkOption { servers = mkOption {
type = deprecatedSingleOrListOf "vim.language.gleam.lsp.servers" (enum (attrNames servers)); type = listOf (enum servers);
default = defaultServers; default = defaultServers;
description = "Gleam LSP server to use"; description = "Gleam LSP server to use";
}; };
@ -59,12 +50,12 @@ in {
}) })
(mkIf cfg.lsp.enable { (mkIf cfg.lsp.enable {
vim.lsp.servers = vim.lsp = {
mapListToAttrs (n: { presets = genAttrs cfg.lsp.servers (_: {enable = true;});
name = n; servers = genAttrs cfg.lsp.servers (_: {
value = servers.${n}; filetypes = ["gleam"];
}) });
cfg.lsp.servers; };
}) })
]); ]);
} }