From 33b95fda42cbf84bcbc4fead401e954ed674ccb9 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 23 Feb 2024 04:22:06 -0500 Subject: remove daemontools entirely --- local/.bin/hornet/import | 11 ++++++----- local/.bin/hornet/svdisable | 10 ---------- local/.bin/hornet/svdn | 29 ---------------------------- local/.bin/hornet/svget | 5 ----- local/.bin/hornet/svkill | 6 ------ local/.bin/hornet/svlog | 5 ----- local/.bin/hornet/svre | 6 ------ local/.bin/hornet/svst | 5 ----- local/.bin/hornet/svstop | 6 ------ local/.bin/hornet/svup | 6 ------ local/.bin/mz-doy1/svdisable | 1 - local/.bin/mz-doy1/svdn | 1 - local/.bin/mz-doy1/svget | 1 - local/.bin/mz-doy1/svkill | 1 - local/.bin/mz-doy1/svlog | 1 - local/.bin/mz-doy1/svre | 1 - local/.bin/mz-doy1/svst | 1 - local/.bin/mz-doy1/svstop | 1 - local/.bin/mz-doy1/svup | 1 - xorg/.xinitrc | 2 +- xorg/.xprofile | 5 ----- zsh/.config/zsh/local-completions/hornet/_sv | 10 ---------- 22 files changed, 7 insertions(+), 108 deletions(-) delete mode 100755 local/.bin/hornet/svdisable delete mode 100755 local/.bin/hornet/svdn delete mode 100755 local/.bin/hornet/svget delete mode 100755 local/.bin/hornet/svkill delete mode 100755 local/.bin/hornet/svlog delete mode 100755 local/.bin/hornet/svre delete mode 100755 local/.bin/hornet/svst delete mode 100755 local/.bin/hornet/svstop delete mode 100755 local/.bin/hornet/svup delete mode 120000 local/.bin/mz-doy1/svdisable delete mode 120000 local/.bin/mz-doy1/svdn delete mode 120000 local/.bin/mz-doy1/svget delete mode 120000 local/.bin/mz-doy1/svkill delete mode 120000 local/.bin/mz-doy1/svlog delete mode 120000 local/.bin/mz-doy1/svre delete mode 120000 local/.bin/mz-doy1/svst delete mode 120000 local/.bin/mz-doy1/svstop delete mode 120000 local/.bin/mz-doy1/svup delete mode 100644 zsh/.config/zsh/local-completions/hornet/_sv diff --git a/local/.bin/hornet/import b/local/.bin/hornet/import index 307d56b..ea4f1f2 100755 --- a/local/.bin/hornet/import +++ b/local/.bin/hornet/import @@ -1,10 +1,11 @@ #!/bin/sh -for service in unclutter compton; do - if svst $service; then - svdn $service >/dev/null - # shellcheck disable=SC2064 - trap "svup $service > /dev/null" EXIT +services="" +trap 'for service in $services; do systemctl --user start $service; done' EXIT +for service in unclutter picom; do + if [ "$(systemctl --user show --property MainPID --value "$service")" != 0 ]; then + systemctl --user stop "$service" + services="$service $services" fi done /usr/bin/import "$@" diff --git a/local/.bin/hornet/svdisable b/local/.bin/hornet/svdisable deleted file mode 100755 index 24f779f..0000000 --- a/local/.bin/hornet/svdisable +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -eu - -svc="$1" - -svdn "$svc" -svdn "${svc}/log" -svc -x ~/.services/enabled/"$svc"/log -svc -x ~/.services/enabled/"$svc" -rm -f ~/.services/enabled/"$svc" diff --git a/local/.bin/hornet/svdn b/local/.bin/hornet/svdn deleted file mode 100755 index 6687879..0000000 --- a/local/.bin/hornet/svdn +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svst "$1" || exit 0 - -svstop "$1" -svst "$1" || exit 0 - -sleep 1 - -svstop "$1" -for _ in $(seq 1 5); do - svst "$1" || exit 0 - sleep 1 -done -svst "$1" || exit 0 - -svstop "$1" -for _ in $(seq 1 10); do - svst "$1" || exit 0 - sleep 1 -done -svst "$1" || exit 0 - -svkill "$1" -svst "$1" || exit 0 - -exit 1 diff --git a/local/.bin/hornet/svget b/local/.bin/hornet/svget deleted file mode 100755 index 0eab9bf..0000000 --- a/local/.bin/hornet/svget +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svstat "$HOME/.services/enabled/$1" diff --git a/local/.bin/hornet/svkill b/local/.bin/hornet/svkill deleted file mode 100755 index a84e1a2..0000000 --- a/local/.bin/hornet/svkill +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svc -k "$HOME/.services/enabled/$1" -svget "$1" diff --git a/local/.bin/hornet/svlog b/local/.bin/hornet/svlog deleted file mode 100755 index 201ce9b..0000000 --- a/local/.bin/hornet/svlog +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -tail -F "$HOME/.log/$1/current" | tai64nlocal diff --git a/local/.bin/hornet/svre b/local/.bin/hornet/svre deleted file mode 100755 index 159b017..0000000 --- a/local/.bin/hornet/svre +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svdn "$1" -svup "$1" diff --git a/local/.bin/hornet/svst b/local/.bin/hornet/svst deleted file mode 100755 index 4d0c6ce..0000000 --- a/local/.bin/hornet/svst +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svget "$1" | grep -q ": up (" diff --git a/local/.bin/hornet/svstop b/local/.bin/hornet/svstop deleted file mode 100755 index 649ec26..0000000 --- a/local/.bin/hornet/svstop +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svc -d "$HOME/.services/enabled/$1" -svget "$1" diff --git a/local/.bin/hornet/svup b/local/.bin/hornet/svup deleted file mode 100755 index 3772fdb..0000000 --- a/local/.bin/hornet/svup +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -eu -set -o pipefail - -svc -u "$HOME/.services/enabled/$1" -svget "$1" diff --git a/local/.bin/mz-doy1/svdisable b/local/.bin/mz-doy1/svdisable deleted file mode 120000 index 2fc2baa..0000000 --- a/local/.bin/mz-doy1/svdisable +++ /dev/null @@ -1 +0,0 @@ -../hornet/svdisable \ No newline at end of file diff --git a/local/.bin/mz-doy1/svdn b/local/.bin/mz-doy1/svdn deleted file mode 120000 index 74b07c4..0000000 --- a/local/.bin/mz-doy1/svdn +++ /dev/null @@ -1 +0,0 @@ -../hornet/svdn \ No newline at end of file diff --git a/local/.bin/mz-doy1/svget b/local/.bin/mz-doy1/svget deleted file mode 120000 index b873a71..0000000 --- a/local/.bin/mz-doy1/svget +++ /dev/null @@ -1 +0,0 @@ -../hornet/svget \ No newline at end of file diff --git a/local/.bin/mz-doy1/svkill b/local/.bin/mz-doy1/svkill deleted file mode 120000 index d0d1fd7..0000000 --- a/local/.bin/mz-doy1/svkill +++ /dev/null @@ -1 +0,0 @@ -../hornet/svkill \ No newline at end of file diff --git a/local/.bin/mz-doy1/svlog b/local/.bin/mz-doy1/svlog deleted file mode 120000 index 105b765..0000000 --- a/local/.bin/mz-doy1/svlog +++ /dev/null @@ -1 +0,0 @@ -../hornet/svlog \ No newline at end of file diff --git a/local/.bin/mz-doy1/svre b/local/.bin/mz-doy1/svre deleted file mode 120000 index e9591c3..0000000 --- a/local/.bin/mz-doy1/svre +++ /dev/null @@ -1 +0,0 @@ -../hornet/svre \ No newline at end of file diff --git a/local/.bin/mz-doy1/svst b/local/.bin/mz-doy1/svst deleted file mode 120000 index 39c2f2a..0000000 --- a/local/.bin/mz-doy1/svst +++ /dev/null @@ -1 +0,0 @@ -../hornet/svst \ No newline at end of file diff --git a/local/.bin/mz-doy1/svstop b/local/.bin/mz-doy1/svstop deleted file mode 120000 index ab107f9..0000000 --- a/local/.bin/mz-doy1/svstop +++ /dev/null @@ -1 +0,0 @@ -../hornet/svstop \ No newline at end of file diff --git a/local/.bin/mz-doy1/svup b/local/.bin/mz-doy1/svup deleted file mode 120000 index 9adc623..0000000 --- a/local/.bin/mz-doy1/svup +++ /dev/null @@ -1 +0,0 @@ -../hornet/svup \ No newline at end of file diff --git a/xorg/.xinitrc b/xorg/.xinitrc index 8d6d364..088ac3d 100644 --- a/xorg/.xinitrc +++ b/xorg/.xinitrc @@ -1,6 +1,6 @@ #!/bin/sh -# shellcheck source=xprofile +# shellcheck source=xorg/.xprofile [ -f ~/.xprofile ] && . ~/.xprofile exec i3 diff --git a/xorg/.xprofile b/xorg/.xprofile index 04e2fa3..93969a5 100644 --- a/xorg/.xprofile +++ b/xorg/.xprofile @@ -1,12 +1,7 @@ #!/bin/sh -PATH="$HOME/.bin/local:$HOME/.bin/$(hostname):$HOME/.bin:$PATH" -export PATH - eval "$(ssh-agent)" -pidof svscan || (svscan "$HOME"/.services/enabled 2>&1 | readproctitle "$USER" ........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................) & - setup-inputs xset s 300 5 diff --git a/zsh/.config/zsh/local-completions/hornet/_sv b/zsh/.config/zsh/local-completions/hornet/_sv deleted file mode 100644 index 218e95f..0000000 --- a/zsh/.config/zsh/local-completions/hornet/_sv +++ /dev/null @@ -1,10 +0,0 @@ -#compdef svdn svget svkill svlog svdisable svre svst svstop svup - -local -a service_list -local services=$(ls ~/.services/enabled/) -service_list=(${(f)services}) - -_describe 'commands' service_list - -# shfmt:skip (shfmt doesn't recognize zsh array expansion) -# vim:ft=zsh -- cgit v1.2.3-54-g00ecf