diff --git a/modules/home/de/hyprland/classic.nix b/modules/home/de/hyprland/classic.nix
index 43d1c62..c750d2b 100644
--- a/modules/home/de/hyprland/classic.nix
+++ b/modules/home/de/hyprland/classic.nix
@@ -46,6 +46,7 @@
 
       # Manage session
       bindrl = SUPER CONTROL, L, exec, loginctl lock-session
+      bindrl = SUPER CONTROL, S, exec, systemctl sleep
     '';
   };
 }
diff --git a/modules/home/de/hyprland/noctalia.nix b/modules/home/de/hyprland/noctalia.nix
index 8614bcf..fbda85d 100644
--- a/modules/home/de/hyprland/noctalia.nix
+++ b/modules/home/de/hyprland/noctalia.nix
@@ -36,6 +36,7 @@
 
       # Manage session
       bindrl = SUPER CONTROL, L, exec, $ipc lockScreen lock
+      bindrl = SUPER CONTROL, S, exec, $ipc sessionMenu lockAndSuspend
     '';
   };
 }
diff --git a/modules/home/programs/hyprland/keybinds.nix b/modules/home/programs/hyprland/keybinds.nix
index 26c5ba8..8586f39 100644
--- a/modules/home/programs/hyprland/keybinds.nix
+++ b/modules/home/programs/hyprland/keybinds.nix
@@ -49,7 +49,6 @@
       bindrl = SUPER CONTROL, P, exec, poweroff
       bindrl = SUPER CONTROL, R, exec, reboot
       bindrl = SUPER CONTROL, H, exec, systemctl hibernate
-      bindrl = SUPER CONTROL, S, exec, systemctl sleep
       bindrl = SUPER CONTROL, B, exec, sleep 1 && hyprctl dispatch dpms off
 
       # Control media
diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix
index ab391b6..e22a3c5 100644
--- a/modules/nixos/services/alloy.nix
+++ b/modules/nixos/services/alloy.nix
@@ -11,8 +11,8 @@ in
   options.custom.services.alloy = {
     enable = lib.mkEnableOption "";
     domain = lib.mkOption {
-      type = lib.types.nonEmptyStr;
-      default = "";
+      type = lib.types.nullOr lib.types.nonEmptyStr;
+      default = null;
     };
     port = lib.mkOption {
       type = lib.types.port;
@@ -128,6 +128,6 @@ in
         };
       };
 
-    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port;
   };
 }
diff --git a/profiles/core.nix b/profiles/core.nix
index 7690326..53f02d1 100644
--- a/profiles/core.nix
+++ b/profiles/core.nix
@@ -73,6 +73,8 @@
 
   console.keyMap = "de-latin1-nodeadkeys";
 
+  security.sudo.extraConfig = "Defaults pwfeedback";
+
   sops.secrets."seb-password".neededForUsers = true;
   users = {
     mutableUsers = false;
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index 9aac853..d338f13 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -25,6 +25,10 @@
     services = {
       sound.enable = true;
       syncthing.enable = true;
+      alloy = {
+        enable = true;
+        domain = null;
+      };
     };
   };