diff --git a/hosts/idols-aquamarine/disko-fs.nix b/hosts/idols-aquamarine/disko-fs.nix index 5ac145a2..7f1cc959 100644 --- a/hosts/idols-aquamarine/disko-fs.nix +++ b/hosts/idols-aquamarine/disko-fs.nix @@ -26,6 +26,9 @@ fallbackToPassword = true; allowDiscards = true; }; + # Whether to add a boot.initrd.luks.devices entry for the specified disk. + # This data disk is not needed to boot the system, so we don't need to unlock it in the initrd. + initrdUnlock = false; # encrypt the root partition with luks2 and argon2id, will prompt for a passphrase, which will be used to unlock the partition. # cryptsetup luksFormat diff --git a/modules/nixos/server/server-aarch64.nix b/modules/nixos/server/server-aarch64.nix index 4c3cbee2..d37fdc67 100644 --- a/modules/nixos/server/server-aarch64.nix +++ b/modules/nixos/server/server-aarch64.nix @@ -16,7 +16,7 @@ ../../base.nix ]; - boot.loader.timeout = lib.mkForce 3; # wait for 3 seconds to select the boot entry + boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry # Fix: jasper is marked as broken, refusing to evaluate. environment.enableAllTerminfo = lib.mkForce false; } diff --git a/modules/nixos/server/server-riscv64.nix b/modules/nixos/server/server-riscv64.nix index 3b9c2e06..d0a5071c 100644 --- a/modules/nixos/server/server-riscv64.nix +++ b/modules/nixos/server/server-riscv64.nix @@ -15,5 +15,5 @@ ../../base.nix ]; - boot.loader.timeout = lib.mkForce 3; # wait for 3 seconds to select the boot entry + boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry } diff --git a/modules/nixos/server/server.nix b/modules/nixos/server/server.nix index de551297..051cbd98 100644 --- a/modules/nixos/server/server.nix +++ b/modules/nixos/server/server.nix @@ -3,5 +3,5 @@ ../base ../../base.nix ]; - boot.loader.timeout = lib.mkDefault 3; # wait for 3 seconds to select the boot entry + boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry }