From 6c4039aebbe7ec25f47cb4623e44b96373e9e6e5 Mon Sep 17 00:00:00 2001 From: Nick Moore Date: Sat, 7 Nov 2026 09:20:22 -0600 Subject: Track sway (shared + rigel machine overlay), replace fibonacci with dwm-dwindle listener - sway package: shared config (styling, all muscle-memory binds, no exec lines) including ~/.config/sway/machines/*.conf overlays included LAST; floating_windows + machines/README contract; sway/AGENTS.md doctrine - rigel package: machine overlay (outputs, touchpad, session stack, power bindings) + session scripts now stow-managed; fibonacci.py replaced by a POSIX sh+jq dwindle listener (dwm dwindle geometry, --monitor subscription, mark+move re-home, flock singleton); machines/rigel.conf exec line updated to the new path - validated in a headless nested sway against a literal port of fibonacci.c: five- and seven-window trees plus refocus-before-spawn all match dwm's rects (modulo the bar offset) --- rigel/.config/sway/session-daemons.sh | 175 ++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) create mode 100755 rigel/.config/sway/session-daemons.sh (limited to 'rigel/.config/sway/session-daemons.sh') diff --git a/rigel/.config/sway/session-daemons.sh b/rigel/.config/sway/session-daemons.sh new file mode 100755 index 0000000..c8300e1 --- /dev/null +++ b/rigel/.config/sway/session-daemons.sh @@ -0,0 +1,175 @@ +#!/bin/bash +# session-daemons.sh — per-session supervisor for the daemons sway used to +# bare-`exec` (pipewire, pipewire-pulse, wireplumber, mako, waybar). +# +# Why: OpenRC has no user service manager and sway does not kill `exec`ed +# children when the session ends, so daemons pile up across dead sessions. +# 2026-10-27: three pipewire-pulse survivors (14:39 / 21:06 / current) held +# /run/user/$UID/pulse/native while this session's pipewire and wireplumber +# were dead, so every PA client got "Connection refused" — and waybar's +# pulseaudio module aborts the whole bar on pa_context_connect() failure, +# which is how the bar kept dying the moment a Moonlight stream started. +# +# What this script does instead: +# 1. singleton per session: flock; a reload re-runs `exec_always`, and the +# stale instance just exits (see idle-start.sh for the same pattern); +# 2. on first start, kills EVERY leftover instance of the watched daemons +# (fresh session start = fresh stack; no orphans of our own either); +# 3. starts the daemons in dependency order and restarts any that die +# while the session lives — including waybar, which is exactly the +# bar-resurrection behaviour we want (see the 2026-10-27 notes); +# 4. daemon stderr/stdout is appended to $runtime/session-daemons.log, so +# a crash comes with its last words and a timestamp; +# 5. when the sway whose socket we captured exits, everything is torn +# down — nothing survives into the next session. +# +# Session identity: $SWAYSOCK is `sway-ipc...sock`, same trick the +# veilad session launcher uses. Processes from other sessions carry a stale +# socket there in their environ; anything comm-matching without ours is a +# leftover and gets killed. + +set -u +shopt -s nullglob + +runtime="${XDG_RUNTIME_DIR:-/run/user/$(id -u)}" +log="$runtime/session-daemons.log" +daemons=(pipewire pipewire-pulse wireplumber mako waybar ppd-switch.sh) + +note() { echo "$(date '+%F %T') [$SWAYSOCK supervisor $$] $*" >>"$log"; } + +# comm-matching pids (pgrep -x would also work; this avoids coalescing). +pids_of() { + for p in /proc/[0-9]*; do + [ -r "$p/comm" ] || continue + [ "$(tr -d '\0' <"$p/comm" 2>/dev/null)" = "$1" ] && echo "${p##*/}" + done +} + +# Procpg name check. NOTE: this pgrep has no -q and errors out if given it, +# so never write `pgrep -qx` here — that made every check fail, and the +# supervise loop spawned a fresh waybar every cycle (2026-10-27). +running() { pgrep -x "$1" >/dev/null 2>&1; } + +# --- singleton ---------------------------------------------------------------- +# High fd: bash marks descriptors >=10 close-on-exec, so the daemons we spawn +# do NOT inherit the lock. With fd 9 they did — and surviving children then +# kept the lock forever, making every later supervisor exit silently +# (2026-10-27: 32 stray wireplumbers held the lock and froze the takeover). +lockfd=200 +exec {lockfd}>"$runtime/session-daemons.lock" +if ! flock -n "$lockfd"; then + note "another supervisor already holds the lock; exiting without changes" + exit 0 +fi + +# --- session identity -------------------------------------------------------- +sock="${SWAYSOCK:-}" +sway_pid="" +case "$sock" in + */sway-ipc.*.sock) + t="${sock##*/sway-ipc.}" # "uid.pid.sock" + t="${t#*.}" # drop uid + sway_pid="${t%%.*}" # keep pid + ;; +esac +if [ -z "$sock" ] || [ ! -S "$sock" ] || [ -z "$sway_pid" ] || [ ! -d "/proc/$sway_pid" ]; then + echo "session-daemons.sh: no live sway session (SWAYSOCK='$sock'); refusing to start" >&2 + exit 1 +fi + +note "taking over the session daemons (sway pid $sway_pid)" + +# --- first start: clear every leftover instance ------------------------------ +# Both dead-session orphans (stale/error SWAYSOCK) and this session's own +# copies from before the takeover. Killing pipewire first releases the +# socket paths so the fresh instances can bind without unlink fights. +for d in "${daemons[@]}"; do + for pid in $(pids_of "$d"); do + note "stopping leftover $d (pid $pid)" + kill "$pid" 2>/dev/null + done +done +sleep 2 +for d in "${daemons[@]}"; do + for pid in $(pids_of "$d"); do + note "force-killing leftover $d (pid $pid)" + kill -9 "$pid" 2>/dev/null + done +done +# Stale socket files from dead instances; fresh processes recreate them. +rm -f "$runtime/pipewire-0" "$runtime/pipewire-0-manager" "$runtime/pulse/native" + +wait_for_socket() { # $1 socket path, 5s budget + local i=0 + while [ "$i" -lt 50 ]; do + [ -S "$1" ] && return 0 + i=$((i + 1)) + sleep 0.1 + done + return 1 +} + +# --- start helpers ------------------------------------------------------------ +start_daemon() { + local d="$1" cmd="$d" + # Bare names go through PATH (all the system daemons). Entries that live + # in ~/.config/sway (ppd-switch.sh) are not on PATH, so resolve them to + # the full file here. Note running()/pids_of()/kill below always use the + # bare name, which is also the /proc comm — hence ppd-switch.sh must stay + # <=15 chars. + [ -x "$HOME/.config/sway/$d" ] && cmd="$HOME/.config/sway/$d" + if running "$d"; then + # Another path (e.g. the reload keybind) brought it back already. + note "$d came back from elsewhere; not spawning a second copy" + return 0 + fi + note "starting $d" + setsid "$cmd" >>"$log" 2>&1 /dev/null + done + done + sleep 2 + for d in "${daemons[@]}"; do + for pid in $(pids_of "$d"); do + kill -9 "$pid" 2>/dev/null + done + done + note "session daemons stopped; exiting" + exit 0 + fi + + for d in "${daemons[@]}"; do + if ! running "$d"; then + note "*** $d died; restarting" + start_daemon "$d" + fi + done + sleep 2 +done -- cgit v1.3