From 73fa26e59607d150c9e1bebc7c6403f835ee6e83 Mon Sep 17 00:00:00 2001
From: Tobias Reisinger <tobias@msrg.cc>
Date: Sat, 13 Feb 2021 23:02:27 +0100
Subject: [PATCH] Fix startup

---
 .config/bspwm/bspwmrc |  5 +++--
 .local/bin/start_jack |  1 -
 .xprofile             | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 4283bde..af1a9d6 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -49,11 +49,12 @@ bspc rule -a 'Element' desktop='voip' locked='true'
 bspc rule -a 'Element (Riot)' desktop='voip' locked='true'
 bspc rule -a 'discord' desktop='voip'
 bspc rule -a 'Evolution' desktop='messenger'
-bspc rule -a 'Signal' desktop='messenger' locked='true'
 #bspc rule -a 'Steam' desktop='game'
 bspc rule -a 'Zathura' state='tiled'
-bspc rule -a 'Guitarix:guitarix' desktop='messenger'
 bspc rule -a 'sticky-note:sticky-note' state='floating' sticky='on' border='off'
 bspc rule -a 'Xarchiver' state='floating'
 
+bspc rule -a 'Signal' desktop='messenger' locked='true'
+bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
+
 $HOME/.config/polybar/launch.sh &
diff --git a/.local/bin/start_jack b/.local/bin/start_jack
index b28074c..23483ca 100755
--- a/.local/bin/start_jack
+++ b/.local/bin/start_jack
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-sleep 8
 systemctl --user stop pulseaudio.service
 systemctl --user stop pulseaudio.socket
 
diff --git a/.xprofile b/.xprofile
index 7661c23..39b68f6 100644
--- a/.xprofile
+++ b/.xprofile
@@ -33,7 +33,10 @@ _autostart_on_launch()
     conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf"
     feh --bg-fill $XDG_PICTURES_DIR/wallpaper/active_wallpaper
 
-    sleep 8
+    ### wait for internet and audio
+    sleep 10
+    start_jack
+    sleep 2
 
     syncthing -no-browser &
 
@@ -44,14 +47,19 @@ _autostart_on_launch()
     steam-runtime -silent -tcp &
     qutebrowser &
 
-    start_jack
     sleep 1
+
+    ### Workspace VOIP
     teamspeak3 &
-    sleep 2
-    alacritty --class "mail" --command sh -c "neomutt" &
+    #sleep 2
+    #alacritty --class "mail" --command sh -c "neomutt" &
     sleep 1
     element-desktop &
+
+    ### Workspace Messenger
     signal-desktop &
+    sleep 1
+    thunderbird &
 
     mopidy &
 }