Merge branch 'master' into dev

This commit is contained in:
David Heinemeier Hansson 2025-08-22 08:40:31 +02:00
commit 8a78566248
2 changed files with 8 additions and 6 deletions

View File

@ -5,10 +5,11 @@ general {
on_unlock_cmd = omarchy-restart-waybar # prevent stacking of waybar when waking
}
listener {
timeout = 150 # 2.5min
on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
}
# FIXME: Scrensaver depends on tte being installed
# listener {
# timeout = 150 # 2.5min
# on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
# }
listener {
timeout = 300 # 5min

View File

@ -18,12 +18,13 @@ trap catch_errors ERR
show_logo() {
clear
tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
# tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
cat <~/.local/share/omarchy/logo.txt
echo
}
show_subtext() {
echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
echo "$1" # | tte --frame-rate ${3:-640} ${2:-wipe}
echo
}