Merge pull request #4170 from basecamp/dev

v3.3.2

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

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Set the branch for Omarchy's git repository.
+
+if (($# == 0)); then
+  echo "Usage: omarchy-branch-set [master|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

bin/omarchy-channel-set

@@ -0,0 +1,30 @@
+#!/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]"
+  exit 1
+else
+  channel="$1"
+fi
+
+case "$channel" in
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && 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; ;;
+esac
+
+omarchy-update -y

bin/omarchy-cmd-apple-display-brightness

@@ -1,5 +1,7 @@
 #!/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

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
@@ -12,6 +14,7 @@ if [[ -f "$FIRST_RUN_MODE" ]]; then
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
   bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
+  bash "$OMARCHY_PATH/install/first-run/elephant.sh"
   sudo rm -f /etc/sudoers.d/first-run
 
   bash "$OMARCHY_PATH/install/first-run/welcome.sh"

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

@@ -0,0 +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

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}}"
 
@@ -8,15 +11,17 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-SCOPE=""
+DESKTOP_AUDIO="false"
-AUDIO="false"
+MICROPHONE_AUDIO="false"
 WEBCAM="false"
+STOP_RECORDING="false"
 
 for arg in "$@"; do
   case "$arg" in
-    --with-audio) AUDIO="true" ;;
+    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
+    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    output|region) SCOPE="$arg" ;;
+    --stop-recording) STOP_RECORDING="true"
   esac
 done
 
@@ -57,27 +62,35 @@ start_webcam_overlay() {
 
 start_screenrecording() {
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local audio_devices=""
   local audio_args=""
 
-  # Merge audio tracks into one - separate tracks only play one at a time in most players
+  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
-  [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
 
-  gpu-screen-recorder -w "$@" -f 60 -c mp4 $audio_args -ac aac -o "$filename" &
+  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
+    # Merge audio tracks into one - separate tracks only play one at a time in most players
+    [[ -n "$audio_devices" ]] && audio_devices+="|"
+    audio_devices+="default_input"
+  fi
+
+  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
+
+  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
   toggle_screenrecording_indicator
 }
 
 stop_screenrecording() {
-  pkill -SIGINT -f "gpu-screen-recorder"  # SIGINT required to save video properly
+  pkill -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly
 
   # Wait a maximum of 5 seconds to finish before hard killing
   local count=0
-  while pgrep -f "gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
+  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
     sleep 0.1
     count=$((count + 1))
   done
 
-  if pgrep -f "gpu-screen-recorder" >/dev/null; then
+  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    pkill -9 -f "gpu-screen-recorder"
+    pkill -9 -f "^gpu-screen-recorder"
     cleanup_webcam
     notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
   else
@@ -92,51 +105,19 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; then
-  if pgrep -x slurp >/dev/null; then
+  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    pkill -x slurp 2>/dev/null
-  elif pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "gpu-screen-recorder" >/dev/null; then
     cleanup_webcam
   else
     stop_screenrecording
   fi
-elif [[ "$SCOPE" == "output" ]]; then
+elif [[ "$STOP_RECORDING" == "false" ]]; then
   [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
 
-  if ! output=$(slurp -o -f "%o"); then
+  start_screenrecording || cleanup_webcam
-    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
-    exit 1
-  fi
-
-  if [[ -z "$output" ]]; then
-    notify-send "Error" "Could not detect monitor" -u critical
-    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
-    exit 1
-  fi
-
-  start_screenrecording "$output"
 else
-  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+  exit 1
-
-  scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
-
-  if ! region=$(slurp -f "%wx%h+%x+%y"); then
-    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
-    exit 1
-  fi
-
-  if [[ "$region" =~ ^([0-9]+)x([0-9]+)\+([0-9]+)\+([0-9]+)$ ]]; then
-    w=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[1]} * $scale}")
-    h=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[2]} * $scale}")
-    x=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[3]} * $scale}")
-    y=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[4]} * $scale}")
-    scaled_region="${w}x${h}+${x}+${y}"
-  else
-    scaled_region="$region"
-  fi
-
-  start_screenrecording region -region "$scaled_region"
 fi

bin/omarchy-cmd-screensaver

@@ -1,28 +1,35 @@
 #!/bin/bash
 
+# Run the Omarchy screensaver using random effects from TTE.
+
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "com.omarchy.Screensaver"' >/dev/null 2>&1
+  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 com.omarchy.Screensaver 2>/dev/null
+  pkill -f org.omarchy.screensaver 2>/dev/null
   exit 0
 }
 
