Revert "fix(aur): add -a flag to yay command to assume AUR packages (#4581)"

This reverts commit b3dd14a038.

AGENTS.md

@@ -0,0 +1,62 @@
+# Style
+
+- Two spaces for indentation, no tabs
+- Use Bash syntax for conditionals: `[[ -f $file ]]`, not `[ -f "$file" ]`
+
+# Command Naming
+
+All commands start with `omarchy-`. Prefixes indicate purpose:
+
+- `cmd-` - check if commands exist, misc utility commands
+- `pkg-` - package management helpers
+- `hw-` - hardware detection (return exit codes for use in conditionals)
+- `refresh-` - copy default config to user's `~/.config/`
+- `restart-` - restart a component
+- `launch-` - open applications
+- `install-` - install optional software
+- `setup-` - interactive setup wizards
+- `toggle-` - toggle features on/off
+- `theme-` - theme management
+- `update-` - update components
+
+# Helper Commands
+
+Use these instead of raw shell commands:
+
+- `omarchy-cmd-missing` / `omarchy-cmd-present` - check for commands
+- `omarchy-pkg-missing` / `omarchy-pkg-present` - check for packages
+- `omarchy-pkg-add` - install packages (handles both pacman and AUR)
+- `omarchy-hw-asus-rog` - detect ASUS ROG hardware (and similar `hw-*` commands)
+
+# Config Structure
+
+- `config/` - default configs copied to `~/.config/`
+- `default/themed/*.tpl` - templates with `{{ variable }}` placeholders for theme colors
+- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, color0-15)
+
+# Refresh Pattern
+
+To copy a default config to user config with automatic backup:
+
+```bash
+omarchy-refresh-config hypr/hyprlock.conf
+```
+
+This copies `~/.local/share/omarchy/config/hypr/hyprlock.conf` to `~/.config/hypr/hyprlock.conf`.
+
+# Migrations
+
+To create a new migration, run `omarchy-dev-add-migration --no-edit`. This creates a migration file named after the unix timestamp of the last commit.
+
+Migration format:
+- No shebang line
+- Start with an `echo` describing what the migration does
+
+Example:
+```bash
+echo "Disable fingerprint in hyprlock if fingerprint auth is not configured"
+
+if omarchy-cmd-missing fprintd-list || ! fprintd-list "$USER" 2>/dev/null | grep -q "finger"; then
+  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
+fi
+```

bin/omarchy-battery-present

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Returns true if a battery is present on the system.
+# Used by the battery monitor and other battery-related checks.
+
+for bat in /sys/class/power_supply/BAT*; do
+  [[ -r "$bat/present" ]] &&
+  [[ "$(cat "$bat/present")" == "1" ]] &&
+  [[ "$(cat "$bat/type")" == "Battery" ]] &&
+  exit 0
+done
+
+exit 1

bin/omarchy-battery-remaining

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Returns the battery percentage remaining as an integer.
+# Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.
 
 upower -i $(upower -e | grep BAT) \
 | awk -F: '/percentage/ {

bin/omarchy-branch-set

@@ -1,14 +1,17 @@
 #!/bin/bash
 
+# Set the branch for Omarchy's git repository.
+
 if (($# == 0)); then
-  echo "Usage: omarchy-branch-set [master|dev]"
+  echo "Usage: omarchy-branch-set [master|rc|dev]"
   exit 1
 else
   branch="$1"
 fi
 
-case "$branch" in
-  "master") git -C $OMARCHY_PATH switch master ;;
-  "dev") git -C $OMARCHY_PATH switch dev ;;
-  *) echo "Unknown branch: $branch"; exit 1; ;;
-esac
+if [[ "$branch" != "master" && "$branch" != "rc" && "$branch" != "dev" ]]; then
+  echo "Error: Invalid branch '$branch'. Must be one of: master, rc, dev"
+  exit 1
+fi
+
+git -C $OMARCHY_PATH switch $branch

bin/omarchy-brightness-display

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Adjust brightness on the most likely display device.
+# Usage: omarchy-brightness-display <step>
+
+step="${1:-+5%}"
+
+# Start with the first possible output, then refine to the most likely given an order heuristic.
+device="$(ls -1 /sys/class/backlight 2>/dev/null | head -n1)"
+for candidate in amdgpu_bl* intel_backlight acpi_video*; do
+  if [[ -e "/sys/class/backlight/$candidate" ]]; then
+    device="$candidate"
+    break
+  fi
+done
+
+# Set the actual brightness of the display device.
+brightnessctl -d "$device" set "$step" >/dev/null
+
+# Use SwayOSD to display the new brightness setting.
+omarchy-swayosd-brightness "$(brightnessctl -d "$device" -m | cut -d',' -f4 | tr -d '%')"

