From 67bcfdc34427fcaeeceddb1184ca79ebac18e53c Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sat, 24 Feb 2024 17:37:23 -0500 Subject: [PATCH] Rename swayidle-launcher to idle-launcher, made more POSIX-y --- dot_config/river/executable_init.tmpl | 2 +- dot_local/bin/executable_idle-launcher.tmpl | 54 +++++++++++++++++++ .../bin/executable_swayidle-launcher.tmpl | 39 -------------- 3 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 dot_local/bin/executable_idle-launcher.tmpl delete mode 100644 dot_local/bin/executable_swayidle-launcher.tmpl diff --git a/dot_config/river/executable_init.tmpl b/dot_config/river/executable_init.tmpl index 0c0a1c0..62b7948 100644 --- a/dot_config/river/executable_init.tmpl +++ b/dot_config/river/executable_init.tmpl @@ -272,8 +272,8 @@ rivertile -view-padding 4 -outer-padding 4 -main-ratio .55 & dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river & /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & kanshi & +idle-launcher & pipewire-launcher & -swayidle-launcher & yambar-launcher & dunst & gammastep -r & diff --git a/dot_local/bin/executable_idle-launcher.tmpl b/dot_local/bin/executable_idle-launcher.tmpl new file mode 100644 index 0000000..8bbdbfe --- /dev/null +++ b/dot_local/bin/executable_idle-launcher.tmpl @@ -0,0 +1,54 @@ +#!/bin/sh + +time=$(date +"%b %d, %Y %T") +log_file=$XDG_STATE_HOME/idle.log + +echo "--- $time ---" > "$log_file" + +# kill process if already running +user=$(id -u) +pid=$(ps -u "$user" | awk '/\/ {print $1}') +if [ "$pid" != "" ]; then + echo "Sending SIGTERM to swayidle." >> "$log_file" + kill "$pid" + sleep 1 +fi + +pid=$(ps -u "$user" | awk '/\/ {print $1}') +if [ "$pid" != "" ]; then + echo "Sending SIGKILL to swayidle." >> "$log_file" + kill -9 "$pid" + sleep 1 +fi + +{{ if eq .chezmoi.hostname "helix" -}} +# dim: 2m, lock: 5m, display: 15m, suspend: 1h +brightness="/sys/class/backlight/amdgpu_bl1/brightness" +prev_brightness="${XDG_STATE_HOME}/prev_brightness" +swayidle -w \ + timeout 120 "cat $brightness > $prev_brightness && echo 1 > $brightness" \ + resume "cat $prev_brightness > $brightness" \ + timeout 300 'waylock-launcher' \ + resume "cat $prev_brightness > $brightness" \ + timeout 900 "cat $prev_brightness > $brightness && wlr-randr --output eDP-1 --off" \ + resume "wlr-randr --output eDP-1 --on && kanshictl reload" \ + timeout 3600 "loginctl suspend-then-hibernate" \ + resume "wlr-randr --output eDP-1 --on && kanshictl reload" \ + lock "waylock-launcher" \ + before-sleep "waylock-launcher" \ + 2>&1 | tee -a "$log_file" & +{{- else if eq .chezmoi.hostname "hydrus" }} +# lock: 5m, display: 15m +swayidle -w \ + timeout 300 'waylock-launcher' \ + timeout 900 'kanshictl switch dual-off' \ + resume 'kanshictl switch dual' \ + lock 'waylock-launcher' \ + before-sleep 'waylock-launcher' \ + 2>&1 | tee -a "$log_file" & +{{- else }} +# lock after 5m +swayidle -w \ + timeout 300 'waylock-launcher' \ + 2>&1 | tee -a "$log_file" & +{{ end }} diff --git a/dot_local/bin/executable_swayidle-launcher.tmpl b/dot_local/bin/executable_swayidle-launcher.tmpl deleted file mode 100644 index bec788d..0000000 --- a/dot_local/bin/executable_swayidle-launcher.tmpl +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -time=$(date +"%b %d, %Y %T") -log_file=$XDG_STATE_HOME/swayidle.log - -echo "--- $time ---" > "$log_file" - -# kill running processes -killall -q swayidle - -{{ if eq .chezmoi.hostname "helix" -}} -# dim: 2m, lock: 5m, display: 15m, suspend: 1h -swayidle -w \ - timeout 120 'light -O && light -S .1' \ - resume 'light -I' \ - timeout 300 'waylock-launcher' \ - resume 'light -I' \ - timeout 900 'light -I && wlr-randr --output eDP-1 --off' \ - resume 'wlr-randr --output eDP-1 --on && kanshictl reload' \ - timeout 3600 'loginctl suspend-then-hibernate' \ - resume 'wlr-randr --output eDP-1 --on && kanshictl reload' \ - lock 'waylock-launcher' \ - before-sleep 'waylock-launcher' \ - 2>&1 | tee -a "$log_file" & -{{- else if eq .chezmoi.hostname "hydrus" }} -# lock: 5m, display: 15m -swayidle -w \ - timeout 300 'waylock-launcher' \ - timeout 900 'kanshictl switch dual-off' \ - resume 'kanshictl switch dual' \ - lock 'waylock-launcher' \ - before-sleep 'waylock-launcher' \ - 2>&1 | tee -a "$log_file" & -{{- else }} -# lock after 5m -swayidle -w \ - timeout 300 'waylock-launcher' \ - 2>&1 | tee -a "$log_file" & -{{ end }}