+# Exit the screensaver on signals and input from keyboard and mouse
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
+printf '\033]11;rgb:00/00/00\007'  # Set background color to black
+
 hyprctl keyword cursor:invisible true &>/dev/null
 
-while true; do
+tty=$(tty 2>/dev/null)
-  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-  tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c --no-eol \
-    "$effect" &
 
-  while pgrep -x tte >/dev/null; do
+while true; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+  tte -i ~/.config/omarchy/branding/screensaver.txt \
+    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
+    --random-effect --exclude-effects dev_worm \
+    --no-eol --no-restore-cursor &
+
+  while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
+    if read -n1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

@@ -1,5 +1,8 @@
 #!/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.
+
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
 

bin/omarchy-cmd-share

@@ -1,7 +1,9 @@
 #!/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|picture|video]"
+  echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
   exit 1
 fi
 
@@ -9,32 +11,11 @@ MODE="$1"
 shift
 
 if [[ $MODE == "clipboard" ]]; then
-  # Save clipboard content to a temporary text file
   TEMP_FILE=$(mktemp --suffix=.txt)
   wl-paste >"$TEMP_FILE"
   FILES="$TEMP_FILE"
-
-elif [[ $MODE == "picture" ]]; then
-  # Pick the most recent image from ~/Pictures
-  LAST_PICTURE=$(find "$HOME/Pictures" -maxdepth 1 -type f \( -iname "*.png" -o -iname "*.jpg" -o -iname "*.jpeg" \) -printf "%T@ %p\n" 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-)
-  if [[ -z "$LAST_PICTURE" ]]; then
-    echo "No .png/.jpg found in ~/Pictures"
-    exit 1
-  fi
-  FILES="$LAST_PICTURE"
-
-elif [[ $MODE == "video" ]]; then
-  # Pick the most recent .mp4 video from ~/Videos
-  LAST_VIDEO=$(find "$HOME/Videos" -maxdepth 1 -type f -iname "*.mp4" -printf "%T@ %p\n" 2>/dev/null | sort -nr | head -n 1 | cut -d' ' -f2-)
-  if [[ -z "$LAST_VIDEO" ]]; then
-    echo "No .mp4 found in ~/Videos"
-    exit 1
-  fi
-  FILES="$LAST_VIDEO"
-
 else
   if (($# > 0)); then
-    # Use files/folders provided as arguments
     FILES="$*"
   else
     if [[ $MODE == "folder" ]]; then

bin/omarchy-cmd-shutdown

@@ -0,0 +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

bin/omarchy-cmd-terminal-cwd

@@ -1,13 +1,18 @@
 #!/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)
 
 if [[ -n $shell_pid ]]; then
   cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
+  shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
 
-  if [[ -d $cwd ]]; then
+  # Check if $shell is a valid shell and $cwd is a directory.
+  if grep -qs "$shell" /etc/shells && [[ -d $cwd ]]; then
     echo "$cwd"
   else
     echo "$HOME"

bin/omarchy-debug

@@ -1,7 +1,36 @@
 #!/bin/bash
 
+# Return exhaustive debugging information about the system to help diagnose problems.
+
+NO_SUDO=false
+PRINT_ONLY=false
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --no-sudo)
+      NO_SUDO=true
+      shift
+      ;;
+    --print)
+      PRINT_ONLY=true
+      shift
+      ;;
+    *)
+      echo "Unknown option: $1"
+      echo "Usage: omarchy-debug [--no-sudo] [--print]"
+      exit 1
+      ;;
+  esac
+done
+
 LOG_FILE="/tmp/omarchy-debug.log"
 
+if [ "$NO_SUDO" = true ]; then
+  DMESG_OUTPUT="(skipped - --no-sudo flag used)"
+else
+  DMESG_OUTPUT="$(sudo dmesg)"
+fi
+
 cat > "$LOG_FILE" <<EOF
 Date: $(date)
 Hostname: $(hostname)
@@ -15,7 +44,7 @@ $(inxi -Farz)
 =========================================
 DMESG
 =========================================
-$(sudo dmesg)
+$DMESG_OUTPUT
 
 =========================================
 JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
@@ -28,6 +57,11 @@ INSTALLED PACKAGES
 $({ expac -S '%n %v (%r)' $(pacman -Qqe) 2>/dev/null; comm -13 <(pacman -Sql | sort) <(pacman -Qqe | sort) | xargs -r expac -Q '%n %v (AUR)'; } | sort)
 EOF
 