bin/omarchy-brightness-display-apple

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
+
+if [[ $# -eq 0 ]]; then
+  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
+else
+  device="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  sudo asdcontrol "$device" -- "$1" >/dev/null
+  value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
+  omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
+fi

bin/omarchy-brightness-keyboard

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Adjust keyboard backlight brightness using available steps.
+# Usage: omarchy-brightness-keyboard <up|down>
+
+direction="${1:-up}"
+
+# Find keyboard backlight device (look for *kbd_backlight* pattern in leds class).
+device=""
+for candidate in /sys/class/leds/*kbd_backlight*; do
+  if [[ -e "$candidate" ]]; then
+    device="$(basename "$candidate")"
+    break
+  fi
+done
+
+if [[ -z "$device" ]]; then
+  echo "No keyboard backlight device found" >&2
+  exit 1
+fi
+
+# Get current and max brightness to determine step size.
+max_brightness="$(brightnessctl -d "$device" max)"
+current_brightness="$(brightnessctl -d "$device" get)"
+
+# Calculate step as one unit (keyboards typically have discrete levels like 0-3).
+if [[ "$direction" == "up" ]]; then
+  new_brightness=$((current_brightness + 1))
+  [[ $new_brightness -gt $max_brightness ]] && new_brightness=$max_brightness
+else
+  new_brightness=$((current_brightness - 1))
+  [[ $new_brightness -lt 0 ]] && new_brightness=0
+fi
+
+# Set the new brightness.
+brightnessctl -d "$device" set "$new_brightness" >/dev/null
+
+# Use SwayOSD to display the new brightness setting.
+percent=$((new_brightness * 100 / max_brightness))
+omarchy-swayosd-brightness "$percent"

bin/omarchy-channel-set

@@ -1,14 +1,28 @@
 #!/bin/bash
 
+# Set the Omarchy channel, which dictates what git branch and package repository is used.
+#
+# Stable uses the master branch, which only sees updates on official releases, and
+# the stable package repository, which typically lags the edge by a month to ensure
+# better compatibility.
+#
+# Edge tracks the latest package repository, but still relies on the master branch,
+# so new packages which require config changes may cause conflicts or errors.
+#
+# Dev tracks the active development dev branch, which may include partial or broken updates,
+# as well as the latest package repository. This should only be used by Omarchy developers
+# and people with a lot of experience managing Linux systems.
+
 if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [stable|edge|dev]"
+  echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
   exit 1
 else
   channel="$1"
 fi
 
 case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && sudo pacman -Suu --noconfirm ;;
+"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" && sudo pacman -Suu --noconfirm ;;
 "edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;

bin/omarchy-cmd-apple-display-brightness

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [[ $# -eq 0 ]]; then
-  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
-else
-  DEVICE="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
-  sudo asdcontrol "$DEVICE" -- "$1" >/dev/null
-  VALUE="$(sudo asdcontrol "$DEVICE" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
-  swayosd-client \
-    --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
-    --custom-icon display-brightness \
-    --custom-progress "$(awk -v v="$VALUE" 'BEGIN{printf "%.2f", v/60000}')" \
-    --custom-progress-text "$(( VALUE * 100 / 60000 ))%"
-fi

bin/omarchy-cmd-audio-switch

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
+
 focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 
 sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')

bin/omarchy-cmd-first-run

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Finish the installation of Omarchy with items that can only be done after logging in.
+
 set -e
 
 FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode

bin/omarchy-cmd-missing

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Returns true if any of the commands passed in as arguments are missing on the system.
+
 for cmd in "$@"; do
   if ! command -v "$cmd" &>/dev/null; then
     exit 0

bin/omarchy-cmd-present

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Returns true if all the commands passed in as arguments exit on the system.
+
 for cmd in "$@"; do
   command -v "$cmd" &>/dev/null || exit 1
 done

bin/omarchy-cmd-reboot

@@ -1,6 +1,13 @@
 #!/bin/bash
 
+# Reboot command that first closes all application windows (thus giving them a chance to save state).
+# This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.
+
 omarchy-state clear re*-required
+
+# Schedule the reboot to happen after closing windows (detached from terminal)
+nohup bash -c "sleep 2 && systemctl reboot --no-wall" >/dev/null 2>&1 &
+
+# Now close all windows
 omarchy-hyprland-window-close-all
 sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl reboot --no-wall

bin/omarchy-cmd-screenrecord

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Start and stop a screenrecording, which will be saved to ~/Videos by default.
+# Alternative location can be set via OMARCHY_SCREENRECORD_DIR or XDG_VIDEOS_DIR ENVs.
+
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
 
@@ -11,6 +14,7 @@ fi
 DESKTOP_AUDIO="false"
 MICROPHONE_AUDIO="false"
 WEBCAM="false"
+WEBCAM_DEVICE=""
 STOP_RECORDING="false"
 
 for arg in "$@"; do
@@ -18,6 +22,7 @@ for arg in "$@"; do
     --with-desktop-audio) DESKTOP_AUDIO="true" ;;
     --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
+    --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
     --stop-recording) STOP_RECORDING="true"
   esac
 done
@@ -29,6 +34,15 @@ cleanup_webcam() {
 start_webcam_overlay() {
   cleanup_webcam
 
+  # Auto-detect first available webcam if none specified
+  if [[ -z "$WEBCAM_DEVICE" ]]; then
+    WEBCAM_DEVICE=$(v4l2-ctl --list-devices 2>/dev/null | grep -m1 "^\s*/dev/video" | tr -d '\t')
+    if [[ -z "$WEBCAM_DEVICE" ]]; then
+      notify-send "No webcam devices found" -u critical -t 3000
+      return 1
+    fi
+  fi
+
   # Get monitor scale
   local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
 
@@ -38,7 +52,7 @@ start_webcam_overlay() {
   # Try preferred 16:9 resolutions in order, use first available
   local preferred_resolutions=("640x360" "1280x720" "1920x1080")
   local video_size_arg=""
-  local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
+  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
 
   for resolution in "${preferred_resolutions[@]}"; do
     if echo "$available_formats" | grep -q "$resolution"; then
@@ -47,7 +61,7 @@ start_webcam_overlay() {
     fi
   done
 
-  ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
+  ffplay -f v4l2 $video_size_arg -framerate 30 "$WEBCAM_DEVICE" \
     -vf "scale=${target_width}:-1" \
     -window_title "WebcamOverlay" \
     -noborder \

bin/omarchy-cmd-screensaver

@@ -1,11 +1,13 @@
 #!/bin/bash
 
+# Run the Omarchy screensaver using random effects from TTE.
+
 screensaver_in_focus() {
   hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
 }
 
 exit_screensaver() {
-  hyprctl keyword cursor:invisible false
+  hyprctl keyword cursor:invisible false &>/dev/null || true
   pkill -x tte 2>/dev/null
   pkill -f org.omarchy.screensaver 2>/dev/null
   exit 0

bin/omarchy-cmd-screenshot

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Take a screenshot of the whole screen, a specific window, or a user-drawn region.
+# Saves to ~/Pictures by default, but that can be changed via OMARCHY_SCREENSHOT_DIR or XDG_PICTURES_DIR ENVs.
+# Editor defaults to Satty but can be changed via --editor=<name> or OMARCHY_SCREENSHOT_EDITOR env
+
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
 
@@ -10,6 +14,33 @@ fi
 
 pkill slurp && exit 0
 
+SCREENSHOT_EDITOR="${OMARCHY_SCREENSHOT_EDITOR:-satty}"
+
+# Parse --editor flag from any position
+ARGS=()
+for arg in "$@"; do
+  if [[ "$arg" == --editor=* ]]; then
+    SCREENSHOT_EDITOR="${arg#--editor=}"
+  else
+    ARGS+=("$arg")
+  fi
+done
+set -- "${ARGS[@]}"
+
+open_editor() {
+  local filepath="$1"
+  if [[ "$SCREENSHOT_EDITOR" == "satty" ]]; then
+    satty --filename "$filepath" \
+      --output-filename "$filepath" \
+      --early-exit \
+      --actions-on-enter save-to-clipboard \
+      --save-after-copy \
+      --copy-command 'wl-copy'
+  else
+    $SCREENSHOT_EDITOR "$filepath"
+  fi
+}
+
 MODE="${1:-smart}"
 PROCESSING="${2:-slurp}"
 
@@ -43,7 +74,7 @@ case "$MODE" in
     SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
     kill $PID 2>/dev/null
 
-    # If the selction area is L * W < 20, we'll assume you were trying to select whichever
+    # If the selection area is L * W < 20, we'll assume you were trying to select whichever
     # window or output it was inside of to prevent accidental 2px snapshots
     if [[ "$SELECTION" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
       if (( ${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20 )); then
@@ -68,16 +99,19 @@ case "$MODE" in
     ;;
 esac
 
-[ -z "$SELECTION" ] && exit 0
+[[ -z $SELECTION ]] && exit 0
+
+FILENAME="screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png"
+FILEPATH="$OUTPUT_DIR/$FILENAME"
 
 if [[ $PROCESSING == "slurp" ]]; then
-grim -g "$SELECTION" - |
-  satty --filename - \
-    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'
+  grim -g "$SELECTION" "$FILEPATH" || exit 1
+  wl-copy < "$FILEPATH"
+
+  (
+    ACTION=$(notify-send "Screenshot copied & saved" "Click to edit" -t 10000 -i "$FILEPATH" -A "default=edit")
+    [[ "$ACTION" == "default" ]] && open_editor "$FILEPATH"
+  ) &
 else
   grim -g "$SELECTION" - | wl-copy
 fi

bin/omarchy-cmd-share

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Share clipboard, file, or folder using LocalSend. Bound to Super + Ctrl + S by default.
+
 if (($# == 0)); then
   echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
   exit 1

bin/omarchy-cmd-shutdown

@@ -1,6 +1,13 @@
 #!/bin/bash
 
+# Shutdown command that first closes all application windows (thus giving them a chance to save state).
+# This is particularly helpful for applications like Chromium that otherwise won't shutdown cleanly.
+
 omarchy-state clear re*-required
+
+# Schedule the shutdown to happen after closing windows (detached from terminal)
+nohup bash -c "sleep 2 && systemctl poweroff --no-wall" >/dev/null 2>&1 &
+
+# Now close all windows
 omarchy-hyprland-window-close-all
 sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl poweroff --no-wall

bin/omarchy-cmd-terminal-cwd

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Returns the current working directory of the active terminal window,
+# so a new terminal window can be started in the same directory.
+
 # Go from current active terminal to its child shell process and run cwd there
 terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)

bin/omarchy-debug

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Return exhaustive debugging information about the system to help diagnose problems.
+
 NO_SUDO=false
 PRINT_ONLY=false
 

bin/omarchy-dev-add-migration

@@ -1,6 +1,14 @@
 #!/bin/bash
 
+# Creates a new Omarchy migration named after the unix timestamp of the last commit.
+# Only intended for Omarchy developers.
+
 cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
-nvim $migration_file
+
+if [[ "$1" != "--no-edit" ]]; then
+  nvim $migration_file
+fi
+
+echo $migration_file

bin/omarchy-drive-info

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-# Drive, like /dev/nvme0, to display information about
+# Returns drive information about a given volumne, like /dev/nvme0, which is used by omarchy-drive-select.
+
 if (($# == 0)); then
   echo "Usage: omarchy-drive-info [/dev/drive]"
   exit 1

bin/omarchy-drive-select

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Select a drive from a list with info that includes space and brand
+# Select a drive from a list with info that includes space and brand. Used by omarchy-drive-set-password.
 
 if (($# == 0)); then
   drives=$(lsblk -dpno NAME | grep -E '/dev/(sd|hd|vd|nvme|mmcblk|xv)')

bin/omarchy-drive-set-password

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Set a new encryption password for a drive selected.
+
 encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
 
 if [[ -n $encrypted_drives ]]; then

bin/omarchy-font-current

@@ -1,3 +1,6 @@
 #!/bin/bash
 
+# Returns the name of the current monospace font being used by extracting it from the Waybar stylesheet.
+# This can be changed using omarchy-font-set.
+
 grep -oP 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1

bin/omarchy-font-list

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Returns a list of all the monospace fonts available on the system that can be set using omarchy-font-set.
+
 fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting|omarchy' | sort -u

bin/omarchy-font-set

@@ -1,8 +1,11 @@
 #!/bin/bash
 
+# Set the system-wide monospace font that should be used by the terminal, hyprlock, waybar, swayosd, etc.
+# The font name must be one of the ones returned by omarchy-font-list.
+
 font_name="$1"
 
-if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
+if [[ -n "$font_name" ]]; then
   if fc-list | grep -iq "$font_name"; then
     if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
       sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml

bin/omarchy-hibernation-available

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Check if hibernation is supported
+if [[ ! -f /sys/power/image_size ]]; then
+  exit 1
+fi
+
+# Sum all swap sizes (excluding zram)
+SWAPSIZE_KB=$(awk '!/Filename|zram/ {sum += $3} END {print sum+0}' /proc/swaps)
+SWAPSIZE=$(( 1024 * ${SWAPSIZE_KB:-0} ))
+
+HIBERNATION_IMAGE_SIZE=$(cat /sys/power/image_size)
+
+if [[ "$SWAPSIZE" -gt "$HIBERNATION_IMAGE_SIZE" ]] && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
+  exit 0
+else
+  exit 1
+fi

bin/omarchy-hibernation-remove

@@ -0,0 +1,59 @@
+#!/bin/bash
+
+# Removes hibernation setup: disables swap, removes swapfile, removes fstab entry,
+# removes resume hook, and removes suspend-then-hibernate configuration.
+
+MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
+
+# Check if hibernation is configured
+if [ ! -f "$MKINITCPIO_CONF" ] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
+  echo "Hibernation is not set up"
+  exit 0
+fi
+
+if ! gum confirm "Remove hibernation setup?"; then
+  exit 0
+fi
+
+SWAP_SUBVOLUME="/swap"
+SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
+
+# Disable swap if active
+if swapon --show | grep -q "$SWAP_FILE"; then
+  echo "Disabling swap on $SWAP_FILE"
+  sudo swapoff "$SWAP_FILE"
+fi
+
+# Remove swapfile
+if [ -f "$SWAP_FILE" ]; then
+  echo "Removing swapfile"
+  sudo rm "$SWAP_FILE"
+fi
+
+# Remove swap subvolume
+if sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
+  echo "Removing Btrfs subvolume $SWAP_SUBVOLUME"
+  sudo btrfs subvolume delete "$SWAP_SUBVOLUME"
+fi
+
+# Remove fstab entry
+if grep -Fq "$SWAP_FILE" /etc/fstab; then
+  echo "Removing swapfile from /etc/fstab"
+  sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
+  sudo sed -i "\|$SWAP_FILE|d" /etc/fstab
+  sudo sed -i '/^# Btrfs swapfile for system hibernation$/d' /etc/fstab
+fi
+
+# Remove suspend-then-hibernate configuration
+echo "Removing suspend-then-hibernate configuration"
+sudo rm -f /etc/systemd/logind.conf.d/lid.conf
+sudo rm -f /etc/systemd/sleep.conf.d/hibernate.conf
+
+# Remove mkinitcpio resume hook
+echo "Removing resume hook"
+sudo rm "$MKINITCPIO_CONF"
+
+echo "Regenerating initramfs..."
+sudo limine-mkinitcpio
+
+echo "Hibernation removed"

bin/omarchy-hibernation-setup

@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Creates a swap file in the btrfs subvolume, adds the swap file to /etc/fstab,
+# adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.
+
+if [[ ! -f /sys/power/image_size ]]; then
+  echo -e "\033[31mError: Hibernation is not supported on your system\033[0m" >&2
+  exit 1
+fi
+
+
+MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
+
+# Check if hibernation is already configured
+if [ -f "$MKINITCPIO_CONF" ] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
+  echo "Hibernation is already set up"
+  exit 0
+fi
+
+if [[ $1 != "--force" ]]; then
+  MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
+  if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
+    exit 0
+  fi
+fi
+
+SWAP_SUBVOLUME="/swap"
+SWAP_FILE="$SWAP_SUBVOLUME/swapfile"
+
+# Create btrfs subvolume for swap
+if ! sudo btrfs subvolume show "$SWAP_SUBVOLUME" &>/dev/null; then
+  echo "Creating Btrfs subvolume"
+  sudo btrfs subvolume create "$SWAP_SUBVOLUME"
+  sudo chattr +C "$SWAP_SUBVOLUME"
+fi
+
+# Create swapfile
+if ! sudo swaplabel "$SWAP_FILE" &>/dev/null; then
+  echo "Creating swapfile in Btrfs subvolume"
+  MEM_TOTAL_KB="$(awk '/MemTotal/ {print $2}' /proc/meminfo)k"
+  sudo btrfs filesystem mkswapfile -s "$MEM_TOTAL_KB" "$SWAP_FILE"
+fi
+
+# Add swapfile to fstab
+if ! grep -Fq "$SWAP_FILE" /etc/fstab; then
+  echo "Adding swapfile to /etc/fstab"
+  sudo cp -a /etc/fstab "/etc/fstab.$(date +%Y%m%d%H%M%S).back"
+  printf "\n# Btrfs swapfile for system hibernation\n%s none swap defaults,pri=0 0 0\n" "$SWAP_FILE" | sudo tee -a /etc/fstab >/dev/null
+fi
+
+# Enable swap
+if ! swapon --show | grep -q "$SWAP_FILE"; then
+  echo "Enabling swap on $SWAP_FILE"
+  sudo swapon -p 0 "$SWAP_FILE"
+fi
+
+# Add resume hook to mkinitcpio
+sudo mkdir -p /etc/mkinitcpio.conf.d
+echo "Adding resume hook to $MKINITCPIO_CONF"
+echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
+
+# Ensure keyboard backlight doesn't prevent sleep
+sudo cp -p "$OMARCHY_PATH/default/systemd/system-sleep/keyboard-backlight" /usr/lib/systemd/system-sleep/
+
+# Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
+if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
+  LIMINE_DROP_IN="/etc/limine-entry-tool.d/rtc-alarm.conf"
+  if [[ ! -f "$LIMINE_DROP_IN" ]]; then
+    echo "Enabling ACPI RTC alarm for s2idle suspend"
+    sudo mkdir -p /etc/limine-entry-tool.d
+    echo 'KERNEL_CMDLINE[default]+="rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
+  fi
+fi
+
+# Regenerate initramfs and boot entry
+echo "Regenerating initramfs..."
+sudo limine-mkinitcpio
+sudo limine-update
+
+echo
+
+if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
+  omarchy-cmd-reboot
+fi

bin/omarchy-hook

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Run a named hook, like post-update (available in ~/.config/omarchy/hooks/post-update).
+
 set -e
 
 if [[ $# -lt 1 ]]; then

bin/omarchy-hw-asus-rog

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Detect whether the computer is an Asus ROG machine.
+
+[[ "$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)" == "ASUSTeK COMPUTER INC." ]] &&
+   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null

bin/omarchy-hyprland-workspace-toggle-gaps

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Toggles the window gaps on the active workspace between no gaps and the default 10/5/2.
+
 workspace_id=$(hyprctl activeworkspace -j | jq -r .id)
 gaps=$(hyprctl workspacerules -j | jq -r ".[] | select(.workspaceString==\"$workspace_id\") | .gapsOut[0] // 0")
 

bin/omarchy-install-chromium-google-account

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Allow Chromium to sign in to Google accounts by adding the correct
+# oauth client id and secret to ~/.config/chromium-flags.conf.
+
 if [[ -f ~/.config/chromium-flags.conf ]]; then
   CONF=~/.config/chromium-flags.conf
 

bin/omarchy-install-dev-env

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install one of the supported development environments. Usually called via Install > Development > * in the Omarchy Menu.
+
 if [[ -z "$1" ]]; then
   echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
   exit 1

bin/omarchy-install-docker-dbs

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Install one of the supported databases in a Docker container with the suitable development options.
+# Usually called via Install > Development > Docker DB from the Omarchy Menu.
+
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB" "MSSQL")
 
 if [[ "$#" -eq 0 ]]; then

bin/omarchy-install-dropbox

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install and start the Dropbox service. Must then be authenticated via the web.
+
 echo "Installing all dependencies..."
 omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 

bin/omarchy-install-geforce-now

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Install and launch Geforce Now.
+
+set -e
+
+omarchy-pkg-add flatpak
+cd /tmp
+
+# Download and run GeForce NOW
+curl -LO https://international.download.nvidia.com/GFNLinux/GeForceNOWSetup.bin
+chmod +x GeForceNOWSetup.bin
+./GeForceNOWSetup.bin
+
+# Ensure a separate browser process not started by GFN is available.
+# If not, it seems like GFN has a tendency to hang on login.
+setsid omarchy-launch-browser

bin/omarchy-install-steam

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install and launch Steam after first letting the user pick the correct grahics card drivers.
+
 set -e
 
 echo "Now pick dependencies matching your graphics card"

bin/omarchy-install-tailscale

@@ -1,13 +1,10 @@
 #!/bin/bash
 
+# Install the Tailscale mesh VPN service and a web app for the Tailscale Admin Console.
+
 curl -fsSL https://tailscale.com/install.sh | sh
-curl -fsSL https://neuralink.com/tsui/install.sh | bash
 
 echo -e "\nStarting Tailscale..."
 sudo tailscale up --accept-routes
 
-echo -e "\nAdd tsui to sudoers..."
-echo "$USER ALL=(ALL) NOPASSWD: $(which tsui)" | sudo tee /etc/sudoers.d/tsui
-
-omarchy-tui-install "Tailscale" "sudo tsui" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
-omarchy-webapp-install "Tailscale Admin Console" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
+omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png

bin/omarchy-install-terminal

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install one of the approved terminals and set it as the default for Omarchy (Super + Return etc).
+
 if (($# == 0)); then
   echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
   exit 1

bin/omarchy-install-vscode

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install VSCode and configure it to use the gnome-libsecret password store, not to update automatically, and to use the current Omarchy theme.
+
 echo "Installing VSCode..."
 omarchy-pkg-add visual-studio-code-bin
 

bin/omarchy-install-xbox-controllers

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install support for using Xbox controllers with Steam/RetroArch/etc.
+
 set -e
 
 # Install xpadneo to ensure controllers work out of the box

bin/omarchy-launch-about

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Launch the fastfetch TUI that gives information about the current system.
+
 exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"

bin/omarchy-launch-audio

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Launch the Omarchy audio controls TUI (provided by wiremix).
+
 omarchy-launch-or-focus-tui wiremix

bin/omarchy-launch-bluetooth

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Launch the Omarchy bluetooth controls TUI (provided by bluetui).
+# Also attempts to unblock bluetooth service if rfkill had blocked it.
+
 rfkill unblock bluetooth
 exec omarchy-launch-or-focus-tui bluetui

bin/omarchy-launch-browser

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Launch the default browser as determined by xdg-settings.
+# Automatically converts --private into the correct flag for the given browser.
+
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 

bin/omarchy-launch-editor

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Launch the default editor as determined by $EDITOR (set via ~/.config/uwsm/default) (or nvim if missing).
+# Starts suitable editors in a terminal window and otherwise as a regular application.
+
 omarchy-cmd-present "$EDITOR" || EDITOR=nvim
 
 case "$EDITOR" in

bin/omarchy-launch-floating-terminal-with-presentation

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Launch a floating terminal with the Omarchy logo presentation, then execute the command passed in, and finally end with the omarchy-show-done presentation.
+# Used by actions such as Update System.
+
 cmd="$*"
 exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if [ \$? -ne 130 ]; then omarchy-show-done; fi"

bin/omarchy-launch-opencode

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.opencode -e bash -c 'cd ~/Work; opencode'

bin/omarchy-launch-or-focus

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Launch or focus on a given command identified by the passed in window-pattern.
+# Use by some default bindings, like the one for Spotify, to ensure there is only one instance of the application open.
+
 if (($# == 0)); then
   echo "Usage: omarchy-launch-or-focus [window-pattern] [launch-command]"
   exit 1

bin/omarchy-launch-or-focus-tui

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Launch or focus on a given TUI identified by the passed in as the command.
+# Use by commands like omarchy-launch-wifi to ensure there is only one wifi configuration screen open.
+
 APP_ID="org.omarchy.$(basename "$1")"
 LAUNCH_COMMAND="omarchy-launch-tui $@"
 

bin/omarchy-launch-or-focus-webapp

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Launch or focus on a given web app identified by the window-pattern.
+# Use by some default bindings, like the one for WhatsApp, to ensure there is only one instance of the application open.
+
 if (($# == 0)); then
   echo "Usage: omarchy-launch-or-focus-webapp [window-pattern] [url-and-flags...]"
   exit 1
@@ -9,4 +12,4 @@ WINDOW_PATTERN="$1"
 shift
 LAUNCH_COMMAND="omarchy-launch-webapp $@"
 
-exec omarchy-launch-or-focus "$WINDOW_PATTERN" "$LAUNCH_COMMAND"
+exec omarchy-launch-or-focus "$WINDOW_PATTERN" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Launch the Omarchy screensaver in the default terminal on the system with the correct font configuration.
+
 # Exit early if we don't have the tte show
 if ! command -v tte &>/dev/null; then
   exit 1

bin/omarchy-launch-tui

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Launch the TUI command passed in as an argument in the default terminal with an org.omarchy.COMMAND app id for styling.
+
 exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"

bin/omarchy-launch-walker

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Launch the Walker application launcher while ensuring that it's data provider (called elephant) is running first.
+
 # Ensure elephant is running before launching walker
 if ! pgrep -x elephant > /dev/null; then
   setsid uwsm-app -- elephant &

bin/omarchy-launch-webapp

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Launch the passed in URL as a web app in the default browser (or chromium if the default doesn't support --app).
+
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in

bin/omarchy-launch-wifi

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Launch the Omarchy wifi controls (provided by the Impala TUI).
+# Attempts to unblock the wifi service first in case it should be been blocked.
+
 rfkill unblock wifi
 omarchy-launch-or-focus-tui impala

bin/omarchy-lock-screen

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Locks the system using hyprlock, but not before ensuring 1password has also been locked, and the screensaver stopped.
+
 # Lock the screen
 pidof hyprlock || hyprlock &
 

bin/omarchy-menu

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Launch the Omarchy Menu or takes a parameter to jump straight to a submenu.
+
 export PATH="$HOME/.local/share/omarchy/bin:$PATH"
 
 # Set to true when going directly to a submenu, so we can exit directly
@@ -86,29 +88,49 @@ show_learn_menu() {
 }
 
 show_trigger_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle\n  Hardware") in
   *Capture*) show_capture_menu ;;
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
+  *Hardware*) show_hardware_menu ;;
   *) show_main_menu ;;
   esac
 }
 
 show_capture_menu() {
   case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
+  *Screenshot*) omarchy-cmd-screenshot ;;
   *Screenrecord*) show_screenrecord_menu ;;
   *Color*) pkill hyprpicker || hyprpicker -a ;;
   *) show_trigger_menu ;;
   esac
 }
 
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Snap with Editing\n  Straight to Clipboard") in
-  *Editing*) omarchy-cmd-screenshot smart ;;
-  *Clipboard*) omarchy-cmd-screenshot smart clipboard ;;
-  *) show_capture_menu ;;
-  esac
+get_webcam_list() {
+  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
+    if [[ "$line" != $'\t'* && -n "$line" ]]; then
+      local name="$line"
+      IFS= read -r device || break
+      device=$(echo "$device" | tr -d '\t' | head -1)
+      [[ -n "$device" ]] && echo "$device  $name"
+    fi
+  done
+}
+
+show_webcam_select_menu() {
+  local devices=$(get_webcam_list)
+  local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
+
+  if [[ -z "$devices" || "$count" -eq 0 ]]; then
+    notify-send "No webcam devices found" -u critical -t 3000
+    return 1
+  fi
+
+  if [[ "$count" -eq 1 ]]; then
+    echo "$devices" | awk '{print $1}'
+  else
+    menu "Select Webcam" "$devices" | awk '{print $1}'
+  fi
 }
 
 show_screenrecord_menu() {
@@ -117,7 +139,13 @@ show_screenrecord_menu() {
   case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
   *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
   *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
+  *"With desktop + microphone audio + webcam")
+    local device=$(show_webcam_select_menu) || {
+      back_to show_capture_menu
+      return
+    }
+    omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device"
+    ;;
   *) back_to show_capture_menu ;;
   esac
 }
@@ -141,6 +169,13 @@ show_toggle_menu() {
   esac
 }
 
+show_hardware_menu() {
+  case $(menu "Toggle" "  Hybrid GPU") in
+  *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
+  *) show_trigger_menu ;;
+  esac
+}
+
 show_style_menu() {
   case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
@@ -167,20 +202,20 @@ show_font_menu() {
 }
 
 show_setup_menu() {
-  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
+  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
+  options="$options\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
   *Audio*) omarchy-launch-audio ;;
   *Wifi*) omarchy-launch-wifi ;;
   *Bluetooth*) omarchy-launch-bluetooth ;;
   *Power*) show_setup_power_menu ;;
+  *System*) show_setup_system_menu ;;
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
   *Input*) open_in_editor ~/.config/hypr/input.conf ;;
-  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
@@ -198,8 +233,17 @@ show_setup_power_menu() {
   fi
 }
 
+show_setup_security_menu() {
+  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
+  *) show_setup_menu ;;
+  esac
+}
+
 show_setup_config_menu() {
-  case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
+  case $(menu "Setup" "  Defaults\n  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
+  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
   *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
   *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
   *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
@@ -208,14 +252,29 @@ show_setup_config_menu() {
   *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
   *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
   *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
-  *) show_main_menu ;;
+  *) show_setup_menu ;;
   esac
 }
 
-show_setup_security_menu() {
-  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
+show_setup_system_menu() {
+  local options=""
+
+  if [ -f ~/.local/state/omarchy/toggles/suspend-on ]; then
+    options="$options󰒲  Disable Suspend"
+  else
+    options="$options󰒲  Enable Suspend"
+  fi
+
+  if omarchy-hibernation-available; then
+    options="$options\n󰤁  Disable Hibernate"
+  else
+    options="$options\n󰤁  Enable Hibernate"
+  fi
+
+  case $(menu "System" "$options") in
+  *Suspend*) omarchy-toggle-suspend ;;
+  *"Enable Hibernate"*) present_terminal omarchy-hibernation-setup ;;
+  *"Disable Hibernate"*) present_terminal omarchy-hibernation-remove ;;
   *) show_setup_menu ;;
   esac
 }
@@ -276,10 +335,10 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "  Dictation [AUR]\n󱚤  Claude Code\n󱚤  Copilot CLI [AUR]\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
-  *Dictation*) present_terminal "echo 'Installing Hyprwhspr from AUR...'; yay -S --noconfirm hyprwhspr && hyprwhspr setup" ;;
+  case $(menu "Install" "  Dictation\n󱚤  Claude Code\n󱚤  Copilot CLI\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  *Dictation*) present_terminal omarchy-voxtype-install ;;
   *Claude*) install "Claude Code" "claude-code" ;;
