1 files changed, 20 insertions, 6 deletions
diff --git a/autostart.sh b/autostart.sh
index c55754f..38d03be 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -17,11 +17,25 @@ killandrun () {
   fi
 }
 
-#runifnot runsvdir ~/.runit/runsvdir
-notify-sound.sh off &
-runifnot swayidle
-runifnot mako
-launch_waybar.sh "$(crcparse WC)"
-killandrun swaybg -i ~/background.jpg
+if [ -n "${WAYLAND_DISPLAY}${DISPLAY}" ]; then
+  notify-sound.sh off &
+  runifnot caffeine
+  if [ -n "$WAYLAND_DISPLAY" ]; then
+    runifnot swayidle
+    launch_waybar.sh "$(crcparse WC)"
+    killandrun swaybg -i ~/background.jpg
+  else
+    runifnot picom
+    runifnot xss-lock slockd
+    runifnot sxhkd
+    if "$(type xmonad >/dev/null 2>&1)"; then
+      if ["$(crcparse WM)" = "$(which xmonad)" ]; then
+        runifnot stalonetray
+      fi
+    fi
+    xwallpaper --zoom ~/background.jpg
+    setxkbmap -option "caps:escape"
+  fi
+fi
 
 [ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh"