From e2177beef1de56cd00d0fb0fc83a791022f534db Mon Sep 17 00:00:00 2001
From: DuN0z <dun0z@porzh.me>
Date: Wed, 29 Oct 2025 10:05:40 +0100
Subject: [PATCH] Fix: betterlockscreen in its own file

---
 hm/common/betterlockscreen.nix | 21 +++++++++++++++++++++
 hm/desktop/bspwm.nix           | 19 +------------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 hm/common/betterlockscreen.nix

diff --git a/hm/common/betterlockscreen.nix b/hm/common/betterlockscreen.nix
new file mode 100644
index 0000000..7261626
--- /dev/null
+++ b/hm/common/betterlockscreen.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:{
+  home.packages = with pkgs; [
+    xidlehook
+    betterlockscreen
+  ];
+
+  systemd.user.services.xidlehook = {
+    Unit.Description = "Idle: lock at 5min, suspend at ~8min";
+    Service = {
+      ExecStart = ''
+        ${pkgs.xidlehook}/bin/xidlehook \
+          --detect-sleep \
+          --not-when-fullscreen \
+          --timer 300  "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim" "" \
+          --timer 500  "systemctl suspend" ""
+      '';
+      Restart = "always";
+    };
+    Install.WantedBy = ["graphical-session.target"];
+  };
+}
diff --git a/hm/desktop/bspwm.nix b/hm/desktop/bspwm.nix
index 0230ff6..45d7b8f 100644
--- a/hm/desktop/bspwm.nix
+++ b/hm/desktop/bspwm.nix
@@ -6,6 +6,7 @@
 }: {
   imports = [
     ../common/picom.nix
+    ../common/betterlockscreen.nix
   ];
   home.packages = with pkgs; [
     bspwm
@@ -16,9 +17,6 @@
     rofi
     feh
     font-awesome
-    xorg.xset
-    xidlehook
-    betterlockscreen
     pywal16
     imagemagick
     pulsemixer
@@ -130,21 +128,6 @@
     };
   };
 
-  systemd.user.services.xidlehook = {
-    Unit.Description = "Idle: lock at 5min, suspend at ~8min";
-    Service = {
-      ExecStart = ''
-        ${pkgs.xidlehook}/bin/xidlehook \
-          --detect-sleep \
-          --not-when-fullscreen \
-          --timer 300  "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim" "" \
-          --timer 500  "systemctl suspend" ""
-      '';
-      Restart = "always";
-    };
-    Install.WantedBy = ["graphical-session.target"];
-  };
-
   programs = {
     alacritty = {
       enable = true;