diff --git a/home/.config/hypr/hyprland.conf b/home/.config/hypr/hyprland.conf
index 7247333..5f8c34e 100644
--- a/home/.config/hypr/hyprland.conf
+++ b/home/.config/hypr/hyprland.conf
@@ -20,8 +20,6 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = setbg
 exec-once = sleep 2 && eww open bar0
 #exec-once = eww open bar1
-exec-once = dunst
-exec-once = swayidle
 
 exec-once = aa-notify -p
 exec-once = udiskie -A -T
diff --git a/home/.config/systemd/user/dunst.service b/home/.config/systemd/user/dunst.service
new file mode 100644
index 0000000..7a67667
--- /dev/null
+++ b/home/.config/systemd/user/dunst.service
@@ -0,0 +1,10 @@
+[Unit]
+Description="Dunst daemon"
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/dunst
+Restart=on-failure
+
+[Install]
+WantedBy=wm-ready.target
diff --git a/home/.config/systemd/user/swayidle.service b/home/.config/systemd/user/swayidle.service
new file mode 100644
index 0000000..d307232
--- /dev/null
+++ b/home/.config/systemd/user/swayidle.service
@@ -0,0 +1,10 @@
+[Unit]
+Description="Idle management daemon"
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/swayidle
+Restart=on-failure
+
+[Install]
+WantedBy=wm-ready.target
diff --git a/home/.config/systemd/user/wm-ready.target.wants/dunst.service b/home/.config/systemd/user/wm-ready.target.wants/dunst.service
new file mode 120000
index 0000000..5afdbc1
--- /dev/null
+++ b/home/.config/systemd/user/wm-ready.target.wants/dunst.service
@@ -0,0 +1 @@
+/home/itsdrike/.config/systemd/user/dunst.service
\ No newline at end of file
diff --git a/home/.config/systemd/user/wm-ready.target.wants/swayidle.service b/home/.config/systemd/user/wm-ready.target.wants/swayidle.service
new file mode 120000
index 0000000..ae3a698
--- /dev/null
+++ b/home/.config/systemd/user/wm-ready.target.wants/swayidle.service
@@ -0,0 +1 @@
+/home/itsdrike/.config/systemd/user/swayidle.service
\ No newline at end of file