+if [ "$PRINT_ONLY" = true ]; then
+  cat "$LOG_FILE"
+  exit 0
+fi
+
 OPTIONS=("View log" "Save in current directory")
 if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
   OPTIONS=("Upload log" "${OPTIONS[@]}")

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
@@ -28,7 +31,6 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
 
     omarchy-restart-waybar
     omarchy-restart-swayosd
-    omarchy-restart-walker
 
     if pgrep -x ghostty; then
       notify-send "    You must restart Ghostty to see font change"

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,70 @@
+#!/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
+
+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
+
+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
+
+# Configure suspend-then-hibernate
+echo "Configuring suspend-then-hibernate"
+sudo mkdir -p /etc/systemd/logind.conf.d /etc/systemd/sleep.conf.d
+sudo cp "$OMARCHY_PATH/default/systemd/lid.conf" /etc/systemd/logind.conf.d/
+sudo cp "$OMARCHY_PATH/default/systemd/hibernate.conf" /etc/systemd/sleep.conf.d/
+
+# Regenerate initramfs
+echo "Regenerating initramfs..."
+sudo limine-mkinitcpio
+
+echo "Hibernation enabled"

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-hyprland-window-pop

@@ -2,21 +2,45 @@
 
 # Toggle to pop-out a tile to stay fixed on a display basis.
 
-active=$(hyprctl activewindow -j)
+# Usage:
-pinned=$(echo "$active" | jq .pinned)
+# omarchy-hyprland-window-pop [width height [x y]]
-addr=$(echo "$active" | jq -r  ".address")
+#
-[ -z "$addr" ] && { echo "No active window"; exit 0; }
+# Arguments:
+#   width   Optional. Width of the floating window. Default: 1300
+#   height  Optional. Height of the floating window. Default: 900
+#   x       Optional. X position of the window. Must provide both X and Y to take effect.
+#   y       Optional. Y position of the window. Must provide both X and Y to take effect.
+#
+# Behavior:
+#   - If the window is already pinned, it will be unpinned and removed from the pop layer.
+#   - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.
 
-if [ "$pinned" = "true" ]; then
+width=${1:-1300}
+height=${2:-900}
+x=${3:-}
+y=${4:-}
+
+active=$(hyprctl activewindow -j)
+pinned=$(echo "$active" | jq ".pinned")
+addr=$(echo "$active" | jq -r ".address")
+
+if [[ $pinned == "true" ]]; then
   hyprctl -q --batch \
-  "dispatch pin address:$addr;" \
+    "dispatch pin address:$addr;" \
-  "dispatch togglefloating address:$addr;" \
+    "dispatch togglefloating address:$addr;" \
-  "dispatch tagwindow -pop address:$addr;"
+    "dispatch tagwindow -pop address:$addr;"
-else
+elif [[ -n $addr ]]; then
+  hyprctl dispatch togglefloating address:$addr
+  hyprctl dispatch resizeactive exact $width $height address:$addr
+
+  if [[ -n $x && -n $y ]]; then
+    hyprctl dispatch moveactive $x $y address:$addr
+  else
+    hyprctl dispatch centerwindow address:$addr
+  fi
+
   hyprctl -q --batch \
