nixos-modules/vmCommon: separate timed from non-timed config via mkMerge

due to Nix evaluation errors because of name clashing otherwise
secrix-issue25
Felix Stupp 3 months ago
parent 3fc09eb8b9
commit 536a0780b5
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -49,8 +49,9 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable (lib.mkMerge [
{
# timing-related options # timing-related options
# - ordered by chronological order # - ordered by chronological order
@ -73,6 +74,10 @@ in
dates = "05:30"; dates = "05:30";
}; };
}
{
# all other options # all other options
@ -218,7 +223,10 @@ in
# environment.loginShellInit = "${resize}/bin/resize"; (see https://github.com/nix-community/srvos/blob/main/nixos/common/serial.nix) # environment.loginShellInit = "${resize}/bin/resize"; (see https://github.com/nix-community/srvos/blob/main/nixos/common/serial.nix)
}; }
]);
} }

Loading…
Cancel
Save