fix(i3): window startup

home/bin/audio/executable_system-start-audio.sh

@@ -22,15 +22,6 @@ function fixPulse() {
     fi
 }
 
-# Start up programs that use audio.
-function launchi3() {
-    if [ -z "$skipi3" ]; then
-	echo Opening i3wm sound workspaces
-	sleep .1 && i3-msg 'workspace 5; exec brave-browser'
-	#sleep 5.1 && python ~/bin/start-firefox.py
-    fi
-}
-
 # Set up sinks.
 function setupSinks() {
     pactl set-default-sink speakers
@@ -66,23 +57,12 @@ function restartWireplumber() {
     systemctl --user restart wireplumber
 }
 
-# arg parser
-for arg in "$@"
-do
-    # Skip commands for i3wm
-    if [[ $arg == *"-s"* ]]; then
-	skipi3=true
-    fi
-done
-
 # Wire sinks
 setupSinks
 
 # Eurorack audio interface
 sh ~/bin/audio/es9start.sh
 
-launchi3
 systemctl --user restart polybar
 sleep 5
 restartWireplumber
-

home/bin/executable_start-brave.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+# Restore Brave and place its windows after they finish opening.
+
+preferences="$HOME/.config/BraveSoftware/Brave-Browser/Default/Preferences"
+
+function enable_session_restore {
+  if [ ! -f "$preferences" ] || ! command -v jq &> /dev/null; then
+    return
+  fi
+
+  temp_file="$(mktemp "${preferences}.XXXXXX")"
+  if jq '.session.restore_on_startup = 1 | .profile.exit_type = "Normal"' \
+    "$preferences" > "$temp_file"; then
+    mv "$temp_file" "$preferences"
+  else
+    rm -f "$temp_file"
+  fi
+}
+
+enable_session_restore
+i3-msg 'workspace 9; append_layout ~/.config/i3/brave-workspace-9.json; workspace 5'
+brave-browser --restore-last-session &
+
+# Brave creates restored windows asynchronously and after startup focus has moved.
+for _ in {1..20}; do
+  sleep 0.5
+  i3-msg '[class="^Brave-browser$" workspace="^(?!9$).*"] move to workspace 5' \
+    > /dev/null
+done