dot_local/bin/executable_idle-launcher.tmpl

@@ -1,34 +1,33 @@
 #!/bin/sh
 
 if test -n "$XDG_STATE_HOME"; then
-  log_dir=$XDG_STATE_HOME
+  log_file=$XDG_STATE_HOME/idle.log
 else
-  log_dir=$HOME/.local/state
+  log_file=$HOME/.local/state/idle.log
 fi
-
+echo "--- $(date +"%Y-%m-%d %T") ---" > "$log_file"
-log_file=$log_dir/idle.log
-echo "--- idle-launcher $(date +"%Y-%m-%d %T") ---" > "$log_file"
 
 # kill process if already running
 user=$(id -u)
 pid=$(ps -o pid,comm -u "$user" | awk '$2=="swayidle" {print $1}')
 if [ "$pid" != "" ]; then
-  echo "$(date +"%Y-%m-%d %T") - idle-launcher: Sending SIGTERM" >> "$log_file"
+  echo "Restarting... Sending SIGTERM." >> "$log_file"
   kill "$pid"
   sleep 1
-  pid=$(ps -o pid,comm -p "$pid" | awk '$2=="swayidle" {print $1}')
+fi
-  if [ "$pid" != "" ]; then
+
-    echo "$(date +"%Y-%m-%d %T") - idle-launcher: Sending SIGKILL" >> "$log_file"
+pid=$(ps -o pid,comm -p "$pid" | awk '$2=="swayidle" {print $1}')
-    kill -9 "$pid"
+if [ "$pid" != "" ]; then
-    sleep 1
+  echo "Restarting... Sending SIGKILL." >> "$log_file"
-  fi
+  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
+brightness="/sys/class/backlight/amdgpu_bl1/brightness"
-prev_brightness=$log_dir/prev_brightness
+prev_brightness="${XDG_STATE_HOME}/prev_brightness"
-swayidle -dw \
+swayidle -w \
   timeout 120 "cat $brightness > $prev_brightness && echo 0 > $brightness" \
     resume "cat $prev_brightness > $brightness" \
   timeout 300 'waylock-launcher' \
@@ -42,7 +41,7 @@ swayidle -dw \
   2>&1 | tee -a "$log_file" &
 {{- else if eq .chezmoi.hostname "hydrus" }}
 # lock: 5m, display: 15m
-swayidle -dw \
+swayidle -w \
   timeout 300 'waylock-launcher' \
   timeout 900 'kanshictl switch dual-off' \
     resume 'kanshictl switch dual' \
@@ -51,7 +50,7 @@ swayidle -dw \
   2>&1 | tee -a "$log_file" &
 {{- else }}
 # lock after 5m
-swayidle -dw \
+swayidle -w \
   timeout 300 'waylock-launcher' \
   2>&1 | tee -a "$log_file" &
-{{- end }}
+{{ end }}

dot_local/bin/executable_waylock-launcher

@@ -12,8 +12,6 @@ if pgrep -u "$user" -x waylock >/dev/null; then
 else
   waylock \
     -fork-on-lock \
-    -log-level debug \
-    -ignore-empty-password \
     -init-color 0x000000 \
     -fail-color 0x000000 \
     -input-color 0x525c62 \