fix:(modules/nixos/server): The option `boot.loader.timeout' has conflicting definition values

This commit is contained in:
Ryan Yin
2024-03-31 23:38:42 +08:00
parent 8bc96ba0e8
commit 7486e75016
2 changed files with 3 additions and 4 deletions

View File

@@ -22,9 +22,8 @@
}; };
boot.growPartition = true; boot.growPartition = true;
boot.kernelParams = [ "console=ttyS0" ]; boot.kernelParams = ["console=ttyS0"];
boot.loader.grub.device = "/dev/vda"; boot.loader.grub.device = "/dev/vda";
boot.loader.timeout = 0;
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
services.openssh.enable = true; services.openssh.enable = true;

View File

@@ -1,7 +1,7 @@
{ {lib, ...}: {
imports = [ imports = [
../base ../base
../../base.nix ../../base.nix
]; ];
boot.loader.timeout = 3; # wait for 3 seconds to select the boot entry boot.loader.timeout = lib.mkDefault 3; # wait for 3 seconds to select the boot entry
} }