diff --git a/modules/generic.nix b/modules/generic.nix
index f132222..f2c5c21 100644
--- a/modules/generic.nix
+++ b/modules/generic.nix
@@ -47,6 +47,7 @@ in
     openssh = {
       enable = true;
       passwordAuthentication = false;
+      extraConfig = "ClientAliveInterval 60";
     };
     tailscale.enable = true;
   };
@@ -56,6 +57,8 @@ in
     allowedUDPPorts = [ config.services.tailscale.port ];
   };
 
+  boot.loader.timeout = 1;
+
   environment.systemPackages = with pkgs; [
     wget
     htop