[General/Cleanup] Simplify nixConfig generator

This commit is contained in:
Antoine Viallon 2022-02-08 12:08:04 +01:00
parent 825a3d5b65
commit 0e0ebc1502
Signed by: aviallon
GPG key ID: 186FC35EDEB25716

View file

@ -9,16 +9,17 @@ let
else if isList value then toString value else if isList value then toString value
else generators.mkValueStringDefault { } value; else generators.mkValueStringDefault { } value;
isNullOrEmpty = v: (v == null) ||
(isList v && (length v == 0));
nixConfig = settings: (generators.toKeyValue { nixConfig = settings: (generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault { mkKeyValue = generators.mkKeyValueDefault {
mkValueString = nixConfigValue; mkValueString = nixConfigValue;
} " = "; } " = ";
} (filterAttrs (n: v: !( } (filterAttrs (n: v: !(isNullOrEmpty v))
(v == null) ||
(isList v && (length v == 0))
))
settings) settings)
); );
in in
{ {
options.aviallon.general = { options.aviallon.general = {