1 files changed, 13 insertions, 12 deletions
diff --git a/autostart.sh b/autostart.sh
index 5984a49..d831474 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -7,19 +7,20 @@ 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
-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
-  fi
-fi
-xwallpaper --zoom ~/background.jpg
-setxkbmap -option "caps:escape"
+runifnot swayidle
+runifnot mako
+killandrun waybar
+killandrun swaybg -i ~/background.jpg
 
 [ -x "$XDG_CONFIG_HOME/computerrc.sh" ] && "$XDG_CONFIG_HOME/computerrc.sh"