merge wayland and master

1 files changed, 27 insertions, 12 deletions

diff --git a/autostart.sh b/autostart.sh
index e9fbeda..38d03be 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -7,20 +7,35 @@ runifnot () {
     fi
   fi
 }
+killandrun () {
+  if type $1 >/dev/null; then
+    echo $1
+    if [ -n "$(pgrep -Uzachir -f $1)" ]; then
+      pkill -Uzachir $1
+    fi
+    $@ &
+  fi
+}
 
-#runifnot runsvdir ~/.runit/runsvdir
-notify-sound.sh off &
-runifnot picom
-runifnot xss-lock slockd
-runifnot sxhkd
-runifnot dunst
-runifnot caffeine
-if "$(type xmonad >/dev/null 2>&1)"; then
-  if ["$(crcparse WM)" = "$(which xmonad)" ]; then
-    runifnot stalonetray
+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
-xwallpaper --zoom ~/background.jpg
-setxkbmap -option "caps:escape"
 
 [ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh"