diff --git a/configuration.nix b/configuration.nix
index 8c7ddcd..0a6b4e8 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -319,6 +319,7 @@ in
       nnn
       libreoffice-qt6-fresh
       nix-tree
+      xsecurelock
     ]
   );
 
@@ -448,9 +449,14 @@ in
   # Power button invokes suspend, not shutdown.
 
   services.logind.settings.Login = {
-    # extraConfig = "HandlePowerKey=hibernate";
-    HandleLidSwitch = "hybrid-sleep";
-    HandlePowerKey = "hibernate";
+    HandleLidSwitch = "suspend-then-hibernate";
+    HandlePowerKey = "ignore";
+  };
+
+  programs.xss-lock = {
+    enable = true;
+    lockerCommand = "${pkgs.xsecurelock}/bin/xsecurelock";
+    extraOptions = [ "--transfer-sleep-lock" ];
   };
 
   # video acceleration
diff --git a/home.nix b/home.nix
index ce402a4..d1e555d 100644
--- a/home.nix
+++ b/home.nix
@@ -1263,10 +1263,6 @@ in
     enable = true;
     configFile.source = ./home/config/nushell/config.nu;
     shellAliases = {
-      hibernate = "systemctl hibernate";
-      suspend = "systemctl suspend";
-      logout = "sudo pkill -u fredrikr";
-      lock = "/home/fredrikr/.logout.sh";
       jl = "jj log";
       jla = ''jj log -r "all()"'';
       jll = "jj log --no-pager --limit 5";
diff --git a/home/config/xmonad/xmonad.hs b/home/config/xmonad/xmonad.hs
index 616043b..7b4c27c 100644
--- a/home/config/xmonad/xmonad.hs
+++ b/home/config/xmonad/xmonad.hs
@@ -61,7 +61,7 @@ myConfig =
                             -- , ("<M-S-s>", unGrab *> spawn "scrot -s ~/Pictures/Screenshots/%b-%d::%H-%M-%S.png")
                           ]
         `additionalKeys` [ ((mod1Mask, xK_Tab), nextMatch History (return True)),
-                           ((modm, xK_Escape), spawn "dm-tool lock"),
+                           ((modm, xK_Escape), spawn "xset s activate"),
                            ((modm, xK_Down), nextWS),
                            ((modm, xK_Up), prevWS),
                            ((modm, xK_j), nextWS),