-  "dispatch togglefloating address:$addr;" \
+    "dispatch pin address:$addr;" \
-  "dispatch centerwindow address:$addr;" \
+    "dispatch alterzorder top address:$addr;" \
-  "dispatch pin address:$addr;" \
+    "dispatch tagwindow +pop address:$addr;"
-  "dispatch alterzorder top address:$addr;" \
-  "dispatch tagwindow +pop address:$addr;"
 fi

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
@@ -41,7 +43,7 @@ install_php() {
 
 install_node() {
   echo -e "Installing Node.js...\n"
-  mise use --global node@lts
+  mise use --global node
 }
 
 case "$1" in

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
@@ -12,7 +15,7 @@ if [[ -n "$choices" ]]; then
   for db in $choices; do
     case $db in
     MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres17 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:17 ;;
+    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres18 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:18 ;;
     MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
     Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;

bin/omarchy-install-dropbox

@@ -1,8 +1,10 @@
 #!/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
 
 echo "Starting Dropbox..."
 uwsm-app -- dropbox-cli start &>/dev/null &
-echo "See Dropbox icon behind   hover tray in top right and right-click for setup."
+echo "See Dropbox icon behind  hover tray in top right and right-click for setup."

bin/omarchy-install-steam

@@ -1,5 +1,9 @@
 #!/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"
-sudo pacman -Syu --noconfirm steam
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-tailscale

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Install the Tailscale mesh VPN service, the tsui TUI management app, 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
 

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

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Install support for using Xbox controllers with Steam/RetroArch/etc.
+
+set -e
+
+# Install xpadneo to ensure controllers work out of the box
+sudo pacman -S --noconfirm --needed linux-headers
+yay -S --noconfirm xpadneo-dkms
+
+# Prevent xpad/xpadneo driver conflict
+echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
+echo hid_xpadneo | sudo tee /etc/modules-load.d/xpadneo.conf >/dev/null
+
+# Give user access to game controllers
+sudo usermod -a -G input $USER
+
+# Modules need to be loaded
+gum confirm "Install requires reboot. Ready?" && sudo reboot now

bin/omarchy-launch-about

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Omarchy -e bash -c 'fastfetch; read -n 1 -s'
+# 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

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

bin/omarchy-launch-bluetooth

@@ -0,0 +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,10 +1,15 @@
 #!/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)
 
-if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
+if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
   private_flag="--private-window"
+elif [[ $browser_exec =~ edge ]]; then
+  private_flag="--inprivate"
 else
   private_flag="--incognito"
 fi

bin/omarchy-launch-editor

@@ -1,10 +1,13 @@
 #!/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
-nvim | vim | nano | micro | hx | helix)
+nvim | vim | nano | micro | hx | helix | fresh)
-  exec setsid uwsm-app -- xdg-terminal-exec "$EDITOR" "$@"
+  exec omarchy-launch-tui "$EDITOR" "$@"
   ;;
 *)
   exec setsid uwsm-app -- "$EDITOR" "$@"

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=com.omarchy.Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+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-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
@@ -7,10 +10,10 @@ fi
 
 WINDOW_PATTERN="$1"
 LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
-WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "^$WINDOW_PATTERN$" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
 
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
-  eval exec $LAUNCH_COMMAND
+  eval exec setsid $LAUNCH_COMMAND
 fi

bin/omarchy-launch-or-focus-tui

@@ -0,0 +1,9 @@
+#!/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 $@"
+
+exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"

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,18 +1,23 @@
 #!/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
 fi
 
 # Exit early if screensave is already running
-pgrep -f com.omarchy.Screensaver && exit 0
+pgrep -f org.omarchy.screensaver && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
   exit 1
 fi
 
+# Silently quit Walker on overlay
+walker -q
+
 focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
 terminal=$(xdg-terminal-exec --print-id)
 
@@ -22,20 +27,22 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   case $terminal in
   *Alacritty*)
     hyprctl dispatch exec -- \
-      alacritty --class=com.omarchy.Screensaver \
+      alacritty --class=org.omarchy.screensaver \
       --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
       -e omarchy-cmd-screensaver
     ;;
   *ghostty*)
     hyprctl dispatch exec -- \
-      ghostty --class=com.omarchy.Screensaver \
+      ghostty --class=org.omarchy.screensaver \
+      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
       --font-size=18 \
       -e omarchy-cmd-screensaver
     ;;
   *kitty*)
     hyprctl dispatch exec -- \
-      kitty --class=com.omarchy.Screensaver \
+      kitty --class=org.omarchy.screensaver \
       --override font_size=18 \
+      --override window_padding_width=0 \
       -e omarchy-cmd-screensaver
     ;;
   *)

bin/omarchy-launch-tui

@@ -0,0 +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 runnig 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,3 +1,7 @@
 #!/bin/bash
 
-exec setsid omarchy-launch-or-focus com.omarchy.Impala "uwsm-app -- xdg-terminal-exec --app-id=com.omarchy.Impala -e impala"
+# 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,12 +1,17 @@
 #!/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 &
 
+# Set keyboard layout to default (first layout)
+hyprctl switchxkblayout all 0 > /dev/null 2>&1
+
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
   1password --lock &
 fi
 
 # Avoid running screensaver when locked
