diff --git a/common.nix b/common.nix
index f0f5da1..3a14546 100644
--- a/common.nix
+++ b/common.nix
@@ -56,10 +56,12 @@ with builtins; {
       iw
       btop
       nodejs
+
       maven
       jetbrains.idea-ultimate
       jetbrains.rust-rover
       jdk
+
       libsecret
       fzf
       ripgrep
@@ -96,6 +98,7 @@ with builtins; {
   };
 
   services = {
+    systemd-lock-handler.enable = true;
     openssh = {
       enable = true;
       # settings.PasswordAuthentication = false;
diff --git a/modules/desktop-environment/home/sway/default.nix b/modules/desktop-environment/home/sway/default.nix
index 2a2bee3..e93e9b7 100644
--- a/modules/desktop-environment/home/sway/default.nix
+++ b/modules/desktop-environment/home/sway/default.nix
@@ -20,6 +20,10 @@
   services.swayidle = {
     enable = true;
     events = [
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock}/bin/swaylock -fF -c 442244";
+      }
       {
         event = "lock";
         command = "swaylock -c 441144";