diff --git a/modules/nixos/base/core.nix b/modules/nixos/base/core.nix
index 7f4bc4e1..f2aa8aee 100644
--- a/modules/nixos/base/core.nix
+++ b/modules/nixos/base/core.nix
@@ -6,6 +6,8 @@
     consoleMode = lib.mkDefault "max";
   };
 
+  boot.loader.timeout = lib.mkDefault 8; # wait for x seconds to select the boot entry
+
   # for power management
   services = {
     power-profiles-daemon = {
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index eeb48a40..5bbdfc9b 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -1,3 +1,9 @@
-{mylib, ...}: {
+{
+  mylib,
+  lib,
+  ...
+}: {
   imports = mylib.scanPaths ./.;
+
+  boot.loader.timeout = lib.mkForce 10; # wait for x seconds to select the boot entry
 }
diff --git a/modules/nixos/server/kubevirt-hardware-configuration.nix b/modules/nixos/server/kubevirt-hardware-configuration.nix
index 105925cb..6edb8f13 100644
--- a/modules/nixos/server/kubevirt-hardware-configuration.nix
+++ b/modules/nixos/server/kubevirt-hardware-configuration.nix
@@ -32,7 +32,7 @@
     boot.kernelParams = ["console=ttyS0"];
     boot.loader.grub.device = "/dev/vda";
 
-    services.qemuGuest.enable = true;
+    services.qemuGuest.enable = true; # qemu-guest-agent
     services.openssh.enable = true;
     # we configure the host via nixos itself, so we don't need the cloud-init
     services.cloud-init.enable = lib.mkForce false;
diff --git a/modules/nixos/server/server-aarch64.nix b/modules/nixos/server/server-aarch64.nix
index d37fdc67..fb30e36e 100644
--- a/modules/nixos/server/server-aarch64.nix
+++ b/modules/nixos/server/server-aarch64.nix
@@ -16,7 +16,6 @@
     ../../base.nix
   ];
 
-  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 d0a5071c..c6956d7c 100644
--- a/modules/nixos/server/server-riscv64.nix
+++ b/modules/nixos/server/server-riscv64.nix
@@ -14,6 +14,4 @@
 
     ../../base.nix
   ];
-
-  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 051cbd98..5c7821cd 100644
--- a/modules/nixos/server/server.nix
+++ b/modules/nixos/server/server.nix
@@ -3,5 +3,4 @@
     ../base
     ../../base.nix
   ];
-  boot.loader.timeout = lib.mkForce 7; # wait for x seconds to select the boot entry
 }