-pkill -f com.omarchy.Screensaver
+pkill -f org.omarchy.screensaver

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
@@ -37,7 +39,7 @@ menu() {
 }
 
 terminal() {
-  xdg-terminal-exec --app-id=com.omarchy.Omarchy "$@"
+  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
 }
 
 present_terminal() {
@@ -112,23 +114,21 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio\n  Display + Webcam") in
+  omarchy-cmd-screenrecord --stop-recording && exit 0
-  *"Region + Audio"*) omarchy-cmd-screenrecord region --with-audio ;;
+
-  *Region*) omarchy-cmd-screenrecord ;;
+  case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
-  *"Display + Audio"*) omarchy-cmd-screenrecord output --with-audio ;;
+  *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
-  *"Display + Webcam"*) omarchy-cmd-screenrecord output --with-audio --with-webcam ;;
+  *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *Display*) omarchy-cmd-screenrecord output ;;
+  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
   *) back_to show_capture_menu ;;
   esac
 }
 
 show_share_menu() {
-  case $(menu "Share" "  Clipboard\n  File\n  Folder\n  Latest Picture\n  Latest Video") in
+  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
   *Clipboard*) omarchy-cmd-share clipboard ;;
   *File*) terminal bash -c "omarchy-cmd-share file" ;;
   *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
-  *Picture*) omarchy-cmd-share picture ;;
-  *Video*) omarchy-cmd-share video ;;
   *) back_to show_trigger_menu ;;
   esac
 }
@@ -156,12 +156,7 @@ show_style_menu() {
 }
 
 show_theme_menu() {
-  theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
+  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    back_to show_style_menu
-  else
-    omarchy-theme-set "$theme"
-  fi
 }
 
 show_font_menu() {
@@ -174,26 +169,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*) xdg-terminal-exec --app-id=com.omarchy.Wiremix -e wiremix ;;
+  *Audio*) omarchy-launch-audio ;;
-  *Wifi*)
+  *Wifi*) omarchy-launch-wifi ;;
-    rfkill unblock wifi
+  *Bluetooth*) omarchy-launch-bluetooth ;;
-    omarchy-launch-wifi
-    ;;
-  *Bluetooth*)
-    rfkill unblock bluetooth
-    blueberry
-    ;;
   *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 ;;
@@ -211,8 +200,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 ;;
@@ -221,14 +219,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() {
+show_setup_system_menu() {
-  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
+  local options=""
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
+  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
 }
@@ -265,7 +278,7 @@ show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
+  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
@@ -289,24 +302,26 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  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*) install "Copilot CLI" "github-copilot-cli" ;;
   *Cursor*) install "Cursor CLI" "cursor-cli" ;;
-  *OpenAI*) install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
+  *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *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 ;;
   *) show_install_menu ;;
   esac
 }
@@ -314,18 +329,19 @@ show_install_gaming_menu() {
 show_install_style_menu() {
   case $(menu "Install" "󰸌  Theme\n  Background\n  Font") in
   *Theme*) present_terminal omarchy-theme-install ;;
-  *Background*) nautilus ~/.config/omarchy/current/theme/backgrounds ;;
+  *Background*) omarchy-theme-bg-install ;;
   *Font*) show_install_font_menu ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "--width 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
   *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
   *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
   *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
   *Bistream*) install_font "Bistream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera Nerd Font" ;;
+  *Iosevka*) install_font "Iosevka" "ttf-iosevka-nerd" "Iosevka Nerd Font Mono" ;;
   *) show_install_menu ;;
   esac
 }
@@ -376,10 +392,12 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\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 ;;
+  *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" ;;
@@ -388,9 +406,54 @@ show_remove_menu() {
   esac
 }
 
+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
+  *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
+  *JavaScript*) show_remove_javascript_menu ;;
+  *Go*) present_terminal "omarchy-remove-dev-env go" ;;
+  *PHP*) show_remove_php_menu ;;
+  *Python*) present_terminal "omarchy-remove-dev-env python" ;;
+  *Elixir*) show_remove_elixir_menu ;;
+  *Zig*) present_terminal "omarchy-remove-dev-env zig" ;;
+  *Rust*) present_terminal "omarchy-remove-dev-env rust" ;;
+  *Java*) present_terminal "omarchy-remove-dev-env java" ;;
+  *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
+  *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
+  *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
+  *) show_remove_menu ;;
+  esac
+}
+
+show_remove_javascript_menu() {
+  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" ;;
+  *) show_remove_development_menu ;;
+  esac
+}
+
+show_remove_php_menu() {
+  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" ;;
+  *) show_remove_development_menu ;;
+  esac
+}
+
+show_remove_elixir_menu() {
+  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 ;;
+  esac
+}
+
 show_update_menu() {
-  case $(menu "Update" " Omarchy\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 ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
@@ -403,6 +466,14 @@ show_update_menu() {
   esac
 }
 
+show_update_channel_menu() {
+  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
+  *Stable*) present_terminal "omarchy-channel-set stable" ;;
+  *Edge*) present_terminal "omarchy-channel-set edge" ;;
+  *Dev*) present_terminal "omarchy-channel-set dev" ;;
+  *) show_update_menu ;;
+  esac
+}
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
   *Hypridle*) omarchy-restart-hypridle ;;
