diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 69d042d5..84a24128 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -264,10 +264,10 @@ show_setup_config_menu() { show_setup_system_menu() { local options="" - if [[ -f ~/.local/state/omarchy/toggles/suspend-on ]]; then - options="$options󰒲 Disable Suspend" - else + if [[ -f ~/.local/state/omarchy/toggles/suspend-off ]]; then options="$options󰒲 Enable Suspend" + else + options="$options󰒲 Disable Suspend" fi if omarchy-hibernation-available; then @@ -566,17 +566,17 @@ show_about() { } show_system_menu() { - local options="󱄄 Screensaver\n Lock\n󰍃 Logout" - [[ -f ~/.local/state/omarchy/toggles/suspend-on ]] && options="$options\n󰒲 Suspend" + local options="󱄄 Screensaver\n Lock" + [[ ! -f ~/.local/state/omarchy/toggles/suspend-off ]] && options="$options\n󰒲 Suspend" omarchy-hibernation-available && options="$options\n󰤁 Hibernate" - options="$options\n󰜉 Restart\n󰐥 Shutdown" + options="$options\n󰍃 Logout\n󰜉 Restart\n󰐥 Shutdown" case $(menu "System" "$options") in *Screensaver*) omarchy-launch-screensaver force ;; *Lock*) omarchy-lock-screen ;; - *Logout*) omarchy-system-logout ;; *Suspend*) systemctl suspend ;; *Hibernate*) systemctl hibernate ;; + *Logout*) omarchy-system-logout ;; *Restart*) omarchy-cmd-reboot ;; *Shutdown*) omarchy-cmd-shutdown ;; *) back_to show_main_menu ;; diff --git a/bin/omarchy-toggle-suspend b/bin/omarchy-toggle-suspend index a2464528..3c5b0491 100755 --- a/bin/omarchy-toggle-suspend +++ b/bin/omarchy-toggle-suspend @@ -1,13 +1,12 @@ #!/bin/bash -STATE_FILE=~/.local/state/omarchy/toggles/suspend-on +STATE_FILE=~/.local/state/omarchy/toggles/suspend-off -if [[ ! -f $STATE_FILE ]]; then - mkdir -p "$(dirname $STATE_FILE)" - touch $STATE_FILE +if [[ -f $STATE_FILE ]]; then + rm -f $STATE_FILE notify-send "󰒲 Suspend now available in system menu" else mkdir -p "$(dirname $STATE_FILE)" - rm -f $STATE_FILE + touch $STATE_FILE notify-send "󰒲 Suspend removed from system menu" fi diff --git a/migrations/1771683296.sh b/migrations/1771683296.sh new file mode 100644 index 00000000..5a7b9543 --- /dev/null +++ b/migrations/1771683296.sh @@ -0,0 +1,13 @@ +echo "Migrate suspend toggle from opt-in to opt-out" + +SUSPEND_ON=~/.local/state/omarchy/toggles/suspend-on +SUSPEND_OFF=~/.local/state/omarchy/toggles/suspend-off + +if [[ -f $SUSPEND_ON ]]; then + # User had suspend enabled, remove old file (suspend is now on by default) + rm -f $SUSPEND_ON +else + # User had suspend disabled, create opt-out file to preserve their choice + mkdir -p "$(dirname $SUSPEND_OFF)" + touch $SUSPEND_OFF +fi