From 311fbe85762d8bcafc21dd93224c2ef1f897668c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 21 Feb 2026 16:36:56 +0100
Subject: [PATCH] Group system menu bins together

---
 bin/omarchy-hibernation-setup                         | 2 +-
 bin/omarchy-menu                                      | 4 ++--
 bin/omarchy-reinstall                                 | 2 +-
 bin/{omarchy-cmd-reboot => omarchy-system-reboot}     | 0
 bin/{omarchy-cmd-shutdown => omarchy-system-shutdown} | 0
 bin/omarchy-toggle-hybrid-gpu                         | 4 ++--
 bin/omarchy-update-restart                            | 4 ++--
 config/omarchy/extensions/menu.sh                     | 2 +-
 default/omarchy-skill/SKILL.md                        | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename bin/{omarchy-cmd-reboot => omarchy-system-reboot} (100%)
 rename bin/{omarchy-cmd-shutdown => omarchy-system-shutdown} (100%)

diff --git a/bin/omarchy-hibernation-setup b/bin/omarchy-hibernation-setup
index e06e3bc0..86af3dbf 100755
--- a/bin/omarchy-hibernation-setup
+++ b/bin/omarchy-hibernation-setup
@@ -92,5 +92,5 @@ sudo limine-update
 echo
 
 if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
-  omarchy-cmd-reboot
+  omarchy-system-reboot
 fi
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index d68bf875..5f248c47 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -578,8 +578,8 @@ show_system_menu() {
   *Suspend*) systemctl suspend ;;
   *Hibernate*) systemctl hibernate ;;
   *Logout*) omarchy-system-logout ;;
-  *Restart*) omarchy-cmd-reboot ;;
-  *Shutdown*) omarchy-cmd-shutdown ;;
+  *Restart*) omarchy-system-reboot ;;
+  *Shutdown*) omarchy-system-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }
diff --git a/bin/omarchy-reinstall b/bin/omarchy-reinstall
index edfab730..df00c609 100755
--- a/bin/omarchy-reinstall
+++ b/bin/omarchy-reinstall
@@ -10,5 +10,5 @@ if gum confirm "Are you sure you want to reinstall and lose all config changes?"
   omarchy-reinstall-pkgs
   omarchy-reinstall-configs
 
-  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
+  gum confirm "System has been reinstalled. Reboot?" && omarchy-system-reboot
 fi
diff --git a/bin/omarchy-cmd-reboot b/bin/omarchy-system-reboot
similarity index 100%
rename from bin/omarchy-cmd-reboot
rename to bin/omarchy-system-reboot
diff --git a/bin/omarchy-cmd-shutdown b/bin/omarchy-system-shutdown
similarity index 100%
rename from bin/omarchy-cmd-shutdown
rename to bin/omarchy-system-shutdown
diff --git a/bin/omarchy-toggle-hybrid-gpu b/bin/omarchy-toggle-hybrid-gpu
index c2395ba8..4c573243 100755
--- a/bin/omarchy-toggle-hybrid-gpu
+++ b/bin/omarchy-toggle-hybrid-gpu
@@ -37,7 +37,7 @@ case "$gpu_mode" in
     # Remove the startup delay override (not needed for Hybrid mode)
     sudo rm -rf /etc/systemd/system/supergfxd.service.d/delay-start.conf
 
-    omarchy-cmd-reboot
+    omarchy-system-reboot
   fi
   ;;
 "Hybrid")
@@ -55,7 +55,7 @@ case "$gpu_mode" in
     sudo mkdir -p /etc/systemd/system/supergfxd.service.d
     sudo cp -p $OMARCHY_PATH/default/systemd/system/supergfxd.service.d/delay-start.conf /etc/systemd/system/supergfxd.service.d/
 
-    omarchy-cmd-reboot
+    omarchy-system-reboot
   fi
   ;;
 *)
diff --git a/bin/omarchy-update-restart b/bin/omarchy-update-restart
index 3ed79776..2e62716b 100755
--- a/bin/omarchy-update-restart
+++ b/bin/omarchy-update-restart
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 if [[ ! -d /usr/lib/modules/$(uname -r) ]]; then
-  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-cmd-reboot
+  gum confirm "Linux kernel has been updated. Reboot?" && omarchy-system-reboot
 elif [[ -f $HOME/.local/state/omarchy/reboot-required ]]; then
-  gum confirm "Updates require reboot. Ready?" && omarchy-cmd-reboot
+  gum confirm "Updates require reboot. Ready?" && omarchy-system-reboot
 fi
 
 for file in "$HOME"/.local/state/omarchy/restart-*-required; do
diff --git a/config/omarchy/extensions/menu.sh b/config/omarchy/extensions/menu.sh
index bf618f07..4ededf8e 100644
--- a/config/omarchy/extensions/menu.sh
+++ b/config/omarchy/extensions/menu.sh
@@ -8,7 +8,7 @@
 # show_system_menu() {
 #   case $(menu "System" "  Lock\n󰐥  Shutdown") in
 #   *Lock*) omarchy-lock-screen ;;
-#   *Shutdown*) omarchy-cmd-shutdown ;;
+#   *Shutdown*) omarchy-system-shutdown ;;
 #   *) back_to show_main_menu ;;
 #   esac
 # }
diff --git a/default/omarchy-skill/SKILL.md b/default/omarchy-skill/SKILL.md
index f591022a..46c11e73 100644
--- a/default/omarchy-skill/SKILL.md
+++ b/default/omarchy-skill/SKILL.md
@@ -309,8 +309,8 @@ 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-cmd-shutdown            # Shutdown
-omarchy-cmd-reboot              # Reboot
+omarchy-system-shutdown         # Shutdown
+omarchy-system-reboot           # Reboot
 ```
 
 **IMPORTANT:** Always run `omarchy-debug` with `--no-sudo --print` flags to avoid interactive sudo prompts that will hang the terminal.