diff --git a/nodes/hosts/common/home/jay/home.nix b/nodes/hosts/common/home/jay/home.nix
index ce80326..2cf96ec 100644
--- a/nodes/hosts/common/home/jay/home.nix
+++ b/nodes/hosts/common/home/jay/home.nix
@@ -10,6 +10,7 @@
     inputs.hyprpanel.homeManagerModules.hyprpanel 
     ./services/arrpc.nix
     ./services/fluidsynth.nix
+    ./services/hypridle.nix
   ];
 
 
@@ -280,26 +281,6 @@
     
   };
 
-  services = {
-    hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          lock_cmd = "pidof hyprlock || hyprlock";
-          #before_sleep_cmd = "loginctl lock-session";
-          #after_sleep_cmd = "hyprctl dispatch dpms on";
-        };
-    
-        listener = [
-          {
-            timeout = 300;
-            on-timeout = "loginctl lock-session";
-          }
-        ];
-      };
-    };
-  };
-
   wayland.windowManager.hyprland = {
     # Allow home-manager to configure hyprland
     enable = true;
diff --git a/nodes/hosts/common/home/jay/services/hypridle.nix b/nodes/hosts/common/home/jay/services/hypridle.nix
new file mode 100644
index 0000000..291df7d
--- /dev/null
+++ b/nodes/hosts/common/home/jay/services/hypridle.nix
@@ -0,0 +1,17 @@
+{ pkgs, ...}: {
+  services.hypridle = {
+    enable = true;
+    settings = {
+      general = {
+        lock_cmd = "pidof hyprlock || hyprlock";
+      };
+      
+      listener = [
+        {
+          timeout = 300;
+          on-timeout = "loginctl lock-session";
+        }
+      ];
+    };
+  };
+}