lib/options: make use of previously unused mkNullableWithRaw internally

This commit is contained in:
Gaetan Lepage 2024-05-16 12:33:29 +02:00 committed by Gaétan Lepage
parent c5bb651d01
commit 72ff1489c7

View file

@ -72,7 +72,7 @@ rec {
'' ''
); );
mkNullableWithRaw = type: mkNullable (maybeRaw type); mkNullableWithRaw = type: mkNullable (nixvimTypes.maybeRaw type);
mkStrLuaOr = mkStrLuaOr =
type: default: desc: type: default: desc:
@ -134,24 +134,22 @@ rec {
'' ''
); );
mkNum = default: mkNullable (with nixvimTypes; maybeRaw number) (toString default); mkNum = default: mkNullableWithRaw types.number (toString default);
mkInt = default: mkNullable (with nixvimTypes; maybeRaw int) (toString default); mkInt = default: mkNullableWithRaw types.int (toString default);
# Positive: >0 # Positive: >0
mkPositiveInt = default: mkNullable (with nixvimTypes; maybeRaw ints.positive) (toString default); mkPositiveInt = default: mkNullableWithRaw types.ints.positive (toString default);
# Unsigned: >=0 # Unsigned: >=0
mkUnsignedInt = default: mkNullable (with nixvimTypes; maybeRaw ints.unsigned) (toString default); mkUnsignedInt = default: mkNullableWithRaw types.ints.unsigned (toString default);
mkBool = mkBool = default: mkNullableWithRaw types.bool (if default then "true" else "false");
default: mkNullable (with nixvimTypes; maybeRaw bool) (if default then "true" else "false"); mkStr = default: mkNullableWithRaw types.str ''${builtins.toString default}'';
mkStr = default: mkNullable (with nixvimTypes; maybeRaw str) ''${builtins.toString default}'';
mkAttributeSet = default: mkNullable nixvimTypes.attrs ''${default}''; mkAttributeSet = default: mkNullable nixvimTypes.attrs ''${default}'';
mkListOf = ty: default: mkNullable (with nixvimTypes; listOf (maybeRaw ty)) default; mkListOf = ty: default: mkNullable (with nixvimTypes; listOf (maybeRaw ty)) default;
mkAttrsOf = ty: default: mkNullable (with nixvimTypes; attrsOf (maybeRaw ty)) default; mkAttrsOf = ty: default: mkNullable (with nixvimTypes; attrsOf (maybeRaw ty)) default;
mkEnum = mkEnum = enumValues: default: mkNullableWithRaw (types.enum enumValues) ''"${default}"'';
enumValues: default: mkNullable (with nixvimTypes; maybeRaw (enum enumValues)) ''"${default}"'';
mkEnumFirstDefault = enumValues: mkEnum enumValues (head enumValues); mkEnumFirstDefault = enumValues: mkEnum enumValues (head enumValues);
mkBorder = mkBorder =
default: name: desc: default: name: desc:
mkNullable (with nixvimTypes; maybeRaw border) default ( mkNullableWithRaw nixvimTypes.border default (
let let
defaultDesc = '' defaultDesc = ''
Defines the border to use for ${name}. Defines the border to use for ${name}.