diff --git a/home-manager/wayland/idle.nix b/home-manager/wayland/idle.nix
index 1a810aa..89281b2 100644
--- a/home-manager/wayland/idle.nix
+++ b/home-manager/wayland/idle.nix
@@ -16,6 +16,24 @@ let
   }
 in {
 
+  services.hypridle.enable = true;
+  services.hypridle.settings = {
+    general = {
+      before_sleep_cmd = "swaylock -f";
+    };
+
+    listener = [
+      {
+        timeout = 120;
+        on-timeout = "swaylock -f --grace=180"
+      }
+      {
+        timeout = 600;
+        on-timeout = "systemctl suspend";
+      }
+    ];
+  };
+
   # Idle inhibiting
 
   home.packages = [
diff --git a/home-manager/wayland/scripts/autostart b/home-manager/wayland/scripts/autostart
index 3917f4b..76d8ae7 100755
--- a/home-manager/wayland/scripts/autostart
+++ b/home-manager/wayland/scripts/autostart
@@ -5,8 +5,3 @@ swaybg -o '*' -i "$background" -m fill &
 
 # Status Bar
 eww open "$platform"_bar --screen 0
-
-# Idle Handler
-swayidle timeout 120 'swaylock -f --grace=180' \
-    timeout 600 'systemctl suspend' \
-    before-sleep 'swaylock -f' &