From 8ca2e82d621c1ee3ab3ac83fcccd05f3dab9633e Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sun, 21 Apr 2024 18:58:00 +0200
Subject: [PATCH] Restructure the idlelock exception

---
 modules/home/de/hypridlelock.nix |  2 +-
 users/seb/@seb-desktop.nix       |  3 +++
 users/seb/@seb-laptop.nix        | 25 +++++++++++--------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/home/de/hypridlelock.nix b/modules/home/de/hypridlelock.nix
index ecf52e0..6d1b04e 100644
--- a/modules/home/de/hypridlelock.nix
+++ b/modules/home/de/hypridlelock.nix
@@ -30,7 +30,7 @@
             enable = true;
 
             lockCmd = "pidof ${hyprlockExe} || ${hyprlockExe}";
-            # beforeSleepCmd = "loginctl lock-session";
+            beforeSleepCmd = "loginctl lock-session & sleep1";
             afterSleepCmd = "hyprctl dispatch dpms on";
 
             listeners = [
diff --git a/users/seb/@seb-desktop.nix b/users/seb/@seb-desktop.nix
index 20b2e7e..046271a 100644
--- a/users/seb/@seb-desktop.nix
+++ b/users/seb/@seb-desktop.nix
@@ -1,6 +1,7 @@
 {
     inputs,
     pkgs,
+    lib,
     ...
 }: {
     imports = [./default.nix];
@@ -20,5 +21,7 @@
                 --replace "5000" "16"
             '';
         };
+
+        services.hypridle.beforeSleepCmd = lib.mkForce "";
     };
 }
diff --git a/users/seb/@seb-laptop.nix b/users/seb/@seb-laptop.nix
index 2fc9597..bf097d6 100644
--- a/users/seb/@seb-laptop.nix
+++ b/users/seb/@seb-laptop.nix
@@ -4,19 +4,16 @@
     home-manager.users.seb = {
         wayland.windowManager.hyprland.settings.monitor = "eDP-1,1920x1080@60,0x0,1";
 
-        services.hypridle = {
-            beforeSleepCmd = "loginctl lock-session";
-            listeners = [
-                {
-                    timeout = 300;
-                    onTimeout = "brillo -q -O && brillo -q -S 10";
-                    onResume = "brillo -q -I";
-                }
-                {
-                    timeout = 1200;
-                    onTimeout = "systemctl suspend";
-                }
-            ];
-        };
+        services.hypridle.listeners = [
+            {
+                timeout = 300;
+                onTimeout = "brillo -q -O && brillo -q -S 10";
+                onResume = "brillo -q -I";
+            }
+            {
+                timeout = 1200;
+                onTimeout = "systemctl suspend";
+            }
+        ];
     };
 }