diff --git a/hosts/pingbox/configuration.nix b/hosts/pingbox/configuration.nix
index 25d4f7b..7a7c893 100644
--- a/hosts/pingbox/configuration.nix
+++ b/hosts/pingbox/configuration.nix
@@ -17,6 +17,8 @@
     powertop.enable = true;
   };
 
+  boot.resumeDevice = "/dev/disk/by-label/swap";
+
   hardware.acpilight.enable = true;
 
   networking = {
@@ -35,6 +37,10 @@
         tapping = true;
       };
     };
+
+    logind = {
+      lidSwitch = "suspend-then-hibernate";
+    };
   };
 
 }
diff --git a/user/daniel/home.nix b/user/daniel/home.nix
index 9ea2edd..2ee8341 100644
--- a/user/daniel/home.nix
+++ b/user/daniel/home.nix
@@ -161,6 +161,7 @@
 		screen-locker = {
 			enable = true;
 			lockCmd = "${pkgs.i3lock}/bin/i3lock -i /home/daniel/wallpapers/lock.png";
+			inactiveInterval = 60;
 		};
 	};