@@ -446,12 +517,18 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\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 ;;
-  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
+  *Hibernate*) systemctl hibernate ;;
-  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
+  *Restart*) omarchy-cmd-reboot ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }
@@ -480,6 +557,10 @@ go_to_menu() {
   esac
 }
 
+# Allow user extensions and overrides
+USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
+[[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
+
 if [[ -n "$1" ]]; then
   BACK_TO_EXIT=true
   go_to_menu "$1"

bin/omarchy-menu-keybindings

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# A script to display Hyprland keybindings defined in your configuration
+# Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.
-# 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, /Full width/))  prio = 8
-    if (match(line, /Toggle window floating/))  prio = 9
+    if (match(line, /Close window/))  prio = 9
-    if (match(line, /Toggle window split/))  prio = 10
+    if (match(line, /Close all windows/))  prio = 10
-    if (match(line, /Universal/))  prio = 11
+    if (match(line, /Lock system/))  prio = 11
-    if (match(line, /Clipboard/))  prio = 12
+    if (match(line, /Toggle window floating/))  prio = 12
-    if (match(line, /Emoji picker/))  prio = 13
+    if (match(line, /Toggle window split/))  prio = 13
-    if (match(line, /Color picker/))  prio = 14
+    if (match(line, /Pop window/))  prio = 14
-    if (match(line, /Screenshot/))  prio = 15
+    if (match(line, /Universal/))  prio = 15
-    if (match(line, /Screenrecording/))  prio = 16
+    if (match(line, /Clipboard/))  prio = 16
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 17
+    if (match(line, /Audio controls/))  prio = 17
-    if (match(line, /Move window to workspace/))  prio = 18
+    if (match(line, /Bluetooth controls/))  prio = 18
-    if (match(line, /Swap window/))  prio = 19
+    if (match(line, /Wifi controls/))  prio = 19
-    if (match(line, /Move window focus/))  prio = 20
+    if (match(line, /Emoji picker/))  prio = 20
-    if (match(line, /Move window$/))  prio = 21
+    if (match(line, /Color picker/))  prio = 21
-    if (match(line, /Resize window/))  prio = 22
+    if (match(line, /Screenshot/))  prio = 22
-    if (match(line, /Expand window/))  prio = 23
+    if (match(line, /Screenrecording/))  prio = 23
-    if (match(line, /Shrink window/))  prio = 24
+    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 24
-    if (match(line, /scratchpad/))  prio = 25
+    if (match(line, /Move window to workspace/))  prio = 25
-    if (match(line, /notification/))  prio = 26
+    if (match(line, /Move window silently to workspace/))  prio = 26
-    if (match(line, /Toggle window transparency/))  prio = 27
+    if (match(line, /Swap window/))  prio = 27
-    if (match(line, /Toggle workspace gaps/))  prio = 28
+    if (match(line, /Move window focus/))  prio = 28
-    if (match(line, /Toggle nightlight/))  prio = 29
+    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
@@ -212,18 +220,26 @@ prioritize_entries() {
   cut -f2-
 }
 
-monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
+output_keybindings() {
-menu_height=$((monitor_height * 40 / 100))
+  build_keymap_cache
 
-build_keymap_cache
+  {
+    dynamic_bindings
+    static_bindings
+  } |
+    sort -u |
+    parse_keycodes |
+    parse_bindings |
+    prioritize_entries
+}
 
-{
+if [[ "$1" == "--print" || "$1" == "-p" ]]; then
-  dynamic_bindings
+  output_keybindings
-  static_bindings
+else
-} |
+  monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
-  sort -u |
+  menu_height=$((monitor_height * 40 / 100))
-  parse_keycodes |
+
-  parse_bindings |
+  output_keybindings |
-  prioritize_entries |
+    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
-  walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
+fi
 

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-ignored

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
-
-if [[ -f $IGNORED_PACKAGES_FILE ]]; then
-  tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
-fi

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-pinned

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-PINNED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.pinned"
-
-if [[ -f $PINNED_PACKAGES_FILE ]]; then
-  tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//'
-fi

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,4 +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 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

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Refresh the ~/.config/chromium-flags.conf file from the Omarchy defaults.
+
+CONFIG_FILE="$HOME/.config/chromium-flags.conf"
+INSTALL_GOOGLE_ACCOUNTS=false
+
+# Check if google accounts were installed
+if [[ -f "$CONFIG_FILE" ]] && \
+  grep -q -- "--oauth2-client-id" "$CONFIG_FILE" && \
+  grep -q -- "--oauth2-client-secret" "$CONFIG_FILE"; then
+  INSTALL_GOOGLE_ACCOUNTS=true
+fi
+
+# Refresh the Chromium configuration
+omarchy-refresh-config chromium-flags.conf
+
+# Re-install Google accounts if previously configured
+if [[ "$INSTALL_GOOGLE_ACCOUNTS" == true ]]; then
+  omarchy-install-chromium-google-account
+fi

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,6 +1,8 @@
 #!/bin/bash
 
-if [[ -f /boot/EFI/linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
+# 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
 fi
@@ -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
+sudo cp ~/.local/share/omarchy/default/limine/limine.conf /boot/limine.conf
-### 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 limine-update
 sudo limine-snapper-sync

bin/omarchy-refresh-pacman

@@ -0,0 +1,23 @@
+#!/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
+
+if [[ $1 == "edge" ]]; then
+  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
+  echo "Setting channel to edge"
+else
+  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf
+  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
+  echo "Setting channel to stable"
+fi
+
+echo
+
+# Reset all package DBs and then update
+sudo pacman -Syyu --noconfirm

bin/omarchy-refresh-pacman-mirrorlist

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-fi

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-walker

@@ -1,5 +1,12 @@
 #!/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/default/walker/walker.desktop ~/.config/autostart/
+systemctl --user daemon-reload
+
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml

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
+# Attempt to reinstall all default Omarchy packages and reset all the default configs.
-  echo "Error: This script should not be run as root"
-  exit 1
-fi
 
-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"
+  omarchy-reinstall-git
-  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+  omarchy-reinstall-pkgs
-  rm -rf $OMARCHY_PATH
+  omarchy-reinstall-configs
-  mv ~/.local/share/omarchy-new $OMARCHY_PATH
 
-  echo "Reinstalling missing Omarchy packages"
+  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
-  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
 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-dev-env

@@ -0,0 +1,102 @@
+#!/bin/bash
+
+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
+fi
+
+remove_php() {
+  sudo pacman -Rns --noconfirm php composer php-sqlite xdebug 2>/dev/null || true
+}
+
+case "$1" in
+ruby)
+  echo -e "Removing Ruby...\n"
+  mise uninstall ruby --all
+  mise rm -g ruby
+  rm -f ~/.gemrc
+  ;;
+node)
+  echo -e "Removing Node.js...\n"
+  mise uninstall node --all
+  mise rm -g node
+  ;;
+bun)
+  echo -e "Removing Bun...\n"
+  mise uninstall bun --all
+  mise rm -g bun
+  ;;
+deno)
+  echo -e "Removing Deno...\n"
+  mise uninstall deno --all
+  mise rm -g deno
+  ;;
+go)
+  echo -e "Removing Go...\n"
+  mise uninstall go --all
+  mise rm -g go
+  ;;
+php)
+  echo -e "Removing PHP...\n"
+  remove_php
+  ;;
+laravel)
+  echo -e "Removing Laravel...\n"
+  composer global remove laravel/installer 2>/dev/null || true
+  ;;
+symfony)
+  echo -e "Removing Symfony CLI...\n"
+  sudo pacman -Rns --noconfirm symfony-cli 2>/dev/null || true
+  ;;
+python)
+  echo -e "Removing Python...\n"
+  mise uninstall python --all
+  mise rm -g python
+  rm -rf ~/.local/bin/uv ~/.local/bin/uvx ~/.cargo/bin/uv 2>/dev/null || true
+  ;;
+elixir|phoenix)
+  echo -e "Removing Elixir/Erlang...\n"
+  mise uninstall elixir --all
+  mise uninstall erlang --all
+  mise rm -g elixir
+  mise rm -g erlang
+  ;;
+zig)
+  echo -e "Removing Zig...\n"
+  mise uninstall zig --all
+  mise uninstall zls --all
+  mise rm -g zig
+  mise rm -g zls
+  ;;
+rust)
+  echo -e "Removing Rust...\n"
+  rustup self uninstall -y 2>/dev/null || true
+  ;;
+java)
+  echo -e "Removing Java...\n"
+  mise uninstall java --all
+  mise rm -g java
+  ;;
+dotnet)
+  echo -e "Removing .NET...\n"
+  mise uninstall dotnet --all
+  mise rm -g dotnet
+  ;;
+ocaml)
+  echo -e "Removing OCaml...\n"
+  opam switch remove default -y 2>/dev/null || true
+  rm -rf ~/.opam 2>/dev/null || true
+  sudo rm -f /usr/local/bin/opam 2>/dev/null || true
+  ;;
+clojure)
+  echo -e "Removing Clojure...\n"
+  mise uninstall clojure --all
+  mise rm -g clojure
+  ;;
+*)
+  echo "Unknown environment: $1"
+  exit 1
+  ;;
+esac
+
+echo -e "\nDone!"

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