-  *Copilot*) aur_install "Copilot CLI" "github-copilot-cli" ;;
+  *Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
   *Cursor*) install "Cursor CLI" "cursor-cli" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
   *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
@@ -291,8 +350,9 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
+  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
@@ -366,11 +426,13 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰏓  Preinstalls\n  Dictation\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
   *Package*) terminal omarchy-pkg-remove ;;
   *Web*) present_terminal omarchy-webapp-remove ;;
   *TUI*) present_terminal omarchy-tui-remove ;;
   *Development*) show_remove_development_menu ;;
+  *Preinstalls*) present_terminal omarchy-remove-all ;;
+  *Dictation*) present_terminal omarchy-voxtype-remove ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
   *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
@@ -380,7 +442,7 @@ show_remove_menu() {
 }
 
 show_remove_development_menu() {
-  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
   *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
   *JavaScript*) show_remove_javascript_menu ;;
   *Go*) present_terminal "omarchy-remove-dev-env go" ;;
@@ -398,7 +460,7 @@ show_remove_development_menu() {
 }
 
 show_remove_javascript_menu() {
-  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
+  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
   *Node*) present_terminal "omarchy-remove-dev-env node" ;;
   *Bun*) present_terminal "omarchy-remove-dev-env bun" ;;
   *Deno*) present_terminal "omarchy-remove-dev-env deno" ;;
