nix-community/nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-11-08 19:46:06 +01:00
Code Activity

lib/options (mkSettingsOption): allow more types for settingsOption when no sub-options are explicitly declared

Browse source
This commit is contained in:
Gaetan Lepage 2025-10-24 11:39:35 +02:00 • committed by Gaétan Lepage
parent 4439dd85cd
commit ecb75f49d1
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/options.nix
View file

@ -329,14 +329,22 @@ rec {
options ? { },
description,
example ? null,
# If no sub-options are explicitly declared, settings do not need to be a submodule.
submoduleType ? options != { },
}:
lib.mkOption {
type =
with types;
submodule {
freeformType = attrsOf lib.nixvim.lua-types.anything;
let
anyLuaType = lib.nixvim.lua-types.anything;
in
if submoduleType then
types.submodule {
freeformType = types.attrsOf anyLuaType;
inherit options;
};
}
else
assert options == { };
anyLuaType;
default = { };
inherit description;
example =

6
plugins/lsp/language-servers/_mk-lsp.nix
View file

@ -179,6 +179,12 @@ in
settings = lib.nixvim.mkSettingsOption {
description = "The settings for this LSP.";
options = settingsOptions;
# Some servers declare settings sub-options without using `settingsOptions`.
# This leads the `settings` option to not be typed as a submodule.
# Hence, we force all `plugins.lsp.<name>.settings` options to be types as submodules.
# FIXME This is not ideal, but `plugins.lsp` will be dropped entirely in a few months.
submoduleType = true;
};
extraOptions = mkOption {