diff --git a/hyprland/.config/hypr/config.d/81-autostart-hypridle.conf b/hyprland/.config/hypr/config.d/81-autostart-hypridle.conf
new file mode 100644
index 00000000..945a1b5d
--- /dev/null
+++ b/hyprland/.config/hypr/config.d/81-autostart-hypridle.conf
@@ -0,0 +1,3 @@
+# vim: set ft=config:
+# Configuration for hypridle is in ~/.config/hypr/hypridle.conf
+exec-once = hypridle
diff --git a/hyprland/.config/hypr/config.d/81-autostart-swayidle.conf b/hyprland/.config/hypr/config.d/81-autostart-swayidle.conf
deleted file mode 100644
index 0114e60c..00000000
--- a/hyprland/.config/hypr/config.d/81-autostart-swayidle.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: set ft=config:
-# Configuration for swayidle is in ~/.config/swayidle/config
-exec-once = swayidle -w
diff --git a/hyprland/.config/hypr/hypridle.conf b/hyprland/.config/hypr/hypridle.conf
index c2806d0d..8f1564e3 100644
--- a/hyprland/.config/hypr/hypridle.conf
+++ b/hyprland/.config/hypr/hypridle.conf
@@ -1,8 +1,8 @@
 # vim: set ft=config:
 # for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hypridle
 general {
-	lock_cmd = loginctl lock-session
-	unlock_cmd = loginctl unlock-session
+	lock_cmd = hyprlock
+	unlock_cmd = pkill -xu "$USER" -SIGUSR1 hyprlock
 }
 
 listener {