@@ -407,7 +469,7 @@ show_remove_javascript_menu() {
 }
 
 show_remove_php_menu() {
-  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
+  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
   *PHP*) present_terminal "omarchy-remove-dev-env php" ;;
   *Laravel*) present_terminal "omarchy-remove-dev-env laravel" ;;
   *Symfony*) present_terminal "omarchy-remove-dev-env symfony" ;;
@@ -416,7 +478,7 @@ show_remove_php_menu() {
 }
 
 show_remove_elixir_menu() {
-  case $(menu "Remove" "  Elixir\n  Phoenix") in
+  case $(menu "Remove" "  Elixir\n  Phoenix") in
   *Elixir*) present_terminal "omarchy-remove-dev-env elixir" ;;
   *Phoenix*) present_terminal "omarchy-remove-dev-env phoenix" ;;
   *) show_remove_development_menu ;;
@@ -424,7 +486,7 @@ show_remove_elixir_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
+  case $(menu "Update" "  Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Channel*) show_update_channel_menu ;;
   *Config*) show_update_config_menu ;;
@@ -440,8 +502,9 @@ show_update_menu() {
 }
 
 show_update_channel_menu() {
-  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
+  case $(menu "Update channel" "🟢 Stable\n🟡 RC\n🟠 Edge\n🔴 Dev") in
   *Stable*) present_terminal "omarchy-channel-set stable" ;;
