diff --git a/baseModules/default.nix b/baseModules/default.nix
index 50c14bdd..677c7b2f 100644
--- a/baseModules/default.nix
+++ b/baseModules/default.nix
@@ -60,11 +60,15 @@ self: {lib, ...}: {
       };
     };
 
-    logind.extraConfig = ''
-      # Don't shutdown when power button is short-pressed
-      HandlePowerKey=suspend
-      HandlePowerKeyLongPress=poweroff
-    '';
+    logind = {
+      powerKey = "suspend";
+      powerKeyLongPress = "poweroff";
+      extraConfig = ''
+        # Don't shutdown when power button is short-pressed
+        HandlePowerKey=suspend
+        HandlePowerKeyLongPress=poweroff
+      '';
+    };
 
     openssh = {
       enable = true;