bin/omarchy-restart-mako

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Reload mako configuration (used by the Omarchy theme switching).
+
+makoctl reload

bin/omarchy-restart-opencode

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

bin/omarchy-restart-terminal

@@ -4,10 +4,10 @@ if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
   touch ~/.config/alacritty/alacritty.toml
 fi
 
-if pgrep -x kitty; then
+if pgrep -x kitty >/dev/null; then
-  killall -SIGUSR1 kitty
+  killall -SIGUSR1 kitty >/dev/null
 fi
 
-if pgrep -x ghostty; then
+if pgrep -x ghostty >/dev/null; then
   killall -SIGUSR2 ghostty
 fi

bin/omarchy-restart-walker

@@ -1,22 +1,22 @@
 #!/bin/bash
 
-pkill elephant
+restart_services() {
-pkill walker
+  if systemctl --user is-enabled elephant.service &>/dev/null; then
+    systemctl --user restart elephant.service
+  fi
+
+  if systemctl --user is-enabled app-walker@autostart.service &>/dev/null; then
+    systemctl --user restart app-walker@autostart.service
+  else
+    echo -e "\e[31mUnable to restart Walker -- RESTART MANUALLY\e[0m"
+  fi
+}
 
-# Detect if we're running as root (from pacman hook)
 if [[ $EUID -eq 0 ]]; then