+  *RC*) present_terminal "omarchy-channel-set rc" ;;
   *Edge*) present_terminal "omarchy-channel-set edge" ;;
   *Dev*) present_terminal "omarchy-channel-set dev" ;;
   *) show_update_menu ;;
@@ -489,10 +552,21 @@ show_update_password_menu() {
   esac
 }
 
+show_about() {
+  omarchy-launch-about
+}
+
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰜉  Restart\n󰐥  Shutdown") in
+  local options="  Lock\n󱄄  Screensaver"
+  [ -f ~/.local/state/omarchy/toggles/suspend-on ] && options="$options\n󰒲  Suspend"
+  omarchy-hibernation-available && options="$options\n󰤁  Hibernate"
+  options="$options\n󰜉  Restart\n󰐥  Shutdown"
+
+  case $(menu "System" "$options") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
+  *Suspend*) systemctl suspend ;;
+  *Hibernate*) systemctl hibernate ;;
   *Restart*) omarchy-cmd-reboot ;;
   *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
@@ -509,6 +583,7 @@ go_to_menu() {
   *learn*) show_learn_menu ;;
   *trigger*) show_trigger_menu ;;
   *share*) show_share_menu ;;
+  *capture*) show_capture_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
   *screenshot*) show_screenshot_menu ;;
