From 0127b619017fcf368706a21578c89221c8761ada Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 20 Nov 2023 02:31:55 +0000 Subject: [PATCH] sxmo: fix that upstream renamed sxmo_dameons.sh -> sxmo_jobs.sh --- hosts/modules/gui/sxmo/default.nix | 10 +++++----- hosts/modules/gui/sxmo/hooks/sxmo_hook_screenoff.sh | 2 +- hosts/modules/gui/sxmo/hooks/sxmo_hook_start.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hosts/modules/gui/sxmo/default.nix b/hosts/modules/gui/sxmo/default.nix index d38decc0..d51d7945 100644 --- a/hosts/modules/gui/sxmo/default.nix +++ b/hosts/modules/gui/sxmo/default.nix @@ -28,10 +28,10 @@ # - startup # - daemon based (lisgsd, idle_locker, statusbar_periodics) # - auto-started at login -# - managable by `sxmo_daemons.sh` -# - list available daemons: `sxmo_daemons.sh list` -# - query if a daemon is active: `sxmo_daemons.sh running ` -# - start daemon: `sxmo_daemons.sh start ` +# - managable by `sxmo_jobs.sh` +# - list available daemons: `sxmo_jobs.sh list` +# - query if a daemon is active: `sxmo_jobs.sh running ` +# - start daemon: `sxmo_jobs.sh start ` # - managable by `superctl` # - `superctl status` # - user hooks: @@ -348,7 +348,7 @@ in # kill anything leftover from the previous sxmo run. this way we can (try to) be reentrant echo "sxmo_init: killing stale daemons (if active)" - sxmo_daemons.sh stop all + sxmo_jobs.sh stop all pkill bemenu pkill wvkbd pkill superd diff --git a/hosts/modules/gui/sxmo/hooks/sxmo_hook_screenoff.sh b/hosts/modules/gui/sxmo/hooks/sxmo_hook_screenoff.sh index 2d35d76e..debf7c1b 100755 --- a/hosts/modules/gui/sxmo/hooks/sxmo_hook_screenoff.sh +++ b/hosts/modules/gui/sxmo/hooks/sxmo_hook_screenoff.sh @@ -11,7 +11,7 @@ swaymsg mode default sxmo_wm.sh dpms on sxmo_wm.sh inputevent touchscreen off -sxmo_daemons.sh start periodic_blink sxmo_run_periodically.sh "$BLINK_FREQ" sxmo_led.sh blink red blue +sxmo_jobs.sh start periodic_blink sxmo_run_periodically.sh "$BLINK_FREQ" sxmo_led.sh blink red blue wait diff --git a/hosts/modules/gui/sxmo/hooks/sxmo_hook_start.sh b/hosts/modules/gui/sxmo/hooks/sxmo_hook_start.sh index a4796257..95c86a7d 100755 --- a/hosts/modules/gui/sxmo/hooks/sxmo_hook_start.sh +++ b/hosts/modules/gui/sxmo/hooks/sxmo_hook_start.sh @@ -7,11 +7,11 @@ # Create xdg user directories, such as ~/Pictures xdg-user-dirs-update -sxmo_daemons.sh start daemon_manager +sxmo_jobs.sh start daemon_manager # Periodically update some status bar components sxmo_hook_statusbar.sh all -sxmo_daemons.sh start statusbar_periodics sxmo_run_aligned.sh 60 \ +sxmo_jobs.sh start statusbar_periodics sxmo_run_aligned.sh 60 \ sxmo_hook_statusbar.sh periodics # TODO: start these externally, via `wantedBy` in nix @@ -63,7 +63,7 @@ systemctl --user start sxmo_soundmonitor # rotate UI based on physical display angle by default if [ -n "$SXMO_AUTOROTATE" ]; then # TODO: this could use ~/.cache/sxmo/sxmo.autorotate like for lisgd above - sxmo_daemons.sh start autorotate sxmo_autorotate.sh + sxmo_jobs.sh start autorotate sxmo_autorotate.sh fi # Play a funky startup tune if you want (disabled by default)