From 3c99819ce2f83ad535277576150cdf78d24aca9b Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@fanyx.xyz>
Date: Tue, 12 Jul 2022 12:30:59 +0200
Subject: [PATCH] Update some user-runsv services

---
 .config/bspwm/bspwmrc             |  4 ++--
 .config/sv/dbus-session/check     |  3 +++
 .config/sv/dbus-session/run       |  4 ++++
 .config/sv/pipewire-pulse/log/run |  3 +++
 .config/sv/pipewire-pulse/run     |  2 ++
 .config/sv/pipewire/log/run       |  3 +++
 .config/sv/pipewire/run           |  2 ++
 .config/sv/syncthing/log/run      |  4 ++++
 .config/sv/syncthing/run          |  1 +
 void-install/sv/runsvdir/run      | 11 ++++++++---
 10 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100755 .config/sv/dbus-session/check
 create mode 100755 .config/sv/dbus-session/run
 create mode 100755 .config/sv/pipewire-pulse/log/run
 create mode 100755 .config/sv/pipewire/log/run
 create mode 100755 .config/sv/syncthing/log/run

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index f6942db..7f61fa5 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -12,8 +12,8 @@ pgrep -x sxhkd > /dev/null || sxhkd &
 pgrep -x picom > /dev/null || picom &
 ~/.config/polybar/launch.sh &
 pgrep -x Discord > /dev/null || Discord &
-pgrep -x pipewire > /dev/null || pipewire &
-pgrep -x pipewire-pulse > /dev/null || pipewire-pulse &
+# pgrep -x pipewire > /dev/null || pipewire &
+# pgrep -x pipewire-pulse > /dev/null || pipewire-pulse &
 
 
 # $HOME/.config/polybar/launch.sh
diff --git a/.config/sv/dbus-session/check b/.config/sv/dbus-session/check
new file mode 100755
index 0000000..fc61dd5
--- /dev/null
+++ b/.config/sv/dbus-session/check
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec >/dev/null 2>&1
+exec dbus-send --session / org.freedesktop.DBus.Peer.Ping
diff --git a/.config/sv/dbus-session/run b/.config/sv/dbus-session/run
new file mode 100755
index 0000000..ee1dd72
--- /dev/null
+++ b/.config/sv/dbus-session/run
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+dbus-daemon --session --nofork --nopidfile --address=unix:path=${XDG_RUNTIME_DIR}/bus
+
diff --git a/.config/sv/pipewire-pulse/log/run b/.config/sv/pipewire-pulse/log/run
new file mode 100755
index 0000000..fd49fb0
--- /dev/null
+++ b/.config/sv/pipewire-pulse/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec svlogd -tt .
diff --git a/.config/sv/pipewire-pulse/run b/.config/sv/pipewire-pulse/run
index 0639468..2d49998 100755
--- a/.config/sv/pipewire-pulse/run
+++ b/.config/sv/pipewire-pulse/run
@@ -1,2 +1,4 @@
 #!/bin/sh
+
+exec 2>&1
 exec pipewire-pulse
diff --git a/.config/sv/pipewire/log/run b/.config/sv/pipewire/log/run
new file mode 100755
index 0000000..fd49fb0
--- /dev/null
+++ b/.config/sv/pipewire/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec svlogd -tt .
diff --git a/.config/sv/pipewire/run b/.config/sv/pipewire/run
index 3feaf50..3d16645 100755
--- a/.config/sv/pipewire/run
+++ b/.config/sv/pipewire/run
@@ -1,2 +1,4 @@
 #!/bin/sh
+
+exec 2>&1
 exec pipewire
diff --git a/.config/sv/syncthing/log/run b/.config/sv/syncthing/log/run
new file mode 100755
index 0000000..3f2ba3f
--- /dev/null
+++ b/.config/sv/syncthing/log/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec 2&>1
+exec svlogd -tt .
diff --git a/.config/sv/syncthing/run b/.config/sv/syncthing/run
index 8e11587..93f5e60 100755
--- a/.config/sv/syncthing/run
+++ b/.config/sv/syncthing/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 
+exec 2&>1
 exec /usr/bin/syncthing -no-browser -home="$HOME/.config/syncthing"
diff --git a/void-install/sv/runsvdir/run b/void-install/sv/runsvdir/run
index 960a315..d8940a7 100644
--- a/void-install/sv/runsvdir/run
+++ b/void-install/sv/runsvdir/run
@@ -1,8 +1,13 @@
 #!/bin/sh
 
 USER=@USER@
-HOME="home/$USER"
-GROUPS="$(id -Gn "$USER" | tr ' ' ':')"
+HOME="/home/$USER"
+GROUPS=$(id -Gn "$USER" | tr ' ' ':')
 SVDIR="$HOME/sv"
+ID=$(id -u $USER)
 
-exec chpst -u "$USER:$GROUPS" sh -l -c "exec runsvdir $SVDIR $USER" $USER
+[ ! -d /run/user/$ID ] && \
+    mkdir -p /run/user/$USER && \
+    chown $USER:$USER /run/user/$USER
+
+exec chpst -u "$USER:$GROUPS" sh -l -c "exec runsvdir $SVDIR $USER '...'" $USER