-  # Get the owner of this script to determine which user to run as
   SCRIPT_OWNER=$(stat -c '%U' "$0")
   USER_UID=$(id -u "$SCRIPT_OWNER")
-
-  # Restart services as the script owner
   systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
-    bash -c "
+    bash -c "$(declare -f restart_services); restart_services"
-      setsid uwsm-app -- elephant &
-      setsid uwsm-app -- walker --gapplication-service &
-    "
 else
-  setsid uwsm-app -- elephant &
+  restart_services
-  wait 2
-  setsid uwsm-app -- walker --gapplication-service &
 fi

bin/omarchy-setup-fingerprint

@@ -20,7 +20,11 @@ print_info() {
 }
 
 check_fingerprint_hardware() {
-  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity|FPC'; then
+  # Get fingerprint devices for the user
+  devices=$(fprintd-list "$USER" 2>/dev/null)
+
+  # Exit if no devices found
+  if [[ -z "$devices" ]]; then
     print_error "\nNo fingerprint sensor detected."
     return 1
   fi

bin/omarchy-theme-bg-install

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+CURRENT_THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name")
+THEME_USER_BACKGROUNDS="$HOME/.config/omarchy/backgrounds/$CURRENT_THEME_NAME"
+
+mkdir -p "$THEME_USER_BACKGROUNDS"
+nautilus "$THEME_USER_BACKGROUNDS"

bin/omarchy-theme-bg-next

@@ -2,10 +2,12 @@
 
 # Cycles through the background images available
 
-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+THEME_NAME=$(cat "$HOME/.config/omarchy/current/theme.name" 2>/dev/null)
+THEME_BACKGROUNDS_PATH="$HOME/.config/omarchy/current/theme/backgrounds/"
+USER_BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find -L "$USER_BACKGROUNDS_PATH" "$THEME_BACKGROUNDS_PATH" -maxdepth 1 -type f -print0 2>/dev/null | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 if [[ $TOTAL -eq 0 ]]; then