From e57e1c5403ca79e69ffaa4385514bf6c3b32a45e Mon Sep 17 00:00:00 2001 From: frosty Date: Wed, 29 May 2024 13:28:54 +0000 Subject: [PATCH] move services to .config/service, managed by turnstile --- runit/.config/service/dbus/run | 11 +++++++++++ runit/.config/service/dbus/supervise/pid | 1 + runit/.config/service/dbus/supervise/stat | 1 + runit/.config/service/dbus/supervise/status | Bin 0 -> 20 bytes runit/.config/service/dunst/run | 3 +++ runit/.config/service/dunst/supervise/pid | 1 + runit/.config/service/dunst/supervise/stat | 1 + runit/.config/service/dunst/supervise/status | Bin 0 -> 20 bytes runit/.config/service/picom/run | 3 +++ runit/.config/service/picom/supervise/pid | 1 + runit/.config/service/picom/supervise/stat | 1 + runit/.config/service/picom/supervise/status | Bin 0 -> 20 bytes runit/.config/service/pipewire/control/t | 2 ++ runit/.config/service/pipewire/run | 4 ++++ runit/.config/service/pipewire/supervise/pid | 1 + runit/.config/service/pipewire/supervise/stat | 1 + runit/.config/service/pipewire/supervise/status | Bin 0 -> 20 bytes runit/.config/service/turnstile-ready/conf | 1 + .../share/runit/sv => .config/service}/udiskie/run | 0 runit/.config/service/udiskie/supervise/pid | 0 runit/.config/service/udiskie/supervise/stat | 1 + runit/.config/service/udiskie/supervise/status | Bin 0 -> 20 bytes runit/.local/share/runit/sv/dunst/run | 3 --- runit/.local/share/runit/sv/picom/run | 3 --- runit/.local/share/runit/sv/pipewire-pulse/run | 5 ----- runit/.local/share/runit/sv/pipewire/run | 3 --- runit/.local/share/runit/sv/sxhkd/run | 3 --- runit/.local/share/runit/sv/wireplumber/run | 5 ----- 28 files changed, 33 insertions(+), 22 deletions(-) create mode 100755 runit/.config/service/dbus/run create mode 100644 runit/.config/service/dbus/supervise/pid create mode 100644 runit/.config/service/dbus/supervise/stat create mode 100644 runit/.config/service/dbus/supervise/status create mode 100755 runit/.config/service/dunst/run create mode 100644 runit/.config/service/dunst/supervise/pid create mode 100644 runit/.config/service/dunst/supervise/stat create mode 100644 runit/.config/service/dunst/supervise/status create mode 100755 runit/.config/service/picom/run create mode 100644 runit/.config/service/picom/supervise/pid create mode 100644 runit/.config/service/picom/supervise/stat create mode 100644 runit/.config/service/picom/supervise/status create mode 100755 runit/.config/service/pipewire/control/t create mode 100755 runit/.config/service/pipewire/run create mode 100644 runit/.config/service/pipewire/supervise/pid create mode 100644 runit/.config/service/pipewire/supervise/stat create mode 100644 runit/.config/service/pipewire/supervise/status create mode 100644 runit/.config/service/turnstile-ready/conf rename runit/{.local/share/runit/sv => .config/service}/udiskie/run (100%) create mode 100644 runit/.config/service/udiskie/supervise/pid create mode 100644 runit/.config/service/udiskie/supervise/stat create mode 100644 runit/.config/service/udiskie/supervise/status delete mode 100755 runit/.local/share/runit/sv/dunst/run delete mode 100755 runit/.local/share/runit/sv/picom/run delete mode 100755 runit/.local/share/runit/sv/pipewire-pulse/run delete mode 100755 runit/.local/share/runit/sv/pipewire/run delete mode 100755 runit/.local/share/runit/sv/sxhkd/run delete mode 100755 runit/.local/share/runit/sv/wireplumber/run diff --git a/runit/.config/service/dbus/run b/runit/.config/service/dbus/run new file mode 100755 index 0000000..78670b4 --- /dev/null +++ b/runit/.config/service/dbus/run @@ -0,0 +1,11 @@ +#!/bin/sh + +[ -r ./conf ] && . ./conf + +: "${DBUS_SESSION_BUS_ADDRESS:=unix:path=/run/user/$(id -u)/bus}" + +if [ -d "$TURNSTILE_ENV_DIR" ]; then + echo "$DBUS_SESSION_BUS_ADDRESS" > "$TURNSTILE_ENV_DIR"/DBUS_SESSION_BUS_ADDRESS +fi + +exec chpst -e "$TURNSTILE_ENV_DIR" dbus-daemon --session --nofork --nopidfile --address="$DBUS_SESSION_BUS_ADDRESS" $OPTS diff --git a/runit/.config/service/dbus/supervise/pid b/runit/.config/service/dbus/supervise/pid new file mode 100644 index 0000000..8de1e36 --- /dev/null +++ b/runit/.config/service/dbus/supervise/pid @@ -0,0 +1 @@ +994 diff --git a/runit/.config/service/dbus/supervise/stat b/runit/.config/service/dbus/supervise/stat new file mode 100644 index 0000000..f5bdd21 --- /dev/null +++ b/runit/.config/service/dbus/supervise/stat @@ -0,0 +1 @@ +run diff --git a/runit/.config/service/dbus/supervise/status b/runit/.config/service/dbus/supervise/status new file mode 100644 index 0000000000000000000000000000000000000000..c6d1d1b6447a8836673cb676cacf3a7c3a9dbe21 GIT binary patch literal 20 acmZ=@U|>iK*XfZc&=GmW4CItDFaiK7@&nlb literal 0 HcmV?d00001 diff --git a/runit/.config/service/dunst/run b/runit/.config/service/dunst/run new file mode 100755 index 0000000..79fbfb2 --- /dev/null +++ b/runit/.config/service/dunst/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec chpst -e "$TURNSTILE_ENV_DIR" dunst diff --git a/runit/.config/service/dunst/supervise/pid b/runit/.config/service/dunst/supervise/pid new file mode 100644 index 0000000..bcbb007 --- /dev/null +++ b/runit/.config/service/dunst/supervise/pid @@ -0,0 +1 @@ +1052 diff --git a/runit/.config/service/dunst/supervise/stat b/runit/.config/service/dunst/supervise/stat new file mode 100644 index 0000000..f5bdd21 --- /dev/null +++ b/runit/.config/service/dunst/supervise/stat @@ -0,0 +1 @@ +run diff --git a/runit/.config/service/dunst/supervise/status b/runit/.config/service/dunst/supervise/status new file mode 100644 index 0000000000000000000000000000000000000000..17408fe799de55641d23de0e7ac9ca1adc8b7547 GIT binary patch literal 20 acmZ=@U|>iK*XfnHc%wyz1;{C7U<3d&*#wpV literal 0 HcmV?d00001 diff --git a/runit/.config/service/picom/run b/runit/.config/service/picom/run new file mode 100755 index 0000000..0100843 --- /dev/null +++ b/runit/.config/service/picom/run @@ -0,0 +1,3 @@ +#!/bin/sh + +exec chpst -e "$TURNSTILE_ENV_DIR" picom diff --git a/runit/.config/service/picom/supervise/pid b/runit/.config/service/picom/supervise/pid new file mode 100644 index 0000000..74f61fc --- /dev/null +++ b/runit/.config/service/picom/supervise/pid @@ -0,0 +1 @@ +2671 diff --git a/runit/.config/service/picom/supervise/stat b/runit/.config/service/picom/supervise/stat new file mode 100644 index 0000000..f5bdd21 --- /dev/null +++ b/runit/.config/service/picom/supervise/stat @@ -0,0 +1 @@ +run diff --git a/runit/.config/service/picom/supervise/status b/runit/.config/service/picom/supervise/status new file mode 100644 index 0000000000000000000000000000000000000000..88195d5a492888048f07e743217543fc0b234590 GIT binary patch literal 20 ZcmZ=@U|>iK*A3ONjIYV(0&+?j7y&5<1Frx8 literal 0 HcmV?d00001 diff --git a/runit/.config/service/pipewire/control/t b/runit/.config/service/pipewire/control/t new file mode 100755 index 0000000..a095b7b --- /dev/null +++ b/runit/.config/service/pipewire/control/t @@ -0,0 +1,2 @@ +#!/bin/sh +[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid) diff --git a/runit/.config/service/pipewire/run b/runit/.config/service/pipewire/run new file mode 100755 index 0000000..0822d82 --- /dev/null +++ b/runit/.config/service/pipewire/run @@ -0,0 +1,4 @@ +#!/bin/sh + +SVDIR=".." sv start dbus || exit 1 +exec chpst -e "$TURNSTILE_ENV_DIR" pipewire diff --git a/runit/.config/service/pipewire/supervise/pid b/runit/.config/service/pipewire/supervise/pid new file mode 100644 index 0000000..6e1fc58 --- /dev/null +++ b/runit/.config/service/pipewire/supervise/pid @@ -0,0 +1 @@ +995 diff --git a/runit/.config/service/pipewire/supervise/stat b/runit/.config/service/pipewire/supervise/stat new file mode 100644 index 0000000..f5bdd21 --- /dev/null +++ b/runit/.config/service/pipewire/supervise/stat @@ -0,0 +1 @@ +run diff --git a/runit/.config/service/pipewire/supervise/status b/runit/.config/service/pipewire/supervise/status new file mode 100644 index 0000000000000000000000000000000000000000..6f6adf988f7aff6dc2b3c59cb18cbd30879cfbd9 GIT binary patch literal 20 acmZ=@U|>iK*Xfa{JZSQm8OSMRU<3d%PXw3% literal 0 HcmV?d00001 diff --git a/runit/.config/service/turnstile-ready/conf b/runit/.config/service/turnstile-ready/conf new file mode 100644 index 0000000..68063d2 --- /dev/null +++ b/runit/.config/service/turnstile-ready/conf @@ -0,0 +1 @@ +core_services="dbus" diff --git a/runit/.local/share/runit/sv/udiskie/run b/runit/.config/service/udiskie/run similarity index 100% rename from runit/.local/share/runit/sv/udiskie/run rename to runit/.config/service/udiskie/run diff --git a/runit/.config/service/udiskie/supervise/pid b/runit/.config/service/udiskie/supervise/pid new file mode 100644 index 0000000..e69de29 diff --git a/runit/.config/service/udiskie/supervise/stat b/runit/.config/service/udiskie/supervise/stat new file mode 100644 index 0000000..eb0e904 --- /dev/null +++ b/runit/.config/service/udiskie/supervise/stat @@ -0,0 +1 @@ +down diff --git a/runit/.config/service/udiskie/supervise/status b/runit/.config/service/udiskie/supervise/status new file mode 100644 index 0000000000000000000000000000000000000000..74b2875a42d1dcee2d82ee538e749f3b05a02d7e GIT binary patch literal 20 acmZ=@U|>iKm)oXN{nG@&1 diff --git a/runit/.local/share/runit/sv/picom/run b/runit/.local/share/runit/sv/picom/run deleted file mode 100755 index 0749b9a..0000000 --- a/runit/.local/share/runit/sv/picom/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec picom 2>&1 diff --git a/runit/.local/share/runit/sv/pipewire-pulse/run b/runit/.local/share/runit/sv/pipewire-pulse/run deleted file mode 100755 index 6bd84a3..0000000 --- a/runit/.local/share/runit/sv/pipewire-pulse/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sv check "$HOME/.runit/sv/wireplumber" >/dev/null || exit 1 - -exec pipewire-pulse 2>&1 diff --git a/runit/.local/share/runit/sv/pipewire/run b/runit/.local/share/runit/sv/pipewire/run deleted file mode 100755 index 32744c8..0000000 --- a/runit/.local/share/runit/sv/pipewire/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec pipewire 2>&1 diff --git a/runit/.local/share/runit/sv/sxhkd/run b/runit/.local/share/runit/sv/sxhkd/run deleted file mode 100755 index 2c8fb58..0000000 --- a/runit/.local/share/runit/sv/sxhkd/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec sxhkd 2>&1 diff --git a/runit/.local/share/runit/sv/wireplumber/run b/runit/.local/share/runit/sv/wireplumber/run deleted file mode 100755 index ced7e05..0000000 --- a/runit/.local/share/runit/sv/wireplumber/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -sv check "$HOME/.runit/sv/pipewire" >/dev/null || exit 1 - -exec wireplumber 2>&1 \ No newline at end of file