From 74a3797cf0b57a19a458d3e96b19f48b7fbfc2de Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 29 Apr 2026 15:08:20 +0200 Subject: [PATCH] Move omarchy-lock-screen to omarchy-system-lock to fit with the others --- bin/omarchy-menu | 2 +- bin/{omarchy-lock-screen => omarchy-system-lock} | 0 config/hypr/hypridle.conf | 2 +- config/omarchy/extensions/menu.sh | 2 +- default/hypr/bindings/utilities.conf | 2 +- default/omarchy-skill/SKILL.md | 2 +- migrations/1777467659.sh | 6 ++++++ 7 files changed, 11 insertions(+), 5 deletions(-) rename bin/{omarchy-lock-screen => omarchy-system-lock} (100%) create mode 100644 migrations/1777467659.sh diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 7173c2fa..090fc6b1 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -600,7 +600,7 @@ show_system_menu() { case $(menu "System" "$options") in *Screensaver*) omarchy-launch-screensaver force ;; - *Lock*) omarchy-lock-screen ;; + *Lock*) omarchy-system-lock ;; *Suspend*) systemctl suspend ;; *Hibernate*) systemctl hibernate ;; *Logout*) omarchy-system-logout ;; diff --git a/bin/omarchy-lock-screen b/bin/omarchy-system-lock similarity index 100% rename from bin/omarchy-lock-screen rename to bin/omarchy-system-lock diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf index b7d17690..7d003275 100644 --- a/config/hypr/hypridle.conf +++ b/config/hypr/hypridle.conf @@ -1,5 +1,5 @@ general { - lock_cmd = omarchy-lock-screen # lock screen and 1password + lock_cmd = omarchy-system-lock # lock screen and 1password before_sleep_cmd = loginctl lock-session # lock before suspend. after_sleep_cmd = sleep 1 && hyprctl dispatch dpms on # delay for PAM readiness, then turn on display. inhibit_sleep = 3 # wait until screen is locked diff --git a/config/omarchy/extensions/menu.sh b/config/omarchy/extensions/menu.sh index 4ededf8e..f7d0b277 100644 --- a/config/omarchy/extensions/menu.sh +++ b/config/omarchy/extensions/menu.sh @@ -7,7 +7,7 @@ # # show_system_menu() { # case $(menu "System" " Lock\n󰐥 Shutdown") in -# *Lock*) omarchy-lock-screen ;; +# *Lock*) omarchy-system-lock ;; # *Shutdown*) omarchy-system-shutdown ;; # *) back_to show_main_menu ;; # esac diff --git a/default/hypr/bindings/utilities.conf b/default/hypr/bindings/utilities.conf index 3171356a..144c6b47 100644 --- a/default/hypr/bindings/utilities.conf +++ b/default/hypr/bindings/utilities.conf @@ -64,4 +64,4 @@ bindd = SUPER CTRL, Z, Zoom in, exec, hyprctl keyword cursor:zoom_factor $(hyprc bindd = SUPER CTRL ALT, Z, Reset zoom, exec, hyprctl keyword cursor:zoom_factor 1 # Lock system -bindd = SUPER CTRL, L, Lock system, exec, omarchy-lock-screen +bindd = SUPER CTRL, L, Lock system, exec, omarchy-system-lock diff --git a/default/omarchy-skill/SKILL.md b/default/omarchy-skill/SKILL.md index deafafab..ba152975 100644 --- a/default/omarchy-skill/SKILL.md +++ b/default/omarchy-skill/SKILL.md @@ -308,7 +308,7 @@ omarchy-font-set # Change font omarchy-update # Full system update omarchy-version # Show Omarchy version omarchy-debug --no-sudo --print # Debug info (ALWAYS use these flags) -omarchy-lock-screen # Lock screen +omarchy-system-lock # Lock screen omarchy-system-shutdown # Shutdown omarchy-system-reboot # Reboot ``` diff --git a/migrations/1777467659.sh b/migrations/1777467659.sh new file mode 100644 index 00000000..994c30bf --- /dev/null +++ b/migrations/1777467659.sh @@ -0,0 +1,6 @@ +echo "Rename lock screen command in Hypridle config" + +if grep -q 'omarchy-lock-screen' ~/.config/hypr/hypridle.conf; then + sed -i 's/omarchy-lock-screen/omarchy-system-lock/g' ~/.config/hypr/hypridle.conf + omarchy-restart-hypridle +fi