Rewrite the hyprlock (systemd-lock-handler) service

home/.config/hypr/hypridle.conf

@@ -1,7 +1,6 @@
 
 
 general {
-  unlock-cmd = killall -s SIGUSR1 hyprlock
   before_sleep_cmd = loginctl lock-session
   ignore_dbus_inhibit = false
   ignore_systemd_inhibit = false;

home/.config/systemd/user/hyprlock.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Run hyprlock screenlocker on lock dbus event (using systemd-lock-handler)
+Requisite=wm-ready.target
+# if hyprlock exists cleanly, enter a 'unlock' target
+OnSuccess=unlock.target
+# When lock.target is stopped, stop this unit too
+PartOf=lock.target
+
+[Service]
+ExecStart=/usr/bin/hyprlock
+StandardOutput=journal
+ExecStop=/bin/kill -s SIGUSR1 $MAINPID
+ExecStopPost=/bin/loginctl unlock-session
+Restart=on-failure
+
+[Install]
+WantedBy=lock.target

home/.config/systemd/user/lock.target.wants/hyprlock.service

@@ -0,0 +1 @@
+/home/itsdrike/.config/systemd/user/hyprlock.service

home/.config/systemd/user/lock.target.wants/systemd-lock-handler-hyprlock.service

@@ -1 +0,0 @@
-/home/itsdrike/.config/systemd/user/systemd-lock-handler-hyprlock.service

home/.config/systemd/user/systemd-lock-handler-hyprlock.service

@@ -1,15 +0,0 @@
-[Unit]
-Description=Run hyprlock screenlocker on lock dbus event (using systemd-lock-handler)
-# if swaylock exists cleanly, unlock this session
-OnSuccess=unlock.target
-# When lock.target is stopped, stop this too
-PartOf=lock.target
-# Delay lock.target until this service is ready
-After=lock.target
-
-[Service]
-ExecStart=/usr/bin/stdbuf -oL /usr/bin/hyprlock
-Restart=on-failure
-
-[Install]
-WantedBy=lock.target