diff --git a/modules/core.nix b/modules/core.nix
index e705fdd..8eb1eeb 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -35,6 +35,15 @@ in
 
     services.power-profiles-daemon.enable = true;
 
+    services.logind = {
+      settings = {
+        Login = {
+          HandleLidSwitch = "suspend-then-hibernate";
+          HibernateDelaySec = "1800";
+        };
+      };
+    };
+
     nix = {
       settings = {
         experimental-features = [
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 1669668..2760d69 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -105,6 +105,10 @@ in
             command = "${pkgs.wlopm}/bin/wlopm --off '*'";
             resumeCommand = "${pkgs.wlopm}/bin/wlopm --on '*'";
           }
+          {
+            timeout = 900;
+            command = "${pkgs.systemd}/bin/systemctl hibernate";
+          }
         ];
       };