diff --git a/init b/init
index 623b94e..586b752 100755
--- a/init
+++ b/init
@@ -251,47 +251,28 @@ systemd-notify --ready
 
 "${SCRIPT_DIR}/emacs-server-set-wayland-display.zsh"
 
-# Start some programs
-# spawn "waybar"
-# spawn 'env -u GTK_IM_MODULE fcitx5 -rd' # prevent warnings
-# spawn 'dunst'
-# spawn '/usr/lib/mate-polkit/polkit-mate-authentication-agent-1'
-# spawn 'kanshi'
-# spawn 'systembus-notify'
+# The following is a list of units to enable:
+# systemctl --user enable waybar.service
+# systemctl --user enable fcitx5.service
+# systemctl --user enable dunst.service
+# systemctl --user enable polkit-mate-authentication-agent-1.service
+# systemctl --user enable kanshi.service
+# systemctl --user enable systembus-notify.service
+# systemctl --user enable swayidle.service
+# systemctl --user enable swaybg.service
+# systemctl --user enable khal-notify.service
+# systemctl --user enable inhibit-sleep-for-audio.service
 
-# case "${HOST}" in
-#     *-desktop)
-#         spawn "swayidle -w -C '${RIVER_CONFIG}/swayidle-desktop.conf'"
-#         spawn "swaybg -o DP-1 -m fill -i '${WALLPAPERS_DIR}/fapta.png' "\
-#               "-o DP-3 -m fill -i '${WALLPAPERS_DIR}/Veko and Friend.png'"
-#         ;;
-#     *-portable)
-#         spawn "${SCRIPT_DIR}/laptop-lid-daemon"
-#         spawn "swayidle -w -C '${RIVER_CONFIG}/swayidle-laptop.conf'"
-#         spawn "swaybg -m fill -o '*' -i '${WALLPAPERS_DIR}/Girls Last Tour 2.jpg'"
-#         ;;
-# esac
+# Laptop only:
+# systemctl --user enable laptop-lid-daemon.service
+# systemctl --user enable usbguard-notify.service
 
-# "${SCRIPT_DIR}/cl/bin/khal-notify" &
-# "${SCRIPT_DIR}/cl/bin/inhibit-sleep-for-audio" &
-# "${SCRIPT_DIR}/notify-tasks.hy" &
-# "${SCRIPT_DIR}/usbguard-notify.py" &
-
-# {
-#     # try to make sure these start after waybar opens
-#     let i=0
-#     while ! pgrep waybar >/dev/null 2>&1; do
-#         if ((${i} >= 8)); then
-#             exit
-#         fi
-#         sleep 0.25s
-#     done
-#     sleep 1s
-#     spawn "keepassxc"
-#     spawn "nextcloud"
-#     spawn "corectrl --minimize-systray"
-#     spawn "solaar -w hide"
-#     spawn "protonmail-bridge --no-window"
-#     spawn "mullvad-vpn"
-#     spawn "blueman-applet"
-# } &
+# Tray apps:
+# systemctl --user enable tray-apps.target
+# systemctl --user enable keepassxc.service
+# systemctl --user enable nextcloud.service
+# systemctl --user enable corectrl.service
+# systemctl --user enable solaar.service
+# systemctl --user enable protonmail-bridge.service
+# systemctl --user enable blueman-applet.service
+# systemctl --user enable safeeyes.service
diff --git a/systemd/dunst.service b/systemd/dunst.service
new file mode 100644
index 0000000..47b5ba5
--- /dev/null
+++ b/systemd/dunst.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Dunst notification daemon
+Documentation=man:dunst(1)
+PartOf=graphical-session.target
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.Notifications
+ExecStart=/usr/bin/dunst
+Slice=session.slice
+ExecReload=dunstctl reload
+
+[Install]
+WantedBy=graphical-session.target