From d8f852ab18772888645dea45c875abe74f60e11e Mon Sep 17 00:00:00 2001
From: kento2 <kento+pub@placeq.com>
Date: Thu, 5 Mar 2026 06:53:52 +0100
Subject: [PATCH] .

---
 .../pipewire/pipewire.conf.d/10-wireplumber.conf |  1 -
 .../pipewire.conf.d/20-pipewire-pulse.conf       |  1 -
 files/.config/service/pipewire/run               |  9 ++++++++-
 files/.winit                                     |  6 ++++++
 files/.zprofile                                  | 16 ++++++----------
 files/.zshrc                                     |  2 ++
 6 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 120000 files/.config/pipewire/pipewire.conf.d/10-wireplumber.conf
 delete mode 120000 files/.config/pipewire/pipewire.conf.d/20-pipewire-pulse.conf
 create mode 100755 files/.winit

diff --git a/files/.config/pipewire/pipewire.conf.d/10-wireplumber.conf b/files/.config/pipewire/pipewire.conf.d/10-wireplumber.conf
deleted file mode 120000
index 93f731a..0000000
--- a/files/.config/pipewire/pipewire.conf.d/10-wireplumber.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/examples/wireplumber/10-wireplumber.conf
\ No newline at end of file
diff --git a/files/.config/pipewire/pipewire.conf.d/20-pipewire-pulse.conf b/files/.config/pipewire/pipewire.conf.d/20-pipewire-pulse.conf
deleted file mode 120000
index 19464c7..0000000
--- a/files/.config/pipewire/pipewire.conf.d/20-pipewire-pulse.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/examples/pipewire/20-pipewire-pulse.conf
\ No newline at end of file
diff --git a/files/.config/service/pipewire/run b/files/.config/service/pipewire/run
index ebda096..85197ea 100755
--- a/files/.config/service/pipewire/run
+++ b/files/.config/service/pipewire/run
@@ -1,2 +1,9 @@
 #!/bin/sh
-exec chpst -e "$TURNSTILE_ENV_DIR" pipewire
+rm -rf "/run/user/$(id -u)/pulse"
+exec chpst -e "$TURNSTILE_ENV_DIR" sh -c '
+test -n "$DBUS_SESSION_BUS_ADDRESS" || {
+	>&2 echo "dbus not running"
+	exit 1
+}
+exec pipewire
+'
diff --git a/files/.winit b/files/.winit
new file mode 100755
index 0000000..f43cf49
--- /dev/null
+++ b/files/.winit
@@ -0,0 +1,6 @@
+#!/bin/sh
+rm -f "$HOME"/.config/service-env/* >/dev/null
+env | while read -r pair; do
+	turnstile-update-runit-env "$(cut -d= -f1 <<< "$pair")"
+done
+exec swc-launch wsxwm
diff --git a/files/.zprofile b/files/.zprofile
index 30f0d00..7527829 100644
--- a/files/.zprofile
+++ b/files/.zprofile
@@ -6,13 +6,9 @@ export XBPS_DISTDIR="$HOME/void-packages"
 
 export EDITOR=/usr/bin/vis
 
-exists() {
-	which "$1" >/dev/null 2>&1
-}
-
-grep 'l' <<< "$-" && \
-test "$(tty)" = '/dev/tty1' && \
-	cd &&
-	echo 'Press return to start gui' &&
-	read &&
-	exec ~/.winit
\ No newline at end of file
+if grep -q l <<< "$-" && test "$(tty)" = '/dev/tty1'; then
+	rm -f "$HOME"/.config/service-env/* 2>/dev/null
+	cd
+	echo 'Press return to start gui'
+	read && exec dbus-run-session "$HOME/.winit"
+fi
diff --git a/files/.zshrc b/files/.zshrc
index 5851e87..cb6bef2 100644
--- a/files/.zshrc
+++ b/files/.zshrc
@@ -14,6 +14,8 @@ sprunge() { cat $@ | curl -sF 'sprunge=<-' http://sprunge.us }
 # minimal functions, 02mar
 mkcd() { mkdir -p "$1"; cd "$1" }
 
+set -o emacs
+
 alias xi='xi -y'
 alias vi='vis'
 alias nvi='vis'