@@ -518,7 +593,7 @@ go_to_menu() {
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
-  *about*) omarchy-launch-about ;;
+  *about*) show_about ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-menu-keybindings

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# A script to display Hyprland keybindings defined in your configuration
-# using walker for an interactive search menu.
+# Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.
 
 declare -A KEYCODE_SYM_MAP
 
@@ -176,28 +175,37 @@ prioritize_entries() {
     if (match(line, /System menu/))  prio = 5
     if (match(line, /Theme menu/))  prio = 6
     if (match(line, /Full screen/))  prio = 7
-    if (match(line, /Close window/))  prio = 8
-    if (match(line, /Toggle window floating/))  prio = 9
-    if (match(line, /Toggle window split/))  prio = 10
-    if (match(line, /Universal/))  prio = 11
-    if (match(line, /Clipboard/))  prio = 12
-    if (match(line, /Emoji picker/))  prio = 13
-    if (match(line, /Color picker/))  prio = 14
-    if (match(line, /Screenshot/))  prio = 15
-    if (match(line, /Screenrecording/))  prio = 16
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 17
-    if (match(line, /Move window to workspace/))  prio = 18
-    if (match(line, /Swap window/))  prio = 19
-    if (match(line, /Move window focus/))  prio = 20
-    if (match(line, /Move window$/))  prio = 21
-    if (match(line, /Resize window/))  prio = 22
-    if (match(line, /Expand window/))  prio = 23
-    if (match(line, /Shrink window/))  prio = 24
-    if (match(line, /scratchpad/))  prio = 25
-    if (match(line, /notification/))  prio = 26
-    if (match(line, /Toggle window transparency/))  prio = 27
-    if (match(line, /Toggle workspace gaps/))  prio = 28
-    if (match(line, /Toggle nightlight/))  prio = 29
+    if (match(line, /Full width/))  prio = 8
+    if (match(line, /Close window/))  prio = 9
+    if (match(line, /Close all windows/))  prio = 10
+    if (match(line, /Lock system/))  prio = 11
+    if (match(line, /Toggle window floating/))  prio = 12
+    if (match(line, /Toggle window split/))  prio = 13
+    if (match(line, /Pop window/))  prio = 14
+    if (match(line, /Universal/))  prio = 15
+    if (match(line, /Clipboard/))  prio = 16
+    if (match(line, /Audio controls/))  prio = 17
+    if (match(line, /Bluetooth controls/))  prio = 18
+    if (match(line, /Wifi controls/))  prio = 19
+    if (match(line, /Emoji picker/))  prio = 20
+    if (match(line, /Color picker/))  prio = 21
+    if (match(line, /Screenshot/))  prio = 22
+    if (match(line, /Screenrecording/))  prio = 23
+    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 24
+    if (match(line, /Move window to workspace/))  prio = 25
+    if (match(line, /Move window silently to workspace/))  prio = 26
+    if (match(line, /Swap window/))  prio = 27
+    if (match(line, /Move window focus/))  prio = 28
+    if (match(line, /Move window$/))  prio = 29
+    if (match(line, /Resize window/))  prio = 30
+    if (match(line, /Expand window/))  prio = 31
+    if (match(line, /Shrink window/))  prio = 32
+    if (match(line, /scratchpad/))  prio = 33
+    if (match(line, /notification/))  prio = 34
+    if (match(line, /Toggle window transparency/))  prio = 35
+    if (match(line, /Toggle workspace gaps/))  prio = 36
+    if (match(line, /Toggle nightlight/))  prio = 37
+    if (match(line, /Toggle locking/))  prio = 38
     if (match(line, /group/))  prio = 94
     if (match(line, /Scroll active workspace/))  prio = 95
     if (match(line, /Cycle to/))  prio = 96

bin/omarchy-migrate

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Run all pending migrations to bring the system in line with the installed version.
+
 # Where we store an empty file for each migration that has already been performed.
 STATE_DIR="$HOME/.local/state/omarchy/migrations"
 mkdir -p "$STATE_DIR"

bin/omarchy-notification-dismiss

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Dismiss a mako notification on the basis of its summary. Used by the first-run notifications to dismiss them after clicking for action.
+
 if (($# == 0)); then
   echo "Usage: omarchy-notification-dismiss <summary>"
   exit 1

bin/omarchy-pkg-add

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Add the named packages to the system if they're missing. Returns false if it couldn't be done.
+
 if omarchy-pkg-missing "$@"; then
   sudo pacman -S --noconfirm --needed "$@" || exit 1
 fi

bin/omarchy-pkg-aur-accessible

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Returns true if the AUR is up and available.
+# Used by omarchy-update-system-pkgs to ensure the AUR is available before updating packages from it.
+
 curl -sf --connect-timeout 30 --retry 3 --retry-delay 3 -A "omarchy-update" \
   "https://aur.archlinux.org/rpc/?v=5&type=info&arg=base" >/dev/null

bin/omarchy-pkg-aur-add

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Add the named packages to the system from the AUR if they're missing. Returns false if it couldn't be done.
+
+if omarchy-pkg-missing "$@"; then
+  yay -S --noconfirm --needed "$@" || exit 1
+fi
+
+for pkg in "$@"; do
+  # Secondary check to handle states where pacman doesn't actually register an error
+  if ! pacman -Q "$pkg" &>/dev/null; then
+    echo -e "\033[31mError: Package '$pkg' did not install\033[0m" >&2
+    exit 1
+  fi
+done
+
+exit 0

bin/omarchy-pkg-aur-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Show a fuzzy-finder TUI for picking new AUR packages to install.
+
 fzf_args=(
   --multi
   --preview 'yay -Siia {1}'

bin/omarchy-pkg-drop

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Remove all the named packages from the system if they're installed (otherwise ignore).
+
 for pkg in "$@"; do
   if pacman -Q "$pkg" &>/dev/null; then
     sudo pacman -Rns --noconfirm "$pkg"

bin/omarchy-pkg-install

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Show a fuzzy-finder TUI for picking new Arch and OPR packages to install.
+
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'

bin/omarchy-pkg-missing

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Returns true if any of the named packages are missing from the system (or false if they're all there).
+
 for pkg in "$@"; do
   if ! pacman -Q "$pkg" &>/dev/null; then
     exit 0

bin/omarchy-pkg-present

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Returns true if all of the named packages are installed on the system (or false if any of them are missing).
+
 for pkg in "$@"; do
   pacman -Q "$pkg" &>/dev/null || exit 1
 done

bin/omarchy-pkg-remove

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Show a fuzzy-finder TUI for picking packages installed on the system to be removed.
+
 fzf_args=(
   --multi
   --preview 'yay -Qi {1}'

bin/omarchy-powerprofiles-list

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Returns a list of all the available power profiles on the system.
+# Used by the Omarchy Menu under Setup > Power Profile.
+
 powerprofilesctl list |
   awk '/^\s*[* ]\s*[a-zA-Z0-9\-]+:$/ { gsub(/^[*[:space:]]+|:$/,""); print }' |
   tac

bin/omarchy-refresh-applications

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Ensure all default .desktop, web apps, and TUIs are installed.
+
 # Copy and sync icon files
 mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
 cp ~/.local/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
@@ -10,8 +12,9 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
-# Refresh the webapps
+# Refresh the webapps and TUIs
 bash $OMARCHY_PATH/install/packaging/icons.sh
 bash $OMARCHY_PATH/install/packaging/webapps.sh
+bash $OMARCHY_PATH/install/packaging/tuis.sh
 
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-chromium

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Refresh the ~/.config/chromium-flags.conf file from the Omarchy defaults.
+
 CONFIG_FILE="$HOME/.config/chromium-flags.conf"
 INSTALL_GOOGLE_ACCOUNTS=false
 

bin/omarchy-refresh-config

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# This script deploys ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z
+# Copies the named config from ~/.local/share/omarchy/config/X/Y/Z -> ~/.config/X/Y/Z.
+# If the config already exists, a backup of the existing will be taken as .bak.TIMESTAMP.
+
 config_file=$1
 
 if [[ -z "$config_file" ]]; then
@@ -9,8 +11,8 @@ if [[ -z "$config_file" ]]; then
 
   Must provide a file path from the .config directory to be refreshed.
   To copy ~/.local/share/omarchy/config/hypr/hyprlock.conf to ~/.config/hypr/hyprlock.conf
-    
-    $0 hypr/hyprlock.conf     
+
+    $0 hypr/hyprlock.conf
 USAGE
   exit 1
 fi

bin/omarchy-refresh-fastfetch

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Overwrite the user config for fastfetch with the Omarchy default.
+
 omarchy-refresh-config fastfetch/config.jsonc

bin/omarchy-refresh-hypridle

@@ -1,4 +1,6 @@
 #!/bin/bash
 
+# Overwrite the user config for hypridle with the Omarchy default and restart the service.
+
 omarchy-refresh-config hypr/hypridle.conf
 omarchy-restart-hypridle

bin/omarchy-refresh-hyprland

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Overwrite all the user configs in ~/.config/hypr with the Omarchy defaults.
+
 omarchy-refresh-config hypr/autostart.conf
 omarchy-refresh-config hypr/bindings.conf
 omarchy-refresh-config hypr/input.conf

bin/omarchy-refresh-hyprlock

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Overwrite the user config for hyprlock with the Omarchy default.
+
 omarchy-refresh-config hypr/hyprlock.conf

bin/omarchy-refresh-hyprsunset

@@ -1,4 +1,6 @@
 #!/bin/bash
 
+# Overwrite the user config for hyprsunset with the Omarchy default and restart the service.
+#
 omarchy-refresh-config hypr/hyprsunset.conf
 omarchy-restart-hyprsunset

bin/omarchy-refresh-limine

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Overwrite the user config for the Limine bootloader and rebuild it.
+
 if [[ -f /boot/EFI/Linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
   echo "Cleanup extra UKI"
   sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
@@ -8,27 +10,7 @@ echo "Resetting limine config"
 
 sudo mv /boot/limine.conf /boot/limine.conf.bak
 
-sudo tee /boot/limine.conf <<EOF >/dev/null
-### Read more at config document: https://github.com/limine-bootloader/limine/blob/trunk/CONFIG.md
-#timeout: 3
-default_entry: 2
-interface_branding: Omarchy Bootloader
-interface_branding_color: 2
-hash_mismatch_panic: no
-
-term_background: 1a1b26
-backdrop: 1a1b26
-
-# Terminal colors (Tokyo Night palette)
-term_palette: 15161e;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;a9b1d6
-term_palette_bright: 414868;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;c0caf5
-
-# Text colors
-term_foreground: c0caf5
-term_foreground_bright: c0caf5
-term_background_bright: 24283b
-
-EOF
+sudo cp ~/.local/share/omarchy/default/limine/limine.conf /boot/limine.conf
 
 sudo limine-update
 sudo limine-snapper-sync

bin/omarchy-refresh-pacman

@@ -1,22 +1,24 @@
 #!/bin/bash
 
+# Overwrite the package configuration for /etc/pacman with the Omarchy default of using its dedicated mirrors and repositories, then update all packages.
+# This is used after switching between Omarchy release channels to ensure the right packages for the right channel are available.
+
 # Take backup of existing files
 sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
 sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
 
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
+channel="${1:-stable}"
 
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
-  echo "Setting channel to edge"
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
-  echo "Setting channel to stable"
+if [[ "$channel" != "stable" && "$channel" != "rc" && "$channel" != "edge" ]]; then
+  echo "Error: Invalid channel '$channel'. Must be one of: stable, rc, edge"
+  exit 1
 fi
 
+echo "Setting channel to $channel"
 echo
 
+sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
+sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist
+
 # Reset all package DBs and then update
 sudo pacman -Syyu --noconfirm

bin/omarchy-refresh-plymouth

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it.
+
 sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy
 

bin/omarchy-refresh-swayosd

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Overwrite the user configs for swayosd (controls on-screen feedback for changing volume/songs etc) with the Omarchy defaults and restart the service.
+
 omarchy-refresh-config swayosd/config.toml
 omarchy-refresh-config swayosd/style.css
 omarchy-restart-swayosd

bin/omarchy-refresh-tmux

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Overwrite the user tmux config with the Omarchy default and reload tmux.
+
+omarchy-refresh-config tmux/tmux.conf
+tmux source-file ~/.config/tmux/tmux.conf

bin/omarchy-refresh-walker

@@ -1,11 +1,21 @@
 #!/bin/bash
 
+# Overwrite the user configs for the Walker application launcher (which also powers the Omarchy Menu) and restart the services.
+
 # Ensure walker is set to autostart
 mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
+cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
+
+# And restarts if it crashes or is killed
+mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
+cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
+
 systemctl --user daemon-reload
 
+# Refresh configs
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
+
+# Restart service
 omarchy-restart-walker

bin/omarchy-refresh-waybar

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Overwrite the user configs for the Waybar menu bar with the Omarchy defaults and restart the service.
+
 omarchy-refresh-config waybar/config.jsonc
 omarchy-refresh-config waybar/style.css
 omarchy-restart-waybar

bin/omarchy-reinstall

@@ -1,33 +1,14 @@
 #!/bin/bash
-
 set -e
 
-if [ "$EUID" -eq 0 ]; then
-  echo "Error: This script should not be run as root"
-  exit 1
-fi
+# Attempt to reinstall all default Omarchy packages and reset all the default configs.
 
-echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All changes to configs will be lost.\n"
+echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All user changes to configs will be lost.\n"
 
 if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
-  echo "Resetting Omarchy repository"
-  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
-  rm -rf $OMARCHY_PATH
-  mv ~/.local/share/omarchy-new $OMARCHY_PATH
+  omarchy-reinstall-git
+  omarchy-reinstall-pkgs
+  omarchy-reinstall-configs
 
-  echo "Reinstalling missing Omarchy packages"
-  mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
-  sudo pacman -Syu --noconfirm --needed "${packages[@]}"
-
-  echo "Resetting all Omarchy configs"
-  cp -R ~/.local/share/omarchy/config/* ~/.config/
-  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
-  echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
-
-  $(bash $OMARCHY_PATH/install/config/theme.sh)
-  $(bash $OMARCHY_PATH/install/config/git.sh)
-
-  omarchy-refresh-limine
-  omarchy-refresh-plymouth
-  omarchy-nvim-setup
+  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
 fi

bin/omarchy-reinstall-configs

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+# Overwrite all user configs with the Omarchy defaults.
+
+if [ "$EUID" -eq 0 ]; then
+  echo "Error: This script should not be run as root"
+  exit 1
+fi
+
+echo "Resetting all Omarchy configs"
+cp -R ~/.local/share/omarchy/config/* ~/.config/
+cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
+
+$(bash $OMARCHY_PATH/install/config/theme.sh)
+
+omarchy-refresh-limine
+omarchy-refresh-plymouth
+omarchy-nvim-setup

bin/omarchy-reinstall-git

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Reinstall the Omarchy configuration directory from the git source.
+
+git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+mv $OMARCHY_PATH ~/.local/share/omarchy-old
+mv ~/.local/share/omarchy-new $OMARCHY_PATH

bin/omarchy-reinstall-pkgs

@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+# Reinstall all default Omarchy packages from the stable channel and downgrade any packages that are too new.
+
+# Set the package repository to the stable mirrors
+omarchy-refresh-pacman
+
+# Downgrade any packages to the stable setup
+sudo pacman -Suu --noconfirm
+
+# Ensure all packages are installed
+mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
+sudo pacman -Syu --noconfirm --needed "${packages[@]}"

bin/omarchy-remove-all

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Remove preinstalled Omarchy applications (web apps, TUIs, and selected packages).
+# This removes all web apps, TUIs, plus specific desktop applications.
+
+if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI wrappers, and desktop applications?"; then
+  echo -e "Removing preinstalled Omarchy applications...\n"
+
+  omarchy-webapp-remove-all
+  omarchy-tui-remove-all
+
+  omarchy-pkg-drop \
+    aether \
+    typora \
+    spotify \
+    libreoffice-fresh \
+    1password-beta \
+    1password-cli \
+    xournalpp \
+    signal-desktop \
+    pinta \
+    obsidian \
+    obs-studio \
+    kdenlive
+fi

bin/omarchy-remove-dev-env

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Remove a development environment that was previously installed via omarchy-install-dev-env.
+# Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>
+
 if [[ -z "$1" ]]; then
   echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>" >&2
   exit 1

bin/omarchy-reset-sudo

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Reset the sudo lockout/faillock for the current user.
+# This clears any failed authentication attempts that may have locked the user out.
+
 # Resetting sudo lockout for user
 su -c "faillock --reset --user $USER"

bin/omarchy-restart-app

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Restart an application by killing it and relaunching via uwsm.
+# Usage: omarchy-restart-app <application-name>
+
 pkill -x $1
 setsid uwsm-app -- $1 >/dev/null 2>&1 &

bin/omarchy-restart-bluetooth

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Unblock and restart the bluetooth service.
+
 echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-btop

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Reload btop configuration (used by the Omarchy theme switching).
+
+pkill -SIGUSR2 btop

bin/omarchy-restart-hyprctl

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Reload hyprland configuration (used by the Omarchy theme switching).
+
+hyprctl reload >/dev/null