Revert "Fix typo in font (#5556)"

This reverts commit 7a342f9bfe.

AGENTS.md

@@ -6,15 +6,10 @@
 - Prefer `(( ))` over numeric operators inside `[[ ]]` (e.g., `(( count < 50 ))`, not `[[ $count -lt 50 ]]`)
 - For strings/paths with spaces, quote them instead of escaping spaces with `\ ` (e.g., `"$APP_DIR/Disk Usage.desktop"`, not `$APP_DIR/Disk\ Usage.desktop`)
 - Shebangs must use `#!/bin/bash` consistently (never `#!/usr/bin/env bash`)
-- Scripts under `install/` and `migrations/` may be sourced and intentionally omit shebangs
 
 # Command Naming
 
-All commands start with `omarchy-`. Prefixes indicate purpose.
-
-The authoritative command group list lives in `bin/omarchy` in `GROUP_DESCRIPTIONS`. Keep `GROUP_DESCRIPTIONS` updated when adding a new command prefix.
-
-Common prefixes include:
+All commands start with `omarchy-`. Prefixes indicate purpose:
 
 - `cmd-` - check if commands exist, misc utility commands
 - `capture-` - screenshots, screen recordings, and other capture tools
@@ -29,52 +24,6 @@ Common prefixes include:
 - `theme-` - theme management
 - `update-` - update components
 
-Other current prefixes include:
-
-- `ac-`, `audio-`, `battery-`, `branch-`, `brightness-`, `channel-`, `config-`, `debug-`, `dev-`, `drive-`, `first-`, `font-`, `haptic-`, `hibernation-`, `hook-`, `hyprland-`, `menu-`, `migrate-`, `notification-`, `npx-`, `plymouth-`, `powerprofiles-`, `reinstall-`, `remove-`, `screensaver-`, `show-`, `snapshot-`, `state-`, `sudo-`, `swayosd-`, `system-`, `transcode-`, `tui-`, `tz-`, `upload-`, `version-`, `voxtype-`, `webapp-`, `wifi-`, `windows-`
-
-# Command Metadata
-
-Commands in `bin/` can declare CLI metadata in comments near the top of the file. `bin/omarchy` scans the first 80 lines, and tests expect command metadata to remain valid.
-
-Supported metadata keys:
-
-- `# omarchy:summary=...` - short help text
-- `# omarchy:group=...` - command group when it differs from the filename-derived prefix
-- `# omarchy:name=...` - command name within the group
-- `# omarchy:args=...` - usage arguments
-- `# omarchy:examples=...` - examples separated with ` | `
-- `# omarchy:alias=...` / `# omarchy:aliases=...` - alternate routes
-- `# omarchy:hidden=true` - hide from default command listings
-- `# omarchy:requires-sudo=true` - mark commands that require sudo
-
-Prefer explicit metadata for user-facing commands. Keep routes consistent with the filename unless there is a deliberate alias or compatibility route.
-
-Example:
-
-```bash
-# omarchy:summary=Take a screenshot
-# omarchy:group=capture
-# omarchy:args=[smart|region|windows|fullscreen] [slurp|copy]
-# omarchy:examples=omarchy screenshot | omarchy capture screenshot region
-# omarchy:aliases=omarchy screenshot
-```
-
-# Install Scripts
-
-Install entry points (`install.sh`, `boot.sh`) use `#!/bin/bash`. Many scripts under `install/` are sourced via `run_logged` and intentionally do not have shebangs.
-
-Install stage files follow this pattern:
-
-- `install/*/all.sh` lists scripts in execution order
-- leaf scripts are sourced by `run_logged $OMARCHY_INSTALL/path/to/script.sh`
-- avoid `exit` in sourced install scripts unless intentionally aborting the install
-- use `$OMARCHY_INSTALL` and `$OMARCHY_PATH` instead of hard-coded Omarchy paths
-- keep hardware-specific logic under `install/config/hardware/`
-- prefer helper commands for package and command checks where available
-
-Raw `command -v`, `pacman`, and `pacman-key` are acceptable in bootstrap/preflight/package-helper contexts where the helper commands may not be available yet or where direct package-manager behavior is the point of the script.
-
 # Helper Commands
 
 Use these instead of raw shell commands:
@@ -84,18 +33,12 @@ Use these instead of raw shell commands:
 - `omarchy-pkg-add` - install packages (handles both pacman and AUR)
 - `omarchy-hw-asus-rog` - detect ASUS ROG hardware (and similar `hw-*` commands)
 
-Exceptions are allowed for bootstrap, preflight, migration, and package-helper scripts where the helper may not be available yet, where the helper itself is being implemented, or where direct package-manager behavior is required.
-
 # 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)
 
-# Visual Changes
-
-When making visual changes, such as Waybar styles or desktop appearance, always take and analyze a screenshot after applying the change to verify the result. Use `omarchy capture screenshot fullscreen save` for fullscreen screenshots.
-
 # Refresh Pattern
 
 To copy a default config to user config with automatic backup:
@@ -110,16 +53,10 @@ This copies `~/.local/share/omarchy/config/hypr/hyprlock.conf` to `~/.config/hyp
 
 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.
 
-New migration format:
-- File permissions must be `0644` (`-rw-r--r--`); migrations are sourced, not executed directly
+Migration format:
 - No shebang line
 - Start with an `echo` describing what the migration does
 - Use `$OMARCHY_PATH` to reference the omarchy directory
-- Prefer helper commands such as `omarchy-cmd-present`, `omarchy-cmd-missing`, `omarchy-pkg-present`, and `omarchy-pkg-missing`
-
-Some older migrations predate these rules. Do not copy older migrations that start with shebangs, omit the leading `echo`, or hard-code `~/.local/share/omarchy`.
-
-Migrations may use raw `pacman`, `command -v`, or direct config edits when needed for historical compatibility or one-off repair work.
 
 Example:
 ```bash

applications/hidden/foot-server.desktop

@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true

applications/hidden/footclient.desktop

@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true

bin/omarchy

@@ -17,7 +17,6 @@ declare -A COMMAND_USAGE
 declare -A COMMAND_ARGS
 declare -A COMMAND_EXAMPLES
 declare -A COMMAND_REQUIRES_SUDO
-declare -A COMMAND_HIDDEN
 declare -A COMMAND_ALIASES
 declare -A COMMAND_HAS_SUMMARY
 declare -A COMMAND_METADATA_ERRORS
@@ -29,14 +28,12 @@ declare -A GROUP_DESCRIPTIONS
 GROUP_DESCRIPTIONS[ac]="AC power detection"
 GROUP_DESCRIPTIONS[battery]="Battery status helpers"
 GROUP_DESCRIPTIONS[branch]="Omarchy git branch management"
-GROUP_DESCRIPTIONS[branding]="About and screensaver branding"
 GROUP_DESCRIPTIONS[brightness]="Display and keyboard brightness"
 GROUP_DESCRIPTIONS[capture]="Screenshots and screen recording"
 GROUP_DESCRIPTIONS[channel]="Omarchy release channel management"
 GROUP_DESCRIPTIONS[cmd]="Command and shortcut helpers"
 GROUP_DESCRIPTIONS[config]="System configuration helpers"
 GROUP_DESCRIPTIONS[debug]="Diagnostics and support logs"
-GROUP_DESCRIPTIONS[default]="Default application selection"
 GROUP_DESCRIPTIONS[dev]="Omarchy development tools"
 GROUP_DESCRIPTIONS[drive]="Drive selection and encryption"
 GROUP_DESCRIPTIONS[font]="Font management"
@@ -55,24 +52,23 @@ GROUP_DESCRIPTIONS[plymouth]="Plymouth boot theme management"
 GROUP_DESCRIPTIONS[powerprofiles]="Power profile management"
 GROUP_DESCRIPTIONS[refresh]="Reset config to defaults"
 GROUP_DESCRIPTIONS[reinstall]="Reinstall and reset workflows"
-GROUP_DESCRIPTIONS[reminder]="Desktop notification reminders"
 GROUP_DESCRIPTIONS[remove]="Removal workflows"
 GROUP_DESCRIPTIONS[restart]="Restart Omarchy components"
 GROUP_DESCRIPTIONS[setup]="Interactive setup wizards"
-GROUP_DESCRIPTIONS[screensaver]="Screensaver branding and animation"
+GROUP_DESCRIPTIONS[share]="Share clipboard, files, and folders"
 GROUP_DESCRIPTIONS[snapshot]="System snapshots"
+GROUP_DESCRIPTIONS[state]="Persistent Omarchy state"
 GROUP_DESCRIPTIONS[sudo]="Sudo configuration helpers"
 GROUP_DESCRIPTIONS[swayosd]="SwayOSD status display helpers"
 GROUP_DESCRIPTIONS[system]="Reboot, shutdown, logout, and lock"
 GROUP_DESCRIPTIONS[theme]="Theme management"
 GROUP_DESCRIPTIONS[toggle]="Toggle Omarchy features"
-GROUP_DESCRIPTIONS[transcode]="Image and video transcoding"
 GROUP_DESCRIPTIONS[tui]="Terminal UI launchers"
 GROUP_DESCRIPTIONS[tz]="Timezone selection"
 GROUP_DESCRIPTIONS[update]="Omarchy and system updates"
+GROUP_DESCRIPTIONS[upload]="Upload helpers"
 GROUP_DESCRIPTIONS[version]="Version and channel information"
 GROUP_DESCRIPTIONS[voxtype]="Voxtype dictation"
-GROUP_DESCRIPTIONS[weather]="Weather status"
 GROUP_DESCRIPTIONS[webapp]="Web app launchers"
 GROUP_DESCRIPTIONS[wifi]="Wi-Fi helpers"
 GROUP_DESCRIPTIONS[windows]="Windows VM management"
@@ -134,7 +130,6 @@ register_command() {
   local examples=""
   local aliases=""
   local requires_sudo=""
-  local hidden=""
   local line=""
   local metadata_key=""
   local metadata_value=""
@@ -190,10 +185,6 @@ register_command() {
         requires_sudo="$metadata_value"
         [[ $metadata_value == "true" ]] || metadata_errors=$(append_pipe_value "$metadata_errors" "requires-sudo must be omitted or true")
         ;;
-      hidden)
-        hidden="$metadata_value"
-        [[ $metadata_value == "true" ]] || metadata_errors=$(append_pipe_value "$metadata_errors" "hidden must be omitted or true")
-        ;;
       *)
         ;;
       esac
@@ -237,7 +228,6 @@ register_command() {
   fi
 
   [[ $requires_sudo == "true" ]] || requires_sudo="false"
-  [[ $hidden == "true" ]] || hidden="false"
 
   local key="$file_binary"
   COMMAND_KEYS+=("$key")
@@ -251,7 +241,6 @@ register_command() {
   COMMAND_ARGS["$key"]="$args"
   COMMAND_EXAMPLES["$key"]="$examples"
   COMMAND_REQUIRES_SUDO["$key"]="$requires_sudo"
-  COMMAND_HIDDEN["$key"]="$hidden"
   COMMAND_HAS_SUMMARY["$key"]="$has_summary"
   COMMAND_METADATA_ERRORS["$key"]="$metadata_errors"
 
@@ -331,6 +320,19 @@ command_requires_args() {
   [[ -n $required ]]
 }
 
+load_group_extra_commands() {
+  local group="$1"
+
+  case "$group" in
+  install)
+    load_command_by_binary omarchy-pkg-add
+    ;;
+  system)
+    load_command_by_binary omarchy-lock-screen
+    ;;
+  esac
+}
+
 load_group_commands() {
   local group="$1"
   local file=""
@@ -344,6 +346,7 @@ load_group_commands() {
     register_command "$file"
   done
 
+  load_group_extra_commands "$group"
 }
 
 resolve_direct_route() {
@@ -376,9 +379,6 @@ sorted_keys() {
   local key=""
 
   for key in "${COMMAND_KEYS[@]}"; do
-    if [[ $include_all != "true" && ${COMMAND_HIDDEN[$key]} == "true" ]]; then
-      continue
-    fi
     printf '%s\t%s\n' "${COMMAND_ROUTE[$key]}" "$key"
   done | sort -u | cut -f2-
 }
@@ -422,10 +422,6 @@ sorted_group_keys() {
   local route=""
 
   for key in "${COMMAND_KEYS[@]}"; do
-    if [[ $include_all != "true" && ${COMMAND_HIDDEN[$key]} == "true" ]]; then
-      continue
-    fi
-
     fallback_group=$(fallback_group_for_key "$key")
     if [[ ${COMMAND_GROUP[$key]} != "$group" && $fallback_group != "$group" ]]; then
       continue
@@ -503,6 +499,8 @@ Discovery:
   omarchy commands --all      Include commands explicitly marked hidden
   omarchy commands --json     Machine-readable command list
   omarchy commands --check    Validate command metadata and routes
+  omarchy dev benchmark       Measure CLI response times
+  omarchy dev bin metadata    Show bin metadata fields and defaults
 EOF
 }
 
@@ -514,7 +512,7 @@ Usage:
 List commands known to the Omarchy command center.
 
 Options:
-  --all       Include commands explicitly marked hidden
+  --all       Accepted for compatibility
   --json      Emit machine-readable JSON
   --markdown  Emit a Markdown command table
   --check     Validate command metadata and route collisions
@@ -566,9 +564,6 @@ show_commands() {
 
   for route in "${!ROUTE_IS_ALIAS[@]}"; do
     key="${ROUTE_TO_KEY[$route]}"
-    if [[ $include_all != "true" && ${COMMAND_HIDDEN[$key]} == "true" ]]; then
-      continue
-    fi
     alias_rows+="$route"$'\t'"${COMMAND_ROUTE[$key]}"$'\n'
   done
 
@@ -607,14 +602,13 @@ emit_command_records() {
 
   while IFS= read -r key; do
     [[ -n $key ]] || continue
-    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
+    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
       "${COMMAND_ROUTE[$key]}" \
       "${COMMAND_BINARY[$key]}" \
       "${COMMAND_GROUP[$key]}" \
       "${COMMAND_NAME[$key]}" \
       "${COMMAND_SUMMARY[$key]}" \
       "${COMMAND_REQUIRES_SUDO[$key]}" \
-      "${COMMAND_HIDDEN[$key]}" \
       "${COMMAND_ARGS[$key]}" \
       "${COMMAND_EXAMPLES[$key]}" \
       "${COMMAND_ALIASES[$key]}" \
@@ -632,12 +626,11 @@ commands_json_filter() {
   name: .[3],
   summary: .[4],
   requires_sudo: (.[5] == "true"),
-  hidden: (.[6] == "true"),
-  args: .[7],
-  examples: (.[8] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))),
-  aliases: (.[9] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))),
-  filename_route: .[10],
-  routes: ([.[0], .[10]] + (.[9] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))) | unique)
+  args: .[6],
+  examples: (.[7] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))),
+  aliases: (.[8] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))),
+  filename_route: .[9],
+  routes: ([.[0], .[9]] + (.[8] | split("|") | map(gsub("^ +| +$"; "")) | map(select(length > 0))) | unique)
 }] | {ok: true, commands: .}
 EOF
 }
@@ -691,14 +684,13 @@ show_command_json() {
   local key="$1"
 
   printf '%s\n' "$key" | while IFS= read -r key; do
-    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
+    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
       "${COMMAND_ROUTE[$key]}" \
       "${COMMAND_BINARY[$key]}" \
       "${COMMAND_GROUP[$key]}" \
       "${COMMAND_NAME[$key]}" \
       "${COMMAND_SUMMARY[$key]}" \
       "${COMMAND_REQUIRES_SUDO[$key]}" \
-      "${COMMAND_HIDDEN[$key]}" \
       "${COMMAND_ARGS[$key]}" \
       "${COMMAND_EXAMPLES[$key]}" \
       "${COMMAND_ALIASES[$key]}" \
@@ -791,25 +783,6 @@ show_group_help() {
   fi
 }
 
-show_prefix_help() {
-  local prefix="$1"
-  local prefix_with_space="$prefix "
-  local key=""
-  local rows=""
-
-  while IFS= read -r key; do
-    [[ -n $key ]] || continue
-    if [[ ${COMMAND_USAGE[$key]} == $prefix_with_space* ]]; then
-      rows+="${COMMAND_USAGE[$key]}"$'\t'$'\t'"${COMMAND_SUMMARY[$key]}"$'\n'
-    fi
-  done < <(sorted_keys false)
-
-  [[ -n $rows ]] || return 1
-
-  echo "${prefix#omarchy } commands:"
-  print_command_table "$rows"
-}
-
 show_related_commands() {
   local key="$1"
   local group="${COMMAND_GROUP[$key]}"
@@ -1027,10 +1000,6 @@ dispatch_or_help() {
     return 0
   fi
 
-  if show_prefix_help "omarchy ${args[*]}"; then
-    return 0
-  fi
-
   echo "Unknown Omarchy command: omarchy ${args[*]}" >&2
   suggestion=$(suggest_command "${args[0]}")
   if [[ -n $suggestion ]]; then

bin/omarchy-battery-monitor

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # omarchy:summary=Designed to be run by systemd timer every 30 seconds and alerts if battery is low
-# omarchy:hidden=true
 
 BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"

bin/omarchy-branding-about

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Edit, set, or reset About branding
-# omarchy:group=branding
-# omarchy:name=about
-# omarchy:args=<image|text|reset>
-# omarchy:examples=omarchy branding about image | omarchy branding about text | omarchy branding about reset
-
-set -euo pipefail
-
-case "${1:-}" in
-image)
-  image=$(omarchy-menu-file "Logo image" "$HOME" "svg png")
-  if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/about.txt --width 54 --height 26 --mode block; then
-    omarchy-launch-about >/dev/null 2>&1
-  fi
-  ;;
-text)
-  omarchy-launch-editor ~/.config/omarchy/branding/about.txt >/dev/null 2>&1 && omarchy-launch-about >/dev/null 2>&1
-  ;;
-reset)
-  cp "$OMARCHY_PATH/icon.txt" ~/.config/omarchy/branding/about.txt && omarchy-launch-about >/dev/null 2>&1
-  ;;
-*)
-  echo "Usage: omarchy-branding-about <image|text|reset>" >&2
-  exit 1
-  ;;
-esac

bin/omarchy-branding-screensaver

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Edit, set, or reset screensaver branding
-# omarchy:group=branding
-# omarchy:name=screensaver
-# omarchy:args=<image|text|reset>
-# omarchy:examples=omarchy branding screensaver image | omarchy branding screensaver text | omarchy branding screensaver reset
-
-set -euo pipefail
-
-case "${1:-}" in
-image)
-  image=$(omarchy-menu-file "Logo image" "$HOME" "svg png")
-  if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/screensaver.txt; then
-    omarchy-launch-screensaver force >/dev/null 2>&1
-  fi
-  ;;
-text)
-  omarchy-launch-editor ~/.config/omarchy/branding/screensaver.txt >/dev/null 2>&1 && omarchy-launch-screensaver force >/dev/null 2>&1
-  ;;
-reset)
-  cp "$OMARCHY_PATH/logo.txt" ~/.config/omarchy/branding/screensaver.txt && omarchy-launch-screensaver force >/dev/null 2>&1
-  ;;
-*)
-  echo "Usage: omarchy-branding-screensaver <image|text|reset>" >&2
-  exit 1
-  ;;
-esac

bin/omarchy-brightness-display

@@ -1,11 +1,15 @@
 #!/bin/bash
 
 # omarchy:summary=Adjust brightness on the most likely display device.
-# omarchy:args=<+N%|N%-|N%|off|on>
-# omarchy:examples=omarchy brightness display +5% | omarchy brightness display 5%- | omarchy brightness display 50% | omarchy brightness display off | omarchy brightness display on
+# omarchy:args=<step>
 
 step="${1:-+5%}"
 
+if omarchy-hyprland-monitor-focused-apple; then
+  omarchy-brightness-display-apple "$step"
+  exit
+fi
+
 # 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
@@ -15,19 +19,6 @@ for candidate in amdgpu_bl* intel_backlight acpi_video*; do
   fi
 done
 
-if [[ $step == "off" ]]; then
-  hyprctl dispatch dpms off >/dev/null 2>&1
-  exit 0
-elif [[ $step == "on" ]]; then
-  hyprctl dispatch dpms on >/dev/null 2>&1
-  exit 0
-fi
-
-if omarchy-hyprland-monitor-focused-apple; then
-  omarchy-brightness-display-apple "$step"
-  exit
-fi
-
 # Current brightness percentage
 current=$(brightnessctl -d "$device" -m | cut -d',' -f4 | tr -d '%')
 

bin/omarchy-brightness-display-apple

@@ -1,8 +1,6 @@
 #!/bin/bash
 
 # omarchy:summary=Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.
-# omarchy:args=<+N%|N%-|N%>
-# omarchy:examples=omarchy brightness display apple +5% | omarchy brightness display apple 5%- | omarchy brightness display apple 50%
 
 if (( $# == 0 )); then
   echo "Adjust Apple Display brightness by passing +5%, 5%-, or 100%"

bin/omarchy-brightness-keyboard

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # omarchy:summary=Adjust keyboard backlight brightness using available steps.
-# omarchy:args=<up|down|cycle|off|restore>
+# omarchy:args=<up|down|cycle>
 
 direction="${1:-up}"
 
@@ -19,14 +19,6 @@ if [[ -z $device ]]; then
   exit 1
 fi
 
-if [[ $direction == "off" ]]; then
-  brightnessctl -sd "$device" set 0 >/dev/null
-  exit 0
-elif [[ $direction == "restore" ]]; then
-  brightnessctl -rd "$device" >/dev/null
-  exit 0
-fi
-
 # Get current and max brightness to determine step size.
 max_brightness="$(brightnessctl -d "$device" max)"
 current_brightness="$(brightnessctl -d "$device" get)"

bin/omarchy-capture-screenrecording

@@ -5,18 +5,6 @@
 # omarchy:args=[--with-desktop-audio] [--with-microphone-audio] [--with-webcam] [--webcam-device=<device>] [--resolution=<size>] [--stop-recording]
 # omarchy:examples=omarchy screenrecord | omarchy capture screenrecord --with-desktop-audio
 # omarchy:aliases=omarchy screenrecord
-#
-# Env: OMARCHY_SCREENRECORD_USE_PORTAL=true skips the built-in slurp picker and
-# uses gpu-screen-recorder's xdg-desktop-portal capture backend instead. The
-# portal backend was originally added (PR #3401) for HDR-aware capture, support
-# for monitors driven by external GPUs, and window capture — enable it if any
-# of those matter to you. Off by default because the portal path can fail EGL
-# DMA-BUF modifier import on some configurations, leaving recording unable to
-# start.
-#
-# Env: OMARCHY_SCREENRECORD_DEBUG=true appends gpu-screen-recorder's stderr (and
-# the picker target it was launched with) to /tmp/omarchy-screenrecord.log so
-# users can attach a log when reporting capture failures.
 
 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
@@ -33,7 +21,6 @@ WEBCAM_DEVICE=""
 RESOLUTION=""
 STOP_RECORDING="false"
 RECORDING_FILE="/tmp/omarchy-screenrecord-filename"
-LOG_FILE=$([[ ${OMARCHY_SCREENRECORD_DEBUG:-false} == "true" ]] && echo "/tmp/omarchy-screenrecord.log" || echo "/dev/null")
 
 for arg in "$@"; do
   case "$arg" in
@@ -100,92 +87,7 @@ default_resolution() {
   fi
 }
 
-# Monitor + window rectangles on the focused workspace, in slurp's "X,Y WxH" format.
-# Mirrors omarchy-capture-screenshot so the picker UX is identical.
-get_rectangles() {
-  local active_workspace=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .activeWorkspace.id')
-  hyprctl monitors -j | jq -r --arg ws "$active_workspace" '
-    .[] | select(.activeWorkspace.id == ($ws | tonumber)) |
-    "\(.x),\(.y) \(.width / .scale | floor)x\(.height / .scale | floor)"'
-  hyprctl clients -j | jq -r --arg ws "$active_workspace" '
-    .[] | select(.workspace.id == ($ws | tonumber)) |
-    "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
-}
-
-# Echoes "monitor:NAME" when the selection matches an entire monitor, otherwise
-# "region:WxH+X+Y" with physical-pixel coordinates ready for gpu-screen-recorder.
-# Returns non-zero if the user cancelled the picker.
-select_capture_target() {
-  local rects=$(get_rectangles)
-  hyprpicker -r -z >/dev/null 2>&1 &
-  local picker_pid=$!
-  sleep .1
-  local selection=$(echo "$rects" | slurp 2>/dev/null)
-  kill $picker_pid 2>/dev/null
-
-  # X and Y can be negative (Hyprland monitor positions in multi-display layouts);
-  # widths and heights are always positive.
-  [[ $selection =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || return 1
-  local sx=${BASH_REMATCH[1]} sy=${BASH_REMATCH[2]}
-  local sw=${BASH_REMATCH[3]} sh=${BASH_REMATCH[4]}
-
-  # A bare click (area < 20px²) snaps to whichever rectangle the click landed
-  # inside, so users don't end up with accidental 2px recordings.
-  if ((sw * sh < 20)); then
-    while IFS= read -r rect; do
-      [[ $rect =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || continue
-      local rx=${BASH_REMATCH[1]} ry=${BASH_REMATCH[2]}
-      local rw=${BASH_REMATCH[3]} rh=${BASH_REMATCH[4]}
-      if ((sx >= rx && sx < rx + rw && sy >= ry && sy < ry + rh)); then
-        sx=$rx sy=$ry sw=$rw sh=$rh
-        break
-      fi
-    done <<<"$rects"
-  fi
-
-  # When the selection exactly matches a monitor, prefer -w <monitor> over a
-  # region capture — same kms backend, but no scaling math and full native res.
-  local monitor=$(hyprctl monitors -j | jq -r --argjson x "$sx" --argjson y "$sy" --argjson w "$sw" --argjson h "$sh" '
-    .[] | select(.x == $x and .y == $y and (.width / .scale | floor) == $w and (.height / .scale | floor) == $h) | .name' | head -1)
-
-  if [[ -n $monitor ]]; then
-    echo "monitor:$monitor"
-    return
-  fi
-
-  # gpu-screen-recorder wants region geometry in the compositor's logical
-  # coordinate space — same space slurp returns — so pass the values through
-  # untouched. (gsr scales to physical pixels itself based on the monitor.)
-  echo "region:${sw}x${sh}+${sx}+${sy}"
-}
-
 start_screenrecording() {
-  local capture_args=()
-  local target
-
-  # Opt-in path for HDR, external-GPU monitors, and window capture (all things
-  # the portal backend supports and the kms backend doesn't). Default flow uses
-  # slurp + the kms backend, which avoids the EGL DMA-BUF modifier import
-  # failures the portal path can hit on some configurations.
-  if [[ ${OMARCHY_SCREENRECORD_USE_PORTAL:-false} == "true" ]]; then
-    target="portal"
-    capture_args=(-w portal -s "${RESOLUTION:-$(default_resolution)}")
-  else
-    target=$(select_capture_target) || return 1
-
-    case $target in
-    monitor:*)
-      capture_args=(-w "${target#monitor:}" -s "${RESOLUTION:-$(default_resolution)}")
-      ;;
-    region:*)
-      capture_args=(-w "${target#region:}")
-      [[ -n $RESOLUTION ]] && capture_args+=(-s "$RESOLUTION")
-      ;;
-    esac
-  fi
-
-  [[ $WEBCAM == "true" ]] && start_webcam_overlay
-
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
   local audio_devices=""
   local audio_args=()
@@ -200,10 +102,12 @@ start_screenrecording() {
 
   [[ -n $audio_devices ]] && audio_args+=(-a "$audio_devices" -ac aac)
 
-  echo "===== $(date '+%F %T') args: $* target: $target =====" >>"$LOG_FILE"
-  gpu-screen-recorder "${capture_args[@]}" -k auto -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" 2>>"$LOG_FILE" &
+  local resolution="${RESOLUTION:-$(default_resolution)}"
+
+  gpu-screen-recorder -w portal -k auto -s "$resolution" -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" &
   local pid=$!
 
+  # Wait for recording to actually start (file appears after portal selection)
   while kill -0 $pid 2>/dev/null && [[ ! -f $filename ]]; do
     sleep 0.2
   done
@@ -233,7 +137,6 @@ stop_screenrecording() {
   else
     finalize_recording
     local filename=$(cat "$RECORDING_FILE" 2>/dev/null)
-    echo "$filename"
     local preview="${filename%.mp4}-preview.png"
 
     # Generate a preview thumbnail from the first frame
@@ -272,10 +175,7 @@ finalize_recording() {
   # Trim the first frame, and normalize audio to -14 LUFS if present, in a single pass
   local args=(-y -ss 0.1 -i "$latest" "${video_codec[@]}")
   if ffprobe -v error -select_streams a -show_entries stream=codec_type -of csv=p=0 "$latest" 2>/dev/null | grep -q audio; then
-    # Hard-mute the first 400ms to drop the PipeWire capture-open pop (a near-clipping
-    # transient around 130-200ms that a gentle fade-in can't attenuate enough), then a
-    # 50ms fade avoids a click at the boundary before loudnorm normalizes the rest.
-    args+=(-af "volume=enable='lt(t,0.4)':volume=0,afade=t=in:st=0.4:d=0.05,loudnorm=I=-14:TP=-1.5:LRA=11")
+    args+=(-af loudnorm=I=-14:TP=-1.5:LRA=11)
   fi
 
   local processed="${latest%.mp4}-processed.mp4"
@@ -291,5 +191,7 @@ if screenrecording_active; then
 elif [[ $STOP_RECORDING == "true" ]]; then
   exit 1
 else
+  [[ $WEBCAM == "true" ]] && start_webcam_overlay
+
   start_screenrecording || cleanup_webcam
 fi

bin/omarchy-capture-screenshot

@@ -2,7 +2,7 @@
 
 # omarchy:summary=Take a screenshot
 # omarchy:group=capture
-# omarchy:args=[smart|region|windows|fullscreen] [slurp|copy|save] [--editor=<name>]
+# omarchy:args=[smart|region|windows|fullscreen] [slurp|copy] [--editor=<name>]
 # omarchy:examples=omarchy screenshot | omarchy capture screenshot region
 # omarchy:aliases=omarchy screenshot
 
@@ -126,22 +126,14 @@ esac
 FILENAME="screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png"
 FILEPATH="$OUTPUT_DIR/$FILENAME"
 
-case "$PROCESSING" in
-  slurp)
-    grim -g "$SELECTION" "$FILEPATH" || exit 1
-    echo "$FILEPATH"
-    wl-copy <"$FILEPATH"
+if [[ $PROCESSING == "slurp" ]]; then
+  grim -g "$SELECTION" "$FILEPATH" || exit 1
+  wl-copy <"$FILEPATH"
 
-    (
-      ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
-      [[ $ACTION == "default" ]] && open_editor "$FILEPATH"
-    ) >/dev/null 2>&1 &
-    ;;
-  copy)
-    grim -g "$SELECTION" - | wl-copy
-    ;;
-  save)
-    grim -g "$SELECTION" "$FILEPATH" || exit 1
-    echo "$FILEPATH"
-    ;;
-esac
+  (
+    ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
+    [[ $ACTION == "default" ]] && open_editor "$FILEPATH"
+  ) &
+else
+  grim -g "$SELECTION" - | wl-copy
+fi

bin/omarchy-capture-text-extraction

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Extract text from a screenshot region with OCR
-# omarchy:group=capture
-# omarchy:examples=omarchy capture ocr
-
-# Keep hyprpicker alive until after grim captures so the screenshot sees the
-# frozen overlay rather than live content shifting during teardown.
-cleanup_freeze() {
-  [[ -n $PID ]] && kill $PID 2>/dev/null
-}
-trap cleanup_freeze EXIT
-
-hyprpicker -r -z >/dev/null 2>&1 &
-PID=$!
-sleep .1
-SELECTION=$(slurp 2>/dev/null)
-
-[[ -z $SELECTION ]] && exit 0
-
-TEXT=$(grim -g "$SELECTION" - | tesseract stdin stdout --oem 1 --psm 6 -l "${OMARCHY_OCR_LANGS:-eng}" --dpi 300 -c preserve_interword_spaces=1 2>/dev/null) || exit 1
-
-[[ -z $TEXT ]] && exit 1
-
-printf "%s" "$TEXT" | wl-copy
-notify-send "󰴑    Copied text from selection to clipboard"

bin/omarchy-cmd-terminal-cwd

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # omarchy:summary=Print the current working directory of the active terminal window
-# omarchy:hidden=true
 
 terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)

bin/omarchy-debug

@@ -74,13 +74,15 @@ ACTION=$(gum choose "${OPTIONS[@]}")
 
 case "$ACTION" in
   "Upload log")
-    echo "Uploading debug log to logs.omarchy.org..."
-    URL=$(curl -sf -F "file=@$LOG_FILE" https://logs.omarchy.org/)
+    echo "Uploading debug log to 0x0.st..."
+    URL=$(curl -sF "file=@$LOG_FILE" -Fexpires=24 https://0x0.st)
     if (( $? == 0 )) && [[ -n $URL ]]; then
       echo "✓ Log uploaded successfully!"
       echo "Share this URL:"
       echo ""
       echo "  $URL"
+      echo ""
+      echo "This link will expire in 24 hours."
     else
       echo "Error: Failed to upload log file"
       exit 1

bin/omarchy-default-browser

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set the default browser for Omarchy and XDG handlers
-# omarchy:args=[chromium|chrome|brave|brave-origin|edge|firefox|zen]
-# omarchy:examples=omarchy default browser firefox | omarchy default browser brave
-
-if (($# == 0)); then
-  case "$(xdg-settings get default-web-browser)" in
-  chromium.desktop) echo "chromium" ;;
-  google-chrome.desktop) echo "chrome" ;;
-  brave-browser.desktop) echo "brave" ;;
-  brave-origin-beta.desktop) echo "brave-origin" ;;
-  microsoft-edge.desktop) echo "edge" ;;
-  firefox.desktop) echo "firefox" ;;
-  zen.desktop) echo "zen" ;;
-  *) xdg-settings get default-web-browser ;;
-  esac
-  exit 0
-fi
-
-case "$1" in
-chromium) desktop_id="chromium.desktop"; name="Chromium"; glyph="" ;;
-chrome) desktop_id="google-chrome.desktop"; name="Chrome"; glyph="󰊯" ;;
-brave) desktop_id="brave-browser.desktop"; name="Brave"; glyph="󰖟" ;;
-brave-origin) desktop_id="brave-origin-beta.desktop"; name="Brave Origin"; glyph="󰖟" ;;
-edge) desktop_id="microsoft-edge.desktop"; name="Edge"; glyph="󰇩" ;;
-firefox) desktop_id="firefox.desktop"; name="Firefox"; glyph="󰈹" ;;
-zen) desktop_id="zen.desktop"; name="Zen"; glyph="󰰷" ;;
-*)
-  echo "Usage: omarchy-default-browser <chromium|chrome|brave|brave-origin|edge|firefox|zen>"
-  exit 1
-  ;;
-esac
-
-xdg-settings set default-web-browser "$desktop_id"
-xdg-mime default "$desktop_id" x-scheme-handler/http
-xdg-mime default "$desktop_id" x-scheme-handler/https
-xdg-mime default "$desktop_id" text/html
-
-notify-send -u low "$glyph    $name is now the default browser"

bin/omarchy-default-editor

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set the default editor for $EDITOR
-# omarchy:args=[code|cursor|zed|sublime_text|helix|vim|emacs|nvim]
-# omarchy:examples=omarchy default editor | omarchy default editor code | omarchy default editor helix
-
-if (($# == 0)); then
-  sed -n 's/^export EDITOR=//p' ~/.config/uwsm/default | head -n 1
-  exit 0
-fi
-
-case "$1" in
-code) editor="code"; name="VSCode"; glyph="" ;;
-cursor) editor="cursor"; name="Cursor"; glyph="" ;;
-zed | zeditor) editor="zeditor"; name="Zed"; glyph="" ;;
-sublime_text) editor="sublime_text"; name="Sublime Text"; glyph="" ;;
-helix) editor="helix"; name="Helix"; glyph="" ;;
-vim) editor="vim"; name="Vim"; glyph="" ;;
-emacs) editor="emacs"; name="Emacs"; glyph="" ;;
-nvim) editor="nvim"; name="Neovim"; glyph="" ;;
-*)
-  echo "Usage: omarchy-default-editor <code|cursor|zed|sublime_text|helix|vim|emacs|nvim>"
-  exit 1
-  ;;
-esac
-
-sed -i "s/^export EDITOR=.*/export EDITOR=$editor/" ~/.config/uwsm/default
-
-export EDITOR="$editor"
-notify-send -u low "$glyph    $name is now the default editor" "      Effective after logging out"

bin/omarchy-default-terminal

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set the default terminal used by xdg-terminal-exec
-# omarchy:args=[alacritty|foot|ghostty|kitty]
-# omarchy:examples=omarchy default terminal ghostty | omarchy default terminal kitty
-
-if (($# == 0)); then
-  desktop_id=$(grep -vE '^($|#)' ~/.config/xdg-terminals.list 2>/dev/null | head -n 1)
-  case "$desktop_id" in
-  Alacritty.desktop) echo "alacritty" ;;
-  foot.desktop) echo "foot" ;;
-  com.mitchellh.ghostty.desktop) echo "ghostty" ;;
-  kitty.desktop) echo "kitty" ;;
-  *) echo "$desktop_id" ;;
-  esac
-  exit 0
-fi
-
-case "$1" in
-alacritty) desktop_id="Alacritty.desktop"; name="Alacritty"; glyph="" ;;
-foot) desktop_id="foot.desktop"; name="Foot"; glyph="" ;;
-ghostty) desktop_id="com.mitchellh.ghostty.desktop"; name="Ghostty"; glyph="" ;;
-kitty) desktop_id="kitty.desktop"; name="Kitty"; glyph="" ;;
-*)
-  echo "Usage: omarchy-default-terminal <alacritty|foot|ghostty|kitty>"
-  exit 1
-  ;;
-esac
-
-cat >~/.config/xdg-terminals.list <<EOF
-# Terminal emulator preference order for xdg-terminal-exec
-# The first found and valid terminal will be used
-$desktop_id
-EOF
-
-notify-send -u low "$glyph    $name is now the default terminal"

bin/omarchy-dev-bin-metadata

@@ -22,8 +22,7 @@ show_json() {
       {name: "args", required: false, type: "string", note: "Only set when the command accepts arguments."},
       {name: "examples", required: false, type: "string", note: "Pipe-separated examples."},
       {name: "aliases", required: false, type: "string", note: "Pipe-separated alternate routes, e.g. omarchy screenshot."},
-      {name: "requires-sudo", required: false, type: "true", default: false, note: "Only include when true."},
-      {name: "hidden", required: false, type: "true", default: false, note: "Hide from default command listings; visible with --all."}
+      {name: "requires-sudo", required: false, type: "true", default: false, note: "Only include when true."}
     ]
   }'
 }
@@ -44,7 +43,6 @@ Inferred defaults:
   route         omarchy <group> <name>
   binary        filename
   requires-sudo false
-  hidden        false
 
 Optional fields:
   # omarchy:group=<group>                  route override only
@@ -53,7 +51,6 @@ Optional fields:
   # omarchy:examples=<cmd> | <cmd>         pipe-separated examples
   # omarchy:aliases=<route> | <route>      pipe-separated alternate routes
   # omarchy:requires-sudo=true             only when true
-  # omarchy:hidden=true                    hide from default command listings
 
 Do not define:
   binary      inferred from filename

bin/omarchy-drive-select

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Select a drive from a list with info that includes space and brand. Used by omarchy-drive-password.
+# omarchy:summary=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-first-run

@@ -16,10 +16,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/swayosd.sh"
-  bash "$OMARCHY_PATH/install/first-run/gtk-primary-paste.sh"
   bash "$OMARCHY_PATH/install/first-run/elephant.sh"
-  omarchy-hook-install post-update "$OMARCHY_PATH/install/first-run/install-voxtype.hook"
   sudo rm -f /etc/sudoers.d/first-run
 
   bash "$OMARCHY_PATH/install/first-run/welcome.sh"

bin/omarchy-font-set

@@ -22,10 +22,6 @@ if [[ -n $font_name ]]; then
       pkill -SIGUSR2 ghostty
     fi
 
-    if [[ -f ~/.config/foot/foot.ini ]]; then
-      sed -i "s/^font=.*/font=$font_name:size=9/g" ~/.config/foot/foot.ini
-    fi
-
     sed -i "s/font_family = .*/font_family = $font_name/g" ~/.config/hypr/hyprlock.conf
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
@@ -41,10 +37,6 @@ if [[ -n $font_name ]]; then
       notify-send -u low "    You must restart Ghostty to see font change"
     fi
 
-    if pgrep -x foot; then
-      notify-send -u low "    You must restart Foot to see font change"
-    fi
-
     omarchy-hook font-set "$font_name"
   else
     echo "Font '$font_name' not found."

bin/omarchy-haptic-touchpad

@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+
+# omarchy:summary=Run the Synaptics touchpad haptic feedback daemon
+
+"""Haptic feedback daemon for Synaptics touchpads with Manual Trigger.
+
+Monitors touchpad button press events and sends haptic pulses via HID
+feature reports. Required because the kernel's HID haptic subsystem only
+supports Auto Trigger with waveform enumeration, not the simpler Manual
+Trigger protocol used by these Synaptics touchpads.
+"""
+
+import fcntl, glob, os, struct, sys
+
+VENDOR = "06CB"
+REPORT_ID = 0x37
+INTENSITY = 40  # 0-100
+
+# input_event: struct timeval (16 bytes on 64-bit) + type(H) + code(H) + value(i)
+EVENT_FORMAT = "llHHi"
+EVENT_SIZE = struct.calcsize(EVENT_FORMAT)
+EV_KEY = 0x01
+BTN_LEFT = 272
+BTN_RIGHT = 273
+BTN_MIDDLE = 274
+
+# ioctl: HIDIOCSFEATURE(len) = _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len)
+def HIDIOCSFEATURE(length):
+    return 0xC0000000 | (length << 16) | (ord("H") << 8) | 0x06
+
+
+def find_hidraw():
+    for path in sorted(glob.glob("/sys/class/hidraw/hidraw*")):
+        uevent = os.path.join(path, "device", "uevent")
+        try:
+            with open(uevent) as f:
+                content = f.read().upper()
+            if f"0000{VENDOR}" in content:
+                return os.path.join("/dev", os.path.basename(path))
+        except OSError:
+            continue
+    return None
+
+
+def find_touchpad_event():
+    for path in sorted(glob.glob("/sys/class/input/event*/device/name")):
+        try:
+            with open(path) as f:
+                name = f.read().strip().upper()
+            if VENDOR in name and "TOUCHPAD" in name:
+                event = path.split("/")[-3]
+                return os.path.join("/dev/input", event)
+        except OSError:
+            continue
+    return None
+
+
+def main():
+    hidraw = find_hidraw()
+    if not hidraw:
+        print("No Synaptics haptic touchpad hidraw device found", file=sys.stderr)
+        sys.exit(1)
+
+    event = find_touchpad_event()
+    if not event:
+        print("No Synaptics haptic touchpad input device found", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"Haptic touchpad: hidraw={hidraw} input={event} intensity={INTENSITY}", flush=True)
+
+    haptic_report = struct.pack("BB", REPORT_ID, INTENSITY)
+    ioctl_req = HIDIOCSFEATURE(len(haptic_report))
+
+    hidraw_fd = os.open(hidraw, os.O_RDWR)
+    event_fd = os.open(event, os.O_RDONLY)
+
+    try:
+        while True:
+            data = os.read(event_fd, EVENT_SIZE)
+            if len(data) < EVENT_SIZE:
+                continue
+            _, _, ev_type, code, value = struct.unpack(EVENT_FORMAT, data)
+            if ev_type == EV_KEY and code in (BTN_LEFT, BTN_RIGHT, BTN_MIDDLE) and value == 1:
+                try:
+                    fcntl.ioctl(hidraw_fd, ioctl_req, haptic_report)
+                except OSError:
+                    pass
+    except KeyboardInterrupt:
+        pass
+    finally:
+        os.close(event_fd)
+        os.close(hidraw_fd)
+
+
+if __name__ == "__main__":
+    main()

bin/omarchy-hook

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Run a named hook from ~/.config/omarchy/hooks/<name> and ~/.config/omarchy/hooks/<name>.d/.
+# omarchy:summary=Run a named hook, like post-update (available in ~/.config/omarchy/hooks/post-update).
 # omarchy:args=[name] [args...]
 
 set -e
@@ -12,17 +12,8 @@ fi
 
 HOOK=$1
 HOOK_PATH="$HOME/.config/omarchy/hooks/$1"
-HOOK_DIR="$HOOK_PATH.d"
 shift
 
 if [[ -f $HOOK_PATH ]]; then
-  bash "$HOOK_PATH" "$@" || echo "Hook failed: $HOOK_PATH"
-fi
-
-if [[ -d $HOOK_DIR ]]; then
-  for hook in "$HOOK_DIR"/*; do
-    [[ -f $hook ]] || continue
-    [[ $hook == *.sample ]] && continue
-    bash "$hook" "$@" || echo "Hook failed: $hook"
-  done
+  bash "$HOOK_PATH" "$@"
 fi

bin/omarchy-hook-install

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install a hook into ~/.config/omarchy/hooks/<type>.d/
-# omarchy:group=hook
-# omarchy:name=install
-# omarchy:args=<type> <file>
-# omarchy:examples=omarchy hook install post-update ~/my-hook
-
-set -e
-
-if (( $# != 2 )); then
-  echo "Usage: omarchy-hook-install <type> <file>"
-  exit 1
-fi
-
-HOOK_TYPE=$1
-HOOK_FILE=$2
-HOOK_DIR="$HOME/.config/omarchy/hooks/$HOOK_TYPE.d"
-HOOK_NAME=$(basename "$HOOK_FILE")
-HOOK_PATH="$HOOK_DIR/$HOOK_NAME"
-
-if [[ ! -f $HOOK_FILE ]]; then
-  echo "Hook file not found: $HOOK_FILE"
-  exit 1
-fi
-
-mkdir -p "$HOOK_DIR"
-cp "$HOOK_FILE" "$HOOK_PATH"
-chmod 755 "$HOOK_PATH"
-
-echo "Installed $HOOK_TYPE hook: $HOOK_PATH"

bin/omarchy-hw-asus-zenbook-ux5406aa

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect ASUS Zenbook UX5406AA series laptops on Intel Panther Lake.
-
-omarchy-hw-match "ux5406aa" && omarchy-hw-intel-ptl

bin/omarchy-hw-dell-xps-haptic-touchpad

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Match Dell XPS systems with the Synaptics haptic touchpad.
-
-omarchy-hw-match "XPS" && [[ -e /sys/bus/i2c/devices/i2c-VEN_06CB:00 ]]

bin/omarchy-hw-nvidia-gsp

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect whether the computer has an NVIDIA GPU with GSP firmware (Turing or newer).
-
-# GTX 16xx, RTX 20xx-50xx, RTX Pro, Quadro RTX, datacenter A/H/T/L series.
-lspci | grep -i 'nvidia' | grep -qE "GTX 16[0-9]{2}|RTX [2-5][0-9]{3}|RTX PRO [0-9]{4}|Quadro RTX|RTX A[0-9]{4}|A[1-9][0-9]{2}|H[1-9][0-9]{2}|T4|L[0-9]+"

bin/omarchy-hw-nvidia-without-gsp

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect whether the computer has an NVIDIA GPU without GSP firmware (Maxwell/Pascal/Volta).
-
-# GTX 9xx/10xx, GT 10xx, Quadro P/M/GV, MX series, Titan X/Xp/V, Tesla V100.
-lspci | grep -i 'nvidia' | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"

bin/omarchy-hyprland-monitor-focused-apple

@@ -2,4 +2,4 @@
 
 # omarchy:summary=Return success if the focused Hyprland monitor is an Apple display.
 
-hyprctl monitors -j | jq -e '.[] | select(.focused == true) | select(.make == "Apple Computer Inc" and (.model | test("StudioDisplay|ProDisplayXDR|Studio XDR")))' >/dev/null
+hyprctl monitors -j | jq -e '.[] | select(.focused == true) | select(.make == "Apple Computer Inc" and (.model | test("StudioDisplay|ProDisplayXDR")))' >/dev/null

bin/omarchy-hyprland-monitor-scaling-cycle

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Cycle focused Hyprland monitor scaling through 1x, 1.25x, 1.6x, 2x, 3x, and 4x
+# omarchy:summary=Cycle scaling for the focused Hyprland monitor
 
 MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')
 ACTIVE_MONITOR=$(echo "$MONITOR_INFO" | jq -r '.name')
@@ -9,8 +9,8 @@ WIDTH=$(echo "$MONITOR_INFO" | jq -r '.width')
 HEIGHT=$(echo "$MONITOR_INFO" | jq -r '.height')
 REFRESH_RATE=$(echo "$MONITOR_INFO" | jq -r '.refreshRate')
 
-# Cycle through scales: 1 → 1.25 → 1.6 → 2 → 3 → 4 → 1 (or reverse with --reverse)
-SCALES=(1 1.25 1.6 2 3 4)
+# Cycle through scales: 1 → 1.25 → 1.6 → 2 → 3 → 1 (or reverse with --reverse)
+SCALES=(1 1.25 1.6 2 3)
 
 # Find the index of the scale closest to the current one (Hyprland may
 # snap fractional scales to nearby values, so we can't match exactly)

bin/omarchy-install-browser

@@ -1,93 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install a supported browser
-# omarchy:args=<chrome|brave|brave-origin|edge|firefox|zen>
-# omarchy:examples=omarchy install browser firefox | omarchy install browser brave
-
-setup_policy_directory() {
-  sudo mkdir -p "$1"
-  sudo chmod a+rw "$1"
-}
-
-announce_browser_installed() {
-  echo ""
-  echo "$1 browser installed. Make it the default via Setup > Defaults > Browser."
-}
-
-copy_chromium_flags() {
-  mkdir -p ~/.config
-  cp -f "${OMARCHY_PATH:-$HOME/.local/share/omarchy}/config/chromium-flags.conf" "$1"
-}
-
-setup_firefox_preferences() {
-  local distribution_dir="$1"
-
-  setup_policy_directory "$distribution_dir"
-  sudo cp -f "$OMARCHY_PATH/default/firefox/policies.json" "$distribution_dir/policies.json"
-}
-
-setup_firefox_wayland() {
-  mkdir -p ~/.config/environment.d
-  echo "MOZ_ENABLE_WAYLAND=1" > ~/.config/environment.d/omarchy-firefox-wayland.conf
-}
-
-case $1 in
-chrome)
-  echo "Installing Chrome..."
-  omarchy-pkg-aur-add google-chrome || exit 1
-
-  setup_policy_directory /etc/opt/chrome/policies/managed
-  copy_chromium_flags ~/.config/chrome-flags.conf
-  omarchy-theme-set-browser
-  announce_browser_installed "Chrome"
-  ;;
-edge)
-  echo "Installing Edge..."
-  omarchy-pkg-aur-add microsoft-edge-stable-bin || exit 1
-
-  setup_policy_directory /etc/opt/edge/policies/managed
-  copy_chromium_flags ~/.config/microsoft-edge-stable-flags.conf
-  omarchy-theme-set-browser
-  announce_browser_installed "Edge"
-  ;;
-brave)
-  echo "Installing Brave..."
-  omarchy-pkg-aur-add brave-bin || exit 1
-
-  setup_policy_directory /etc/brave/policies/managed
-  copy_chromium_flags ~/.config/brave-flags.conf
-  omarchy-theme-set-browser
-  announce_browser_installed "Brave"
-  ;;
-brave-origin)
-  echo "Installing Brave Origin..."
-  omarchy-pkg-aur-add brave-origin-beta-bin || exit 1
-
-  setup_policy_directory /etc/brave/policies/managed
-  mkdir -p ~/.config
-  # FIXME: Use normal chromium flags when Brave Origin wrapper has been fixed
-  echo "--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url" > ~/.config/brave-origin-beta-flags.conf
-  omarchy-theme-set-browser
-  announce_browser_installed "Brave Origin"
-  ;;
-firefox)
-  echo "Installing Firefox..."
-  omarchy-pkg-add firefox || exit 1
-
-  setup_firefox_preferences /usr/lib/firefox/distribution
-  setup_firefox_wayland
-  announce_browser_installed "Firefox"
-  ;;
-zen)
-  echo "Installing Zen..."
-  omarchy-pkg-aur-add zen-browser-bin || exit 1
-
-  setup_firefox_preferences /opt/zen-browser/distribution
-  setup_firefox_wayland
-  announce_browser_installed "Zen"
-  ;;
-*)
-  echo "Usage: omarchy-install-browser <chrome|brave|brave-origin|edge|firefox|zen>"
-  exit 1
-  ;;
-esac

bin/omarchy-install-chromium-google-account

@@ -3,7 +3,6 @@
 # omarchy:summary=Allow Chromium to sign in to Google accounts by adding the required OAuth credentials
 
 if [[ -f ~/.config/chromium-flags.conf ]]; then
-  echo "Installing Chromium Google account support..."
   CONF=~/.config/chromium-flags.conf
 
   grep -qxF -- "--oauth2-client-id=77185425430.apps.googleusercontent.com" "$CONF" ||

bin/omarchy-install-docker-dbs

@@ -13,7 +13,6 @@ fi
 
 if [[ -n $choices ]]; then
   for db in $choices; do
-    echo "Installing $db..."
     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=postgres18 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:18 ;;

bin/omarchy-install-gaming-gpu-lib32

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install lib32 graphics drivers (Vulkan + NVIDIA) for any detected GPUs.
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing lib32 graphics drivers..."
-
-PACKAGES=()
-
-declare -A VULKAN_DRIVERS=(
-  [Intel]=lib32-vulkan-intel
-  [AMD]=lib32-vulkan-radeon
-)
-for vendor in "${!VULKAN_DRIVERS[@]}"; do
-  if lspci | grep -iE "(VGA|Display).*$vendor" >/dev/null; then
-    PACKAGES+=("${VULKAN_DRIVERS[$vendor]}")
-  fi
-done
-
-if omarchy-hw-nvidia-gsp; then
-  PACKAGES+=(lib32-nvidia-utils)
-elif omarchy-hw-nvidia-without-gsp; then
-  PACKAGES+=(lib32-nvidia-580xx-utils)
-fi
-
-[[ ${#PACKAGES[@]} -gt 0 ]] && omarchy-pkg-add "${PACKAGES[@]}"

bin/omarchy-install-gaming-heroic

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Heroic Games Launcher (Epic, GOG, Amazon Prime Gaming) with graphics drivers.
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing Heroic Games Launcher..."
-omarchy-pkg-add heroic-games-launcher-bin
-omarchy-install-gaming-gpu-lib32
-
-setsid gtk-launch heroic >/dev/null 2>&1 &

bin/omarchy-install-gaming-lutris

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Lutris with Wine + DXVK for running Windows games (Battle.net, EA, Ubisoft Connect, etc.)
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing Lutris..."
-omarchy-pkg-add lutris umu-launcher wine-staging wine-mono wine-gecko winetricks python-protobuf
-omarchy-install-gaming-gpu-lib32
-
-# Lutris ships with `#!/usr/bin/env python3`, which resolves to mise's Python and
-# fails to import the lutris module. Pin the shebang to the system Python.
-sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/lutris
-
-cat <<'EOF'
-
-Lutris will open and auto-fetch its DXVK and VKD3D runtimes in the background
-(watch the bottom status bar). Once that finishes, click the + to add or install games.
-
-EOF
-
-setsid lutris >/dev/null 2>&1 &

bin/omarchy-install-gaming-moonlight

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Moonlight (NVIDIA GameStream / Sunshine client) for streaming games to this PC.
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing Moonlight..."
-omarchy-pkg-add moonlight-qt
-
-setsid gtk-launch com.moonlight_stream.Moonlight.desktop >/dev/null 2>&1 &

bin/omarchy-install-gaming-retroarch

@@ -1,85 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install RetroArch with the full libretro core set plus FBNeo and a ~/Games ROM directory.
-
-set -e
-
-echo "Installing RetroArch..."
-omarchy-pkg-add \
-  retroarch \
-  retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
-  libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
-  libretro-blastem \
-  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
-  libretro-core-info \
-  libretro-desmume libretro-dolphin libretro-flycast \
-  libretro-gambatte libretro-genesis-plus-gx \
-  libretro-kronos \
-  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
-  libretro-nestopia \
-  libretro-overlays \
-  libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \
-  libretro-sameboy libretro-scummvm libretro-shaders-slang libretro-snes9x \
-  libretro-yabause \
-  libretro-cap32-git libretro-fbneo-git libretro-uae-git \
-  libretro-vice-x128-git libretro-vice-x64-git libretro-vice-x64dtv-git libretro-vice-x64sc-git \
-  libretro-vice-xcbm2-git libretro-vice-xcbm5x0-git libretro-vice-xpet-git \
-  libretro-vice-xplus4-git libretro-vice-xscpu64-git libretro-vice-xvic-git \
-  libretro-database-git \
-  retroarch-joypad-autoconfig-git
-
-# Set up ~/Games for BIOS files and ROMs
-mkdir -p "$HOME/Games/bios" "$HOME/Games/roms"
-
-CFG="$HOME/.config/retroarch/retroarch.cfg"
-mkdir -p "$(dirname "$CFG")"
-touch "$CFG"
-
-set_cfg() {
-  local key=$1 value=$2
-  if grep -q "^$key = " "$CFG"; then
-    sed -i "s|^$key = .*|$key = \"$value\"|" "$CFG"
-  else
-    echo "$key = \"$value\"" >>"$CFG"
-  fi
-}
-
-set_cfg rgui_browser_directory "$HOME/Games/roms"
-set_cfg system_directory "$HOME/Games/bios"
-
-# Point at the cores and assets installed by pacman
-set_cfg libretro_directory "/usr/lib/libretro"
-set_cfg libretro_info_path "/usr/share/libretro/info"
-set_cfg overlay_directory "/usr/share/libretro/overlays"
-set_cfg osk_overlay_directory "/usr/share/libretro/overlays/keyboards"
-set_cfg video_shader_dir "/usr/share/libretro/shaders/shaders_slang"
-set_cfg joypad_autoconfig_dir "/usr/share/libretro/autoconfig"
-
-# Point at the database, cheats, and cursors from libretro-database-git
-set_cfg content_database_path "/usr/share/libretro/database/rdb"
-set_cfg cheat_database_path "/usr/share/libretro/database/cht"
-set_cfg cursor_directory "/usr/share/libretro/database/cursors"
-
-# Vulkan is required for slang shaders and unlocks hardware renderers in beetle-psx-hw, parallel-n64, dolphin
-set_cfg video_driver "vulkan"
-
-# XMB is the classic PS3-style menu (vs. ozone/rgui/glui)
-set_cfg menu_driver "xmb"
-
-# Default to crt-royale shader for that classic CRT look. The global preset is
-# auto-loaded by RetroArch when auto_shaders_enable is true and no per-core/per-game
-# preset takes precedence — setting video_shader alone in retroarch.cfg is not enough.
-set_cfg video_shader_enable "true"
-set_cfg auto_shaders_enable "true"
-mkdir -p ~/.config/retroarch/config
-echo '#reference "/usr/share/libretro/shaders/shaders_slang/crt/crt-royale.slangp"' \
-  > ~/.config/retroarch/config/global.slangp
-
-# Hide Images and Video tabs in the main menu sidebar
-set_cfg content_show_images "false"
-set_cfg content_show_video "false"
-
-echo ""
-echo "Put your roms and bios files in ~/Games. Then start RetroArch from the app launcher (Super + Space)."
-
-setsid nautilus "$HOME/Games" >/dev/null 2>&1 &

bin/omarchy-install-gaming-xbox-cloud

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Xbox Cloud Gaming as a web app and launch it.
-
-set -e
-
-echo "Installing Xbox Cloud Gaming..."
-omarchy-webapp-install "Xbox Cloud Gaming" "https://www.xbox.com/en-US/play" "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/xbox.png"
-
-setsid omarchy-launch-webapp "https://www.xbox.com/en-US/play" >/dev/null 2>&1 &

bin/omarchy-install-gaming-xbox-controllers

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install support for using Xbox controllers with Steam/RetroArch/etc.
-# omarchy:requires-sudo=true
-
-set -e
-
-echo "Installing Xbox controller Bluetooth support..."
-
-# Install xpadneo to ensure controllers work out of the box
-omarchy-pkg-add linux-headers 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
-
-# Ensure user is in the input group (controllers need it)
-needs_reboot=false
-if ! id -nG "$USER" | grep -qw input; then
-  sudo usermod -aG input "$USER"
-  needs_reboot=true
-fi
-
-# Swap drivers in the running kernel so a reboot isn't needed otherwise
-if lsmod | grep -q '^xpad '; then
-  sudo modprobe -r xpad 2>/dev/null || needs_reboot=true
-fi
-
-if $needs_reboot; then
-  gum confirm "Reboot needed to finish setup. Reboot now?" && sudo reboot now
-  exit 0
-fi
-
-sudo modprobe hid_xpadneo
-
-echo ""
-echo "Now you can pair your Xbox controller with Bluetooth using Super + Ctrl + B."

bin/omarchy-install-geforce-now

@@ -4,7 +4,6 @@
 
 set -e
 
-echo "Installing GeForce NOW..."
 omarchy-pkg-add flatpak
 cd /tmp
 

bin/omarchy-install-helix

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Install Helix and configure it to use the current Omarchy theme
+# Install Helix and configure it to use the current Omarchy theme.
 
 echo "Installing Helix..."
 omarchy-pkg-add helix

bin/omarchy-install-steam

@@ -5,11 +5,6 @@
 
 set -e
 
-echo "Installing Steam..."
-omarchy-pkg-add steam
-omarchy-install-gaming-gpu-lib32
-
-echo ""
-echo "Steam will start automatically now. This might take a while..."
-
+echo "Now pick dependencies matching your graphics card"
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-terminal

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 # omarchy:summary=Install one of the approved terminals and set it as the default for Omarchy (Super + Return etc).
-# omarchy:args=<alacritty|foot|ghostty|kitty>
+# omarchy:args=<alacritty|ghostty|kitty>
 # omarchy:requires-sudo=true
 
 if (($# == 0)); then
-  echo "Usage: omarchy-install-terminal [alacritty|foot|ghostty|kitty]"
+  echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
   exit 1
 fi
 
@@ -14,7 +14,6 @@ package="$1"
 # Map package name to desktop entry ID
 case "$package" in
 alacritty) desktop_id="Alacritty.desktop" ;;
-foot) desktop_id="foot.desktop" ;;
 ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
 kitty) desktop_id="kitty.desktop" ;;
 *)
@@ -23,22 +22,12 @@ kitty) desktop_id="kitty.desktop" ;;
   ;;
 esac
 
-echo "Installing $package..."
-
 # Install package
 if omarchy-pkg-add $package; then
-  # Copy custom desktop entries with X-TerminalArg* keys
+  # Copy custom desktop entry for alacritty with X-TerminalArg* keys
   if [[ $package == "alacritty" ]]; then
     mkdir -p ~/.local/share/applications
-    cp "$OMARCHY_PATH/applications/$desktop_id" ~/.local/share/applications/
-  elif [[ $package == "foot" ]]; then
-    mkdir -p ~/.local/share/applications
-    cp "$OMARCHY_PATH/default/foot/$desktop_id" ~/.local/share/applications/
-  fi
-
-  # Copy default config for optional terminals when missing
-  if [[ ! -e ~/.config/$package ]]; then
-    cp -Rpf "$OMARCHY_PATH/config/$package" ~/.config/
+    cp $OMARCHY_PATH/applications/Alacritty.desktop ~/.local/share/applications/
   fi
 
   # Update xdg-terminals.list to prioritize the proper terminal

bin/omarchy-install-xbox-controllers

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Install support for using Xbox controllers with Steam/RetroArch/etc.
+# omarchy:requires-sudo=true
+
+set -e
+
+# Install xpadneo to ensure controllers work out of the box
+omarchy-pkg-add linux-headers
+omarchy-pkg-aur-add 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-install-zed

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Install Zed Editor and configure it with the current Omarchy theme
-
-echo "Installing Zed Editor..."
-omarchy-pkg-add zed omazed
-
-# Apply Omarchy theme to Zed
-omazed setup
-
-setsid gtk-launch dev.zed.Zed

bin/omarchy-launch-screensaver

@@ -37,12 +37,6 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
       --font-size=18 \
       -e omarchy-screensaver
     ;;
-  *foot*)
-    hyprctl dispatch exec -- \
-      foot --app-id=org.omarchy.screensaver \
-      --config="$OMARCHY_PATH/default/foot/screensaver.ini" \
-      -e omarchy-screensaver
-    ;;
   *kitty*)
     hyprctl dispatch exec -- \
       kitty --class=org.omarchy.screensaver \
@@ -51,7 +45,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
       -e omarchy-screensaver
     ;;
   *)
-    notify-send -u low "✋  Screensaver only runs in Alacritty, Foot, Ghostty, or Kitty"
+    notify-send -u low "✋  Screensaver only runs in Alacritty, Ghostty, or Kitty"
     ;;
   esac
 done

bin/omarchy-menu

@@ -93,10 +93,8 @@ show_learn_menu() {
 }
 
 show_trigger_menu() {
-  case $(menu "Trigger" "󰔛  Reminder\n  Capture\n󰧸  Transcode\n  Share\n󰔎  Toggle\n  Hardware") in
-  *Reminder*) show_reminder_menu ;;
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle\n  Hardware") in
   *Capture*) show_capture_menu ;;
-  *Transcode*) omarchy-transcode || back_to show_trigger_menu ;;
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
   *Hardware*) show_hardware_menu ;;
@@ -104,46 +102,10 @@ show_trigger_menu() {
   esac
 }
 
-show_reminder_menu() {
-  case $(menu "Reminder" "󰔛  Set one\n󰔛  Show all\n󰔛  Clear all") in
-  *Set*) show_custom_reminder_input ;;
-  *"Show all"*) omarchy-reminder show ;;
-  *"Clear all"*) omarchy-reminder clear ;;
-  *) back_to show_trigger_menu ;;
-  esac
-}
-
-show_custom_reminder_input() {
-  local minutes
-  minutes=$(omarchy-menu-input "Remind in minutes")
-
-  if [[ $minutes =~ ^[0-9]+$ ]] && ((minutes > 0)); then
-    show_reminder_message_input "$minutes"
-  elif [[ -n $minutes ]]; then
-    omarchy-notification-send "󰔛" "Invalid reminder" "Enter the number of minutes" -u critical
-    show_custom_reminder_input
-  else
-    back_to show_reminder_menu
-  fi
-}
-
-show_reminder_message_input() {
-  local minutes="$1"
-  local message
-  message=$(omarchy-menu-input "Reminder message")
-
-  if [[ -n $message ]]; then
-    omarchy-reminder "$minutes" "$message"
-  else
-    omarchy-reminder "$minutes"
-  fi
-}
-
 show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰴑  Text Extraction\n󰃉  Color") in
+  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
   *Screenshot*) omarchy-capture-screenshot ;;
   *Screenrecord*) show_screenrecord_menu ;;
-  *Text*) omarchy-capture-text-extraction ;;
   *Color*) pkill hyprpicker || hyprpicker -a ;;
   *) back_to show_trigger_menu ;;
   esac
@@ -204,13 +166,12 @@ show_share_menu() {
 }
 
 show_toggle_menu() {
-  local options="󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰂛  Notifications\n󰍜  Top Bar\n󱂬  Workspace Layout\n  Window Gaps\n  1-Window Ratio\n󰍹  Monitor Scaling\n  Direct Boot\n󰟵  Passwordless Sudo"
+  local options="󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar\n󱂬  Workspace Layout\n  Window Gaps\n  1-Window Ratio\n󰍹  Monitor Scaling\n  Direct Boot\n󰟵  Passwordless Sudo"
 
   case $(menu "Toggle" "$options") in
   *Screensaver*) omarchy-toggle-screensaver ;;
   *Nightlight*) omarchy-toggle-nightlight ;;
   *Idle*) omarchy-toggle-idle ;;
-  *Notifications*) omarchy-toggle-notification-silencing ;;
   *Bar*) omarchy-toggle-waybar ;;
   *Layout*) omarchy-hyprland-workspace-layout-toggle ;;
   *Ratio*) omarchy-hyprland-window-single-square-aspect-toggle ;;
@@ -233,18 +194,13 @@ show_hardware_menu() {
     options="$options\n󰟸  Touchpad"
   fi
 
-  if omarchy-hw-dell-xps-haptic-touchpad && omarchy-cmd-present dell-xps-touchpad-haptics; then
-    options="$options\n󰌌  Touchpad Haptics"
-  fi
-
   if omarchy-hw-touchscreen; then
     options="$options\n󰆽  Touchscreen"
   fi
 
   case $(menu "Toggle" "$options") in
   *Laptop*) omarchy-hyprland-monitor-internal toggle ;;
-  *Mirror*) omarchy-hyprland-monitor-internal-mirror toggle ;;
-  *Haptics*) show_hardware_touchpad_haptics_menu ;;
+  *Mirror*) omarchy-hyprland-monitor-internal-mirror toggle;;
   *Touchpad*) omarchy-toggle-touchpad ;;
   *Touchscreen*) omarchy-toggle-touchscreen ;;
   *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
@@ -252,17 +208,6 @@ show_hardware_menu() {
   esac
 }
 
-show_hardware_touchpad_haptics_menu() {
-  local current=$(dell-xps-touchpad-haptics get)
-  local selected=$(menu "Touchpad Haptics" "low\nmid\nhigh" "" "$current")
-
-  if [[ -n $selected ]]; then
-    dell-xps-touchpad-haptics set "$selected"
-  else
-    back_to show_hardware_menu
-  fi
-}
-
 show_style_menu() {
   case $(menu "Style" "󰸌  Theme\n󰟵  Unlock\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
@@ -270,30 +215,12 @@ show_style_menu() {
   *Font*) show_font_menu ;;
   *Background*) show_background_menu ;;
   *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
-  *Screensaver*) show_screensaver_menu ;;
-  *About*) show_about_menu ;;
+  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
 
-show_about_menu() {
-  case $(menu "About" "  Edit Text\n  Set From Image\n  Restore Default") in
-  *Text*) omarchy-branding-about text ;;
-  *Image*) omarchy-branding-about image ;;
-  *Default*) omarchy-branding-about reset ;;
-  *) show_style_menu ;;
-  esac
-}
-
-show_screensaver_menu() {
-  case $(menu "Screensaver" "  Edit Text\n  Set From Image\n  Restore Default") in
-  *Text*) omarchy-branding-screensaver text ;;
-  *Image*) omarchy-branding-screensaver image ;;
-  *Default*) omarchy-branding-screensaver reset ;;
-  *) show_style_menu ;;
-  esac
-}
-
 show_theme_menu() {
   omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
 }
@@ -315,7 +242,7 @@ show_setup_menu() {
   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 ;;
@@ -326,7 +253,6 @@ show_setup_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*) show_setup_default_menu ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
@@ -346,120 +272,15 @@ show_setup_power_menu() {
 
 show_setup_security_menu() {
   case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-setup-security-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-security-fido2 ;;
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
   *) show_setup_menu ;;
   esac
 }
 
-show_setup_default_menu() {
-  case $(menu "Default" "  Browser\n  Terminal\n  Editor") in
-  *Browser*) show_setup_default_browser_menu ;;
-  *Terminal*) show_setup_default_terminal_menu ;;
-  *Editor*) show_setup_default_editor_menu ;;
-  *) show_setup_menu ;;
-  esac
-}
-
-browser_desktop_exists() {
-  [[ -f ~/.local/share/applications/$1 || -f ~/.nix-profile/share/applications/$1 || -f /usr/share/applications/$1 ]]
-}
-
-show_setup_default_browser_menu() {
-  local options=""
-  browser_desktop_exists chromium.desktop && options="$options  Chromium"
-  browser_desktop_exists google-chrome.desktop && options="${options:+$options\n}󰊯  Chrome"
-  browser_desktop_exists brave-browser.desktop && options="${options:+$options\n}󰖟  Brave"
-  browser_desktop_exists brave-origin-beta.desktop && options="${options:+$options\n}󰖟  Brave Origin"
-  browser_desktop_exists microsoft-edge.desktop && options="${options:+$options\n}󰇩  Edge"
-  browser_desktop_exists firefox.desktop && options="${options:+$options\n}󰈹  Firefox"
-  browser_desktop_exists zen.desktop && options="${options:+$options\n}󰖟  Zen"
-
-  local current=""
-  case "$(omarchy-default-browser)" in
-  chromium) current="  Chromium" ;;
-  chrome) current="󰊯  Chrome" ;;
-  brave) current="󰖟  Brave" ;;
-  brave-origin) current="󰖟  Brave Origin" ;;
-  edge) current="󰇩  Edge" ;;
-  firefox) current="󰈹  Firefox" ;;
-  zen) current="󰖟  Zen" ;;
-  esac
-
-  case $(menu "Default Browser" "$options" "" "$current") in
-  *Chromium*) omarchy-default-browser chromium ;;
-  *Chrome*) omarchy-default-browser chrome ;;
-  *"Brave Origin"*) omarchy-default-browser brave-origin ;;
-  *Brave*) omarchy-default-browser brave ;;
-  *Edge*) omarchy-default-browser edge ;;
-  *Firefox*) omarchy-default-browser firefox ;;
-  *Zen*) omarchy-default-browser zen ;;
-  *) show_setup_default_menu ;;
-  esac
-}
-
-show_setup_default_terminal_menu() {
-  local options=""
-  omarchy-cmd-present alacritty && options="$options  Alacritty"
-  omarchy-cmd-present foot && options="${options:+$options\n}  Foot"
-  omarchy-cmd-present ghostty && options="${options:+$options\n}  Ghostty"
-  omarchy-cmd-present kitty && options="${options:+$options\n}  Kitty"
-
-  local current=""
-  case "$(omarchy-default-terminal)" in
-  alacritty) current="  Alacritty" ;;
-  foot) current="  Foot" ;;
-  ghostty) current="  Ghostty" ;;
-  kitty) current="  Kitty" ;;
-  esac
-
-  case $(menu "Default Terminal" "$options" "" "$current") in
-  *Alacritty*) omarchy-default-terminal alacritty ;;
-  *Foot*) omarchy-default-terminal foot ;;
-  *Ghostty*) omarchy-default-terminal ghostty ;;
-  *Kitty*) omarchy-default-terminal kitty ;;
-  *) show_setup_default_menu ;;
-  esac
-}
-
-show_setup_default_editor_menu() {
-  local options=""
-  omarchy-cmd-present nvim && options="$options  Neovim"
-  omarchy-cmd-present code && options="${options:+$options\n}  VSCode"
-  omarchy-cmd-present cursor && options="${options:+$options\n}  Cursor"
-  omarchy-cmd-present zeditor && options="${options:+$options\n}  Zed"
-  omarchy-cmd-present sublime_text && options="${options:+$options\n}  Sublime Text"
-  omarchy-cmd-present helix && options="${options:+$options\n}  Helix"
-  omarchy-cmd-present vim && options="${options:+$options\n}  Vim"
-  omarchy-cmd-present emacs && options="${options:+$options\n}  Emacs"
-
-  local current=""
-  case "$(omarchy-default-editor)" in
-  nvim) current="  Neovim" ;;
-  code) current="  VSCode" ;;
-  cursor) current="  Cursor" ;;
-  zed | zeditor) current="  Zed" ;;
-  sublime_text) current="  Sublime Text" ;;
-  helix) current="  Helix" ;;
-  vim) current="  Vim" ;;
-  emacs) current="  Emacs" ;;
-  esac
-
-  case $(menu "Default Editor" "$options" "" "$current") in
-  *Neovim*) omarchy-default-editor nvim ;;
-  *VSCode*) omarchy-default-editor code ;;
-  *Cursor*) omarchy-default-editor cursor ;;
-  *Zed*) omarchy-default-editor zed ;;
-  *Sublime*) omarchy-default-editor sublime_text ;;
-  *Helix*) omarchy-default-editor helix ;;
-  *Vim*) omarchy-default-editor vim ;;
-  *Emacs*) omarchy-default-editor emacs ;;
-  *) show_setup_default_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 ;;
@@ -496,7 +317,7 @@ show_setup_system_menu() {
 }
 
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n  Browser\n󱚤  AI\n  Gaming\n󰍲  Windows") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n󰍲  Windows\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -506,26 +327,13 @@ show_install_menu() {
   *Development*) show_install_development_menu ;;
   *Editor*) show_install_editor_menu ;;
   *Terminal*) show_install_terminal_menu ;;
-  *Browser*) show_install_browser_menu ;;
-  *Gaming*) show_install_gaming_menu ;;
   *AI*) show_install_ai_menu ;;
   *Windows*) present_terminal "omarchy-windows-vm install" ;;
+  *Gaming*) show_install_gaming_menu ;;
   *) show_main_menu ;;
   esac
 }
 
-show_install_browser_menu() {
-  case $(menu "Install" "  Chrome\n  Edge\n  Brave\n  Brave Origin\n  Firefox\n󰖟  Zen") in
-  *Chrome*) present_terminal "omarchy-install-browser chrome" ;;
-  *Edge*) present_terminal "omarchy-install-browser edge" ;;
-  *"Brave Origin"*) present_terminal "omarchy-install-browser brave-origin" ;;
-  *Brave*) present_terminal "omarchy-install-browser brave" ;;
-  *Firefox*) present_terminal "omarchy-install-browser firefox" ;;
-  *Zen*) present_terminal "omarchy-install-browser zen" ;;
-  *) show_install_menu ;;
-  esac
-}
-
 show_install_service_menu() {
   case $(menu "Install" "  Dropbox\n  Tailscale\n󱇱  NordVPN [AUR]\n󰏖  ONCE\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
@@ -539,22 +347,20 @@ show_install_service_menu() {
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Vim\n  Emacs") in
+  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*) present_terminal omarchy-install-zed ;;
+  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) present_terminal omarchy-install-helix ;;
-  *Vim*) install "Vim" "vim" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_terminal_menu() {
-  case $(menu "Install" "  Alacritty\n  Foot\n  Ghostty\n  Kitty") in
+  case $(menu "Install" "  Alacritty\n  Ghostty\n  Kitty") in
   *Alacritty*) install_terminal "alacritty" ;;
-  *Foot*) install_terminal "foot" ;;
   *Ghostty*) install_terminal "ghostty" ;;
   *Kitty*) install_terminal "kitty" ;;
   *) show_install_menu ;;
@@ -578,16 +384,12 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n  Xbox Cloud Gaming\n󰂯  Xbox Controller\n󰍹  Moonlight (GameStream)\n  Lutris (Battle.net)\n󱓟  Heroic (Epic Games)") in
-  *Steam*) present_terminal omarchy-install-gaming-steam ;;
-  *RetroArch*) present_terminal omarchy-install-gaming-retroarch ;;
+  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" ;;
-  *GeForce*) present_terminal omarchy-install-gaming-geforce-now ;;
-  *"Xbox Cloud"*) present_terminal omarchy-install-gaming-xbox-cloud ;;
-  *Xbox*) present_terminal omarchy-install-gaming-xbox-controllers ;;
-  *Lutris*) present_terminal omarchy-install-gaming-lutris ;;
-  *Heroic*) present_terminal omarchy-install-gaming-heroic ;;
-  *Moonlight*) present_terminal omarchy-install-gaming-moonlight ;;
+  *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac
 }
@@ -602,12 +404,12 @@ show_install_style_menu() {
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Cascadia Mono\n  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bitstream Vera Mono\n  Iosevka" "--width 350") in
+  case $(menu "Install" "  Cascadia Mono\n  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
   *Cascadia*) install_font "Cascadia Mono" "ttf-cascadia-mono-nerd" "CaskaydiaMono Nerd Font" ;;
   *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" ;;
-  *Bitstream*) install_font "Bitstream Vera Code" "ttf-bitstream-vera-mono-nerd" "BitstromWera 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
@@ -660,57 +462,21 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰸌  Theme\n  Browser\n  Dictation\n  Gaming\n󰍲  Windows\n󰏓  Preinstalls\n  Security") 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 ;;
-  *Theme*) present_terminal omarchy-theme-remove ;;
-  *Browser*) show_remove_browser_menu ;;
-  *Dictation*) present_terminal omarchy-voxtype-remove ;;
-  *Gaming*) show_remove_gaming_menu ;;
-  *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Preinstalls*) present_terminal omarchy-remove-preinstalls ;;
-  *Security*) show_remove_security_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" ;;
+  *Fido2*) present_terminal "omarchy-setup-fido2 --remove" ;;
   *) show_main_menu ;;
   esac
 }
 
-show_remove_security_menu() {
-  case $(menu "Remove" "󰈷  Fingerprint\n  Fido2") in
-  *Fingerprint*) present_terminal omarchy-remove-security-fingerprint ;;
-  *Fido2*) present_terminal omarchy-remove-security-fido2 ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_browser_menu() {
-  case $(menu "Remove" "  Chrome\n  Edge\n  Brave\n  Brave Origin\n  Firefox\n  Zen") in
-  *Chrome*) present_terminal "omarchy-remove-browser chrome" ;;
-  *Edge*) present_terminal "omarchy-remove-browser edge" ;;
-  *"Brave Origin"*) present_terminal "omarchy-remove-browser brave-origin" ;;
-  *Brave*) present_terminal "omarchy-remove-browser brave" ;;
-  *Firefox*) present_terminal "omarchy-remove-browser firefox" ;;
-  *Zen*) present_terminal "omarchy-remove-browser zen" ;;
-  *) show_remove_menu ;;
-  esac
-}
-
-show_remove_gaming_menu() {
-  case $(menu "Remove" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n  Xbox Cloud Gaming\n󰖺  Xbox Controller (󰂯)\n󰍹  Moonlight (GameStream)\n  Lutris (Battle.net)\n󱓟  Heroic (Epic Games)") in
-  *Steam*) present_terminal omarchy-remove-gaming-steam ;;
-  *RetroArch*) present_terminal omarchy-remove-gaming-retroarch ;;
-  *Minecraft*) present_terminal omarchy-remove-gaming-minecraft ;;
-  *GeForce*) present_terminal omarchy-remove-gaming-geforce-now ;;
-  *"Xbox Cloud"*) present_terminal omarchy-remove-gaming-xbox-cloud ;;
-  *Xbox*) present_terminal omarchy-remove-gaming-xbox-controllers ;;
-  *Moonlight*) present_terminal omarchy-remove-gaming-moonlight ;;
-  *Lutris*) present_terminal omarchy-remove-gaming-lutris ;;
-  *Heroic*) present_terminal omarchy-remove-gaming-heroic ;;
-  *) 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\n  Scala") in
   *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
@@ -820,7 +586,7 @@ show_update_hardware_menu() {
 
 show_update_password_menu() {
   case $(menu "Update Password" "  Drive Encryption\n  User") in
-  *Drive*) present_terminal omarchy-drive-password ;;
+  *Drive*) present_terminal omarchy-drive-set-password ;;
   *User*) present_terminal passwd ;;
   *) show_update_menu ;;
   esac
@@ -860,8 +626,6 @@ go_to_menu() {
   *toggle*) show_toggle_menu ;;
   *hardware*) show_hardware_menu ;;
   *share*) show_share_menu ;;
-  *reminder-set*) show_custom_reminder_input ;;
-  *reminder*) show_reminder_menu ;;
   *background*) show_background_menu ;;
   *capture*) show_capture_menu ;;
   *style*) show_style_menu ;;

bin/omarchy-menu-file

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Pick a file with Walker
-# omarchy:group=menu
-# omarchy:name=file
-# omarchy:args=label paths formats [walker args...]
-# omarchy:examples=omarchy menu file "Select image" "$HOME/Pictures" "jpg png webp"|omarchy-menu-file "Select media" "$HOME/Pictures:$HOME/Videos" "jpg png mp4 mov" --width 800
-
-set -euo pipefail
-
-if (( $# < 3 )); then
-  echo "Usage: omarchy-menu-file <label> <paths> <formats> [walker args...]" >&2
-  exit 1
-fi
-
-label="$1"
-paths_arg="$2"
-formats_arg="$3"
-shift 3
-
-IFS=: read -r -a paths <<<"$paths_arg"
-read -r -a formats <<<"$formats_arg"
-
-if (( ${#paths[@]} == 0 || ${#formats[@]} == 0 )); then
-  echo "Usage: omarchy-menu-file <label> <paths> <formats> [walker args...]" >&2
-  exit 1
-fi
-
-for path in "${paths[@]}"; do
-  [[ -e $path ]] || { echo "Path not found: $path" >&2; exit 1; }
-done
-
-find_args=("${paths[@]}" "(" -type d -name ".*" ! -name "." -prune ")" -o -type f ! -name ".*" "(")
-first_format=true
-for format in "${formats[@]}"; do
-  if [[ $first_format == "true" ]]; then
-    first_format=false
-  else
-    find_args+=(-o)
-  fi
-
-  format="${format#.}"
-  find_args+=(-iname "*.$format")
-done
-find_args+=(")" -printf '%T@\t%p\n')
-
-find "${find_args[@]}" 2>/dev/null | sort -rn | cut -f2- |
-  omarchy-launch-walker --dmenu --width 800 --minheight 1 --maxheight 500 -p "$label…" "$@" 2>/dev/null

bin/omarchy-menu-input

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Prompt for text input with Walker
-# omarchy:group=menu
-# omarchy:name=input
-# omarchy:args=prompt [walker args...]
-# omarchy:examples=omarchy menu input Reminder|omarchy-menu-input "Reminder in minutes" --width 400
-
-set -euo pipefail
-
-prompt="${1:-Input}"
-if (( $# > 0 )); then
-  shift
-fi
-
-omarchy-launch-walker --dmenu --inputonly --width 295 --minheight 1 --maxheight 1 -p "$prompt…" "$@" 2>/dev/null

bin/omarchy-menu-select

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Pick one option with Walker
-# omarchy:group=menu
-# omarchy:name=select
-# omarchy:args=prompt option... [-- walker args...]
-# omarchy:examples=omarchy menu select Format jpg png|omarchy-menu-select Resolution 4k 1080p 720p -- --width 400
-
-set -euo pipefail
-
-if (( $# < 2 )); then
-  echo "Usage: omarchy-menu-select <prompt> <option>... [-- walker args...]" >&2
-  exit 1
-fi
-
-prompt="$1"
-shift
-
-options=()
-walker_args=()
-
-while (( $# > 0 )); do
-  if [[ $1 == "--" ]]; then
-    shift
-    walker_args=("$@")
-    break
-  fi
-
-  options+=("$1")
-  shift
-done
-
-if (( ${#options[@]} == 0 )); then
-  echo "Usage: omarchy-menu-select <prompt> <option>... [-- walker args...]" >&2
-  exit 1
-fi
-
-printf '%s\n' "${options[@]}" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 300 -p "$prompt…" "${walker_args[@]}" 2>/dev/null

bin/omarchy-notification-send

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Send a desktop notification with Omarchy glyph and body spacing
-# omarchy:args=<glyph> <headline> [description] [notify-send options]
-# omarchy:examples=omarchy notification send "󰔛" "Reminder" "5 minutes are up" -u critical
-
-set -euo pipefail
-
-if (($# < 2)); then
-  echo "Usage: omarchy-notification-send <glyph> <headline> [description] [notify-send options]"
-  exit 1
-fi
-
-glyph=$1
-headline=$2
-description=${3:-}
-shift 2
-
-if (($# > 0)) && [[ $1 != -* ]]; then
-  shift
-else
-  description=""
-fi
-
-summary="$glyph    $headline"
-
-if [[ -n $description ]]; then
-  description=$(sed 's/^/      /' <<<"$description")
-  notify-send "$@" "$summary" "$description"
-else
-  notify-send "$@" "$summary"
-fi

bin/omarchy-pkg-add

@@ -1,8 +1,10 @@
 #!/bin/bash
 
 # omarchy:summary=Install Arch packages if they are missing
+# omarchy:group=install
+# omarchy:name=package
 # omarchy:args=<packages...>
-# omarchy:examples=omarchy pkg add jq ripgrep
+# omarchy:examples=omarchy install package jq ripgrep
 # omarchy:requires-sudo=true
 
 if omarchy-pkg-missing "$@"; then

bin/omarchy-pkg-drop

@@ -4,13 +4,8 @@
 # omarchy:args=<packages...>
 # omarchy:requires-sudo=true
 
-installed=()
 for pkg in "$@"; do
   if pacman -Q "$pkg" &>/dev/null; then
-    installed+=("$pkg")
+    sudo pacman -Rns --noconfirm "$pkg"
   fi
 done
-
-if (( ${#installed[@]} > 0 )); then
-  sudo pacman -Rns --noconfirm "${installed[@]}"
-fi

bin/omarchy-plymouth-preview

@@ -2,7 +2,6 @@
 
 # omarchy:summary=Preview a Plymouth boot screen with custom colors and logo
 # omarchy:args=<background-hex> <text-hex> <path-to-logo.png> <output-path>
-# omarchy:examples=omarchy plymouth preview '#1d2021' '#ebdbb2' ~/.config/omarchy/current/theme/plymouth/logo.png /tmp/plymouth-preview.png
 
 # Render a Plymouth login-screen preview PNG by compositing the staged omarchy
 # theme assets (recolored with the given text color) onto the background.

bin/omarchy-plymouth-set

@@ -2,7 +2,6 @@
 
 # omarchy:summary=Set the Plymouth boot theme colors and logo
 # omarchy:args=<background-hex> <text-hex> <path-to-logo.png>
-# omarchy:examples=omarchy plymouth set '#1d2021' '#ebdbb2' ~/.config/omarchy/current/theme/plymouth/logo.png
 # omarchy:requires-sudo=true
 
 # Configure the Plymouth boot theme with a custom background color, text color, and logo.
@@ -68,16 +67,10 @@ sddm_dir="/usr/share/sddm/themes/omarchy"
 sddm_template="$HOME/.local/share/omarchy/default/sddm/omarchy/Main.qml"
 
 sed \
-  -e "s/#1a1b26/#$bg_hex/g" \
+  -e "s/#000000/#$bg_hex/g" \
   -e "s/#ffffff/#$text_hex/g" \
+  -e 's|source: "logo.svg"|source: "logo.png"|' \
   "$sddm_template" | sudo tee "$sddm_dir/Main.qml" >/dev/null
 
 sudo cp "$logo_path" "$sddm_dir/logo.png"
-for asset in bullet.png entry.png lock.png; do
-  sudo cp "$staging_dir/$asset" "$sddm_dir/$asset"
-done
-for asset in entry lock; do
-  magick "$staging_dir/$asset.png" -channel RGB +level-colors "#f7768e","#f7768e" "$staging_dir/$asset-failed.png"
-  sudo cp "$staging_dir/$asset-failed.png" "$sddm_dir/$asset-failed.png"
-done
 sudo rm -f "$sddm_dir/logo.svg"

bin/omarchy-refresh-applications

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Ensure all default .desktop, web apps, TUIs, and npx wrappers are installed.
+# omarchy:summary=Ensure all default .desktop, web apps, and TUIs are installed.
 
 mkdir -p ~/.local/share/icons/hicolor/48x48/apps/
 cp ~/.local/share/omarchy/applications/icons/*.png ~/.local/share/icons/hicolor/48x48/apps/
@@ -11,14 +11,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/
 
-if omarchy-cmd-present foot; then
-  cp ~/.local/share/omarchy/default/foot/foot.desktop ~/.local/share/applications/
-fi
-
-# Refresh the webapps, TUIs, and npx wrappers
+# 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
-bash $OMARCHY_PATH/install/packaging/npx.sh
 
 update-desktop-database ~/.local/share/applications

bin/omarchy-refresh-plymouth

@@ -3,7 +3,7 @@
 # omarchy:summary=Overwrite the user config for the Plymouth drive decryption and boot sequence with the Omarchy default and rebuild it.
 # omarchy:requires-sudo=true
 
-sudo cp -r ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
 sudo plymouth-set-default-theme omarchy
 
 if command -v limine-mkinitcpio &>/dev/null; then

bin/omarchy-refresh-walker

@@ -16,11 +16,5 @@ omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
 
-# Link all elephant menus
-mkdir -p ~/.config/elephant/menus
-for menu in $OMARCHY_PATH/default/elephant/*.lua; do
-  ln -snf "$menu" ~/.config/elephant/menus/"$(basename "$menu")"
-done
-
 # Restart service
 omarchy-restart-walker

bin/omarchy-reinstall-git

@@ -6,6 +6,6 @@ set -e
 
 # Reinstall the Omarchy configuration directory from the git source.
 
-git clone --depth=1 --branch master "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+git clone --depth=1 "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-reminder

@@ -1,139 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set and show lightweight desktop notification reminders
-# omarchy:args=<minutes> [message] | show | clear
-# omarchy:examples=omarchy reminder 5 | omarchy reminder 30 "Check the oven" | omarchy reminder show | omarchy reminder clear
-
-set -euo pipefail
-
-format_remaining() {
-  local seconds=$1
-  local minutes=$((seconds / 60))
-  local remainder=$((seconds % 60))
-
-  if ((minutes > 0 && remainder > 0)); then
-    echo "${minutes}m ${remainder}s"
-  elif ((minutes > 0)); then
-    echo "${minutes}m"
-  else
-    echo "${remainder}s"
-  fi
-}
-
-parse_systemd_timespan() {
-  local timespan="$1"
-  local total=0
-  local value unit whole
-
-  while read -r value unit; do
-    whole=${value%.*}
-
-    case $unit in
-    d) total=$((total + whole * 86400)) ;;
-    h) total=$((total + whole * 3600)) ;;
-    min) total=$((total + whole * 60)) ;;
-    s) total=$((total + whole)) ;;
-    ms | us) ;;
-    esac
-  done < <(grep -oE '[0-9]+([.][0-9]+)?(d|h|min|s|ms|us)' <<<"$timespan" | sed -E 's/^([0-9.]+)([a-z]+)$/\1 \2/')
-
-  echo "$total"
-}
-
-show_reminders() {
-  local timers timer next next_seconds uptime remaining body=""
-  local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
-  local reminder_message=""
-
-  timers=$(systemctl --user list-timers --all --no-legend --no-pager "omarchy-reminder-*.timer" 2>/dev/null | awk '{ print $(NF - 1) }')
-  uptime=${SECONDS_SINCE_BOOT:-$(awk '{ print int($1) }' /proc/uptime)}
-
-  for timer in $timers; do
-    next=$(systemctl --user show -P NextElapseUSecMonotonic "$timer" 2>/dev/null || true)
-    [[ -z $next ]] && continue
-
-    next_seconds=$(parse_systemd_timespan "$next")
-    ((next_seconds <= uptime)) && continue
-
-    remaining=$((next_seconds - uptime))
-    reminder=${timer%.timer}
-    reminder=${reminder#omarchy-reminder-}
-    set_at=${reminder##*-}
-    reminder_minutes=${reminder%%m-*}
-    reminder_message=""
-    [[ -f $reminder_dir/${timer%.timer}.message ]] && reminder_message=$(<"$reminder_dir/${timer%.timer}.message")
-
-    if [[ -n $reminder_message ]]; then
-      body+="$reminder_message in $(format_remaining $remaining) ($(date -d "@$((set_at + reminder_minutes * 60))" +%-H:%M))"$'\n'
-    else
-      body+="${reminder_minutes}-min reminder in $(format_remaining $remaining) ($(date -d "@$((set_at + reminder_minutes * 60))" +%-H:%M))"$'\n'
-    fi
-  done
-
-  if [[ -z $body ]]; then
-    omarchy-notification-send "󰔛" "Upcoming reminders" "No outstanding reminders" -u low
-  else
-    omarchy-notification-send "󰔛" "Upcoming reminders" "${body%$'\n'}" -u low
-  fi
-}
-
-clear_reminders() {
-  local units
-  local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
-
-  units=$(systemctl --user list-timers --all --no-legend --no-pager "omarchy-reminder-*.timer" 2>/dev/null | awk '{ print $(NF - 1), $NF }')
-
-  if [[ -n $units ]]; then
-    xargs -r systemctl --user stop <<<"$units" || true
-  fi
-
-  rm -f "$reminder_dir"/omarchy-reminder-*.message 2>/dev/null || true
-  omarchy-notification-send "󰔛" "All reminders have been cleared" -u low
-}
-
-case ${1:-} in
-show | list)
-  show_reminders
-  exit 0
-  ;;
-clear)
-  clear_reminders
-  exit 0
-  ;;
-esac
-
-minutes=${1:-}
-shift || true
-message="$*"
-custom_message="$message"
-
-if [[ -z $minutes ]] || [[ ! $minutes =~ ^[0-9]+$ ]] || ((minutes == 0)); then
-  echo "Usage: omarchy-reminder <minutes> [message]"
-  echo "       omarchy-reminder show"
-  echo "       omarchy-reminder clear"
-  exit 1
-fi
-
-if [[ -z $message ]]; then
-  message="Your ${minutes} minutes are up"
-fi
-
-set_at=$(date +%s)
-remind_at=$(date -d "+${minutes} minutes" +%H:%M)
-unit="omarchy-reminder-${minutes}m-$set_at"
-reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
-message_file="$reminder_dir/$unit.message"
-confirmation="You'll be reminded at $remind_at"
-confirmation_title="Reminder set for ${minutes} minutes"
-
-mkdir -p "$reminder_dir"
-
-if [[ -n $custom_message ]]; then
-  printf "%s" "$custom_message" >"$message_file"
-  confirmation_title="$custom_message in ${minutes} minutes"
-fi
-
-systemd-run --user --quiet --collect --on-active="${minutes}m" --unit="$unit" \
-  bash -c 'omarchy-notification-send "󰔛" "Reminder" "$1" -u critical; rm -f "$2"' bash "$message" "$message_file"
-
-omarchy-notification-send "󰔛" "$confirmation_title" "$confirmation" -u low

bin/omarchy-remove-browser

@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove a supported browser and clean up Omarchy browser defaults
-# omarchy:args=<chrome|brave|brave-origin|edge|firefox|zen>
-# omarchy:examples=omarchy remove browser firefox | omarchy remove browser brave
-# omarchy:requires-sudo=true
-
-set_fallback_default_browser() {
-  local current_browser
-  current_browser=$(xdg-settings get default-web-browser)
-
-  if [[ $current_browser != "$1" ]]; then
-    return
-  fi
-
-  if omarchy-cmd-present chromium; then
-    xdg-settings set default-web-browser chromium.desktop
-    xdg-mime default chromium.desktop x-scheme-handler/http
-    xdg-mime default chromium.desktop x-scheme-handler/https
-    xdg-mime default chromium.desktop text/html
-  fi
-}
-
-case $1 in
-chrome)
-  echo "Removing Chrome..."
-  set_fallback_default_browser google-chrome.desktop
-  omarchy-pkg-drop google-chrome
-  rm -f ~/.config/chrome-flags.conf
-  sudo rm -f /etc/opt/chrome/policies/managed/color.json
-  ;;
-edge)
-  echo "Removing Edge..."
-  set_fallback_default_browser microsoft-edge.desktop
-  omarchy-pkg-drop microsoft-edge-stable-bin
-  rm -f ~/.config/microsoft-edge-stable-flags.conf
-  sudo rm -f /etc/opt/edge/policies/managed/color.json
-  ;;
-brave)
-  echo "Removing Brave..."
-  set_fallback_default_browser brave-browser.desktop
-  omarchy-pkg-drop brave-bin
-  rm -f ~/.config/brave-flags.conf
-
-  if omarchy-pkg-missing brave-origin-beta-bin; then
-    sudo rm -rf /etc/brave
-  fi
-  ;;
-brave-origin)
-  echo "Removing Brave Origin..."
-  set_fallback_default_browser brave-origin-beta.desktop
-  omarchy-pkg-drop brave-origin-beta-bin
-  rm -f ~/.config/brave-origin-beta-flags.conf
-
-  if omarchy-pkg-missing brave-bin; then
-    sudo rm -rf /etc/brave
-  fi
-  ;;
-firefox)
-  echo "Removing Firefox..."
-  set_fallback_default_browser firefox.desktop
-  omarchy-pkg-drop firefox
-  ;;
-zen)
-  echo "Removing Zen..."
-  set_fallback_default_browser zen.desktop
-  omarchy-pkg-drop zen-browser-bin
-  ;;
-*)
-  echo "Usage: omarchy-remove-browser <chrome|brave|brave-origin|edge|firefox|zen>"
-  exit 1
-  ;;
-esac

bin/omarchy-remove-gaming-geforce-now

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove the GeForce NOW Flatpak app and its data.
-
-set -e
-
-if command -v flatpak >/dev/null && flatpak info com.nvidia.geforcenow &>/dev/null; then
-  flatpak uninstall -y --delete-data com.nvidia.geforcenow
-fi
-
-echo ""
-echo "GeForce NOW removed."

bin/omarchy-remove-gaming-heroic

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove Heroic Games Launcher and its game libraries, configs, and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop heroic-games-launcher-bin
-
-rm -rf \
-  "$HOME/.config/heroic" \
-  "$HOME/.local/share/heroic" \
-  "$HOME/.cache/heroic" \
-  "$HOME/Games/Heroic"
-
-echo ""
-echo "Heroic and its data have been removed."

bin/omarchy-remove-gaming-lutris

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove Lutris, Wine, umu-launcher, and all their configs and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop lutris wine-staging wine-mono wine-gecko winetricks python-protobuf umu-launcher
-
-rm -rf \
-  "$HOME/.config/lutris" \
-  "$HOME/.local/share/lutris" \
-  "$HOME/.cache/lutris" \
-  "$HOME/.local/share/umu" \
-  "$HOME/.cache/umu" \
-  "$HOME/.wine" \
-  "$HOME/.cache/wine" \
-  "$HOME/.cache/winetricks"
-
-echo ""
-echo "Lutris, Wine, umu-launcher, and their configs have been removed."

bin/omarchy-remove-gaming-minecraft

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove the Minecraft launcher along with its worlds, mods, and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop minecraft-launcher
-
-rm -rf \
-  "$HOME/.minecraft" \
-  "$HOME/.config/Minecraft Launcher" \
-  "$HOME/.local/share/minecraft-launcher" \
-  "$HOME/.cache/minecraft"
-
-echo ""
-echo "Minecraft and its data have been removed."

bin/omarchy-remove-gaming-moonlight

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove Moonlight and its configs and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop moonlight-qt
-
-rm -rf \
-  "$HOME/.config/Moonlight Game Streaming Project" \
-  "$HOME/.cache/Moonlight Game Streaming Project"
-
-echo ""
-echo "Moonlight and its data have been removed."

bin/omarchy-remove-gaming-retroarch

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove RetroArch, all libretro cores, and its config/saves. Leaves ~/Games/roms and ~/Games/bios alone.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop \
-  retroarch \
-  retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
-  libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
-  libretro-blastem \
-  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
-  libretro-core-info \
-  libretro-desmume libretro-dolphin libretro-flycast \
-  libretro-gambatte libretro-genesis-plus-gx \
-  libretro-kronos \
-  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
-  libretro-nestopia \
-  libretro-overlays \
-  libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \
-  libretro-sameboy libretro-scummvm libretro-shaders-slang libretro-snes9x \
-  libretro-yabause \
-  libretro-cap32-git libretro-fbneo-git libretro-uae-git \
-  libretro-vice-x128-git libretro-vice-x64-git libretro-vice-x64dtv-git libretro-vice-x64sc-git \
-  libretro-vice-xcbm2-git libretro-vice-xcbm5x0-git libretro-vice-xpet-git \
-  libretro-vice-xplus4-git libretro-vice-xscpu64-git libretro-vice-xvic-git \
-  retroarch-joypad-autoconfig-git
-
-rm -rf \
-  "$HOME/.config/retroarch" \
-  "$HOME/.local/share/retroarch" \
-  "$HOME/.cache/retroarch"
-
-echo ""
-echo "RetroArch and its cores have been removed."
-echo "ROMs and BIOS files at ~/Games/roms and ~/Games/bios were left in place."

bin/omarchy-remove-gaming-steam

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove Steam and all of its game libraries, configs, and caches.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop steam
-
-rm -rf \
-  "$HOME/.steam" \
-  "$HOME/.local/share/Steam" \
-  "$HOME/.config/steam" \
-  "$HOME/.cache/steam"
-
-echo ""
-echo "Steam and its data have been removed."

bin/omarchy-remove-gaming-xbox-cloud

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove the Xbox Cloud Gaming web app.
-
-set -e
-
-omarchy-webapp-remove "Xbox Cloud Gaming"

bin/omarchy-remove-gaming-xbox-controllers

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove the xpadneo Xbox controller driver and undo its module/blacklist config.
-# omarchy:requires-sudo=true
-
-set -e
-
-omarchy-pkg-drop xpadneo-dkms
-
-sudo rm -f /etc/modprobe.d/blacklist-xpad.conf /etc/modules-load.d/xpadneo.conf
-
-echo ""
-echo "Xbox controller support removed. Reboot to fully unload xpadneo and restore xpad."

bin/omarchy-remove-security-fido2

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove FIDO2 authentication from sudo and polkit
-# omarchy:requires-sudo=true
-
-set -e
-
-
-remove_pam_config() {
-  # Remove from sudo
-  if grep -q pam_u2f.so /etc/pam.d/sudo; then
-    echo "Removing FIDO2 authentication from sudo..."
-    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/sudo
-  fi
-
-  # Remove from polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
-    echo "Removing FIDO2 authentication from polkit..."
-    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/polkit-1
-  fi
-}
-
-echo -e "\e[32mRemoving FIDO2 device from authentication.\n\e[0m"
-
-remove_pam_config
-
-if [[ -d /etc/fido2 ]]; then
-  echo "Removing FIDO2 configuration..."
-  sudo rm -rf /etc/fido2
-fi
-
-echo "Removing FIDO2 packages..."
-omarchy-pkg-drop libfido2 pam-u2f
-
-echo -e "\e[32mFIDO2 authentication has been completely removed.\e[0m"

bin/omarchy-remove-security-fingerprint

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Remove fingerprint authentication from sudo, polkit, and lock screen
-# omarchy:requires-sudo=true
-
-set -e
-
-
-remove_pam_config() {
-  # Remove from sudo
-  if grep -q pam_fprintd.so /etc/pam.d/sudo; then
-    echo "Removing fingerprint authentication from sudo..."
-    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
-  fi
-
-  # Remove from polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
-    echo "Removing fingerprint authentication from polkit..."
-    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/polkit-1
-  fi
-}
-
-remove_hyprlock_fingerprint_icon() {
-  echo "Removing fingerprint icon from hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
-}
-
-echo -e "\e[32mRemoving fingerprint scanner from authentication.\n\e[0m"
-
-remove_pam_config
-remove_hyprlock_fingerprint_icon
-
-echo "Removing fingerprint packages..."
-omarchy-pkg-drop fprintd libfprint-git
-
-echo -e "\e[32mFingerprint authentication has been completely removed.\e[0m"

bin/omarchy-restart-helix

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Reload Helix configuration
+# Reload Helix configuration (used by the Omarchy theme switching).
 
 if pgrep -x helix >/dev/null; then
   pkill -USR1 helix

bin/omarchy-restart-pipewire

@@ -2,9 +2,5 @@
 
 # omarchy:summary=Restart the PipeWire audio service to fix audio issues or apply new configuration.
 
-echo -e "Restarting PipeWire audio services...\n"
-systemctl --user restart wireplumber.service pipewire.service
-
-if systemctl --user --quiet is-active pipewire-pulse.service; then
-  systemctl --user restart pipewire-pulse.service
-fi
+echo -e "Restarting pipewire audio service...\n"
+systemctl --user restart pipewire.service

bin/omarchy-restart-swayosd

@@ -2,8 +2,4 @@
 
 # omarchy:summary=Restart the SwayOSD server
 
-systemctl --user daemon-reload
-systemctl --user stop swayosd-server.service || true
-pkill -x swayosd-server || true
-systemctl --user reset-failed swayosd-server.service || true
-systemctl --user enable --now swayosd-server.service
+omarchy-restart-app swayosd-server

bin/omarchy-restart-trackpad

@@ -4,7 +4,7 @@
 # omarchy:requires-sudo=true
 
 for dev in /sys/bus/i2c/drivers/i2c_hid_acpi/i2c-*; do
-  [[ -e $dev ]] || continue
+  [ -e "$dev" ] || continue
   I2C_DEVICE=$(basename "$dev")
   echo "Resetting $I2C_DEVICE via i2c_hid_acpi unbind/rebind..."
   echo "$I2C_DEVICE" | sudo tee /sys/bus/i2c/drivers/i2c_hid_acpi/unbind > /dev/null

bin/omarchy-restart-waybar

@@ -3,5 +3,4 @@
 # omarchy:summary=Restart Waybar
 # omarchy:examples=omarchy restart waybar
 
-pkill -9 -x waybar
-setsid uwsm-app -- waybar >/dev/null 2>&1 &
+omarchy-restart-app waybar

bin/omarchy-setup-dns

@@ -37,8 +37,8 @@ case "$dns" in
 Cloudflare)
   sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
 [Resolve]
-DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com
+FallbackDNS=9.9.9.9 149.112.112.112
 DNSOverTLS=opportunistic
 EOF
   lock_dns_to_resolved
@@ -47,8 +47,8 @@ EOF
 Google)
   sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
 [Resolve]
-DNS=8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+DNS=8.8.8.8#dns.google 8.8.4.4#dns.google
+FallbackDNS=9.9.9.9 149.112.112.112
 DNSOverTLS=opportunistic
 EOF
   lock_dns_to_resolved
@@ -74,7 +74,7 @@ Custom)
   sudo tee /etc/systemd/resolved.conf >/dev/null <<EOF
 [Resolve]
 DNS=$dns_servers
-FallbackDNS=9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+FallbackDNS=9.9.9.9 149.112.112.112
 EOF
   lock_dns_to_resolved
   ;;

bin/omarchy-setup-fido2

@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# omarchy:summary=Set up or remove FIDO2 authentication for sudo and polkit
+# omarchy:args=[--remove]
+# omarchy:requires-sudo=true
+
+set -e
+
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+print_success() {
+  echo -e "${GREEN}$1${NC}"
+}
+
+print_error() {
+  echo -e "${RED}$1${NC}"
+}
+
+print_info() {
+  echo -e "${YELLOW}$1${NC}"
+}
+
+check_fido2_hardware() {
+  tokens=$(fido2-token -L 2>/dev/null)
+  if [[ -z $tokens ]]; then
+    print_error "\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well)."
+    return 1
+  fi
+  return 0
+}
+
+setup_pam_config() {
+  # Configure sudo
+  if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
+    print_info "Configuring sudo for FIDO2 authentication..."
+    sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
+  fi
+
+  # Configure polkit
+  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
+    print_info "Configuring polkit for FIDO2 authentication..."
+    sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
+  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
+    print_info "Creating polkit configuration with FIDO2 authentication..."
+    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
+auth      required pam_unix.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+  fi
+}
+
+remove_pam_config() {
+  # Remove from sudo
+  if grep -q pam_u2f.so /etc/pam.d/sudo; then
+    print_info "Removing FIDO2 authentication from sudo..."
+    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/sudo
+  fi
+
+  # Remove from polkit
+  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
+    print_info "Removing FIDO2 authentication from polkit..."
+    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/polkit-1
+  fi
+}
+
+if [[ "--remove" == $1 ]]; then
+  print_success "Removing FIDO2 device from authentication.\n"
+
+  # Remove PAM configuration
+  remove_pam_config
+
+  # Remove FIDO2 configuration
+  if [[ -d /etc/fido2 ]]; then
+    print_info "Removing FIDO2 configuration..."
+    sudo rm -rf /etc/fido2
+  fi
+
+  # Uninstall packages
+  print_info "Removing FIDO2 packages..."
+  sudo pacman -Rns --noconfirm libfido2 pam-u2f
+
+  print_success "FIDO2 authentication has been completely removed."
+else
+  print_success "Setting up FIDO2 device for authentication.\n"
+
+  # Install required packages
+  print_info "Installing required packages..."
+  omarchy-pkg-add libfido2 pam-u2f
+
+  if ! check_fido2_hardware; then
+    exit 1
+  fi
+
+  # Create the pamu2fcfg file
+  if [[ ! -f /etc/fido2/fido2 ]]; then
+    sudo mkdir -p /etc/fido2
+    print_success "\nLet's setup your device by confirming on the device now."
+    print_info "Touch your FIDO2 key when it lights up...\n"
+
+    if pamu2fcfg >/tmp/fido2; then
+      sudo mv /tmp/fido2 /etc/fido2/fido2
+      print_success "FIDO2 device registered successfully!"
+    else
+      print_error "\nFIDO2 registration failed. Please try again."
+      exit 1
+    fi
+  else
+    print_info "FIDO2 device already registered."
+  fi
+
+  # Configure PAM
+  setup_pam_config
+
+  # Test with sudo
+  print_info "\nTesting FIDO2 authentication with sudo..."
+  print_info "Touch your FIDO2 key when prompted.\n"
+
+  if sudo echo "FIDO2 authentication test successful"; then
+    print_success "\nPerfect! FIDO2 authentication is now configured."
+    print_info "You can use your FIDO2 key for sudo and polkit authentication."
+  else
+    print_error "\nVerification failed. You may want to check your configuration."
+  fi
+fi

bin/omarchy-setup-fingerprint

@@ -0,0 +1,161 @@
+#!/bin/bash
+
+# omarchy:summary=Set up or remove fingerprint authentication for sudo, polkit, and lock screen
+# omarchy:args=[--remove]
+# omarchy:requires-sudo=true
+
+set -e
+
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+print_success() {
+  echo -e "${GREEN}$1${NC}"
+}
+
+print_error() {
+  echo -e "${RED}$1${NC}"
+}
+
+print_info() {
+  echo -e "${YELLOW}$1${NC}"
+}
+
+check_fingerprint_hardware() {
+  # 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
+  return 0
+}
+
+setup_pam_config() {
+  # Configure sudo
+  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    print_info "Configuring sudo for fingerprint authentication..."
+    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
+  fi
+
+  # Configure polkit
+  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+    print_info "Configuring polkit for fingerprint authentication..."
+    sudo sed -i '1i auth      sufficient pam_fprintd.so' /etc/pam.d/polkit-1
+  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
+    print_info "Creating polkit configuration with fingerprint authentication..."
+    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      sufficient pam_fprintd.so
+auth      required pam_unix.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+  fi
+}
+
+add_hyprlock_fingerprint_icon() {
+  print_info "Adding fingerprint icon to hyprlock placeholder text..."
+  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
+  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = true/' ~/.config/hypr/hyprlock.conf
+}
+
+remove_hyprlock_fingerprint_icon() {
+  print_info "Removing fingerprint icon from hyprlock placeholder text..."
+  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
+  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
+}
+
+remove_pam_config() {
+  # Remove from sudo
+  if grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    print_info "Removing fingerprint authentication from sudo..."
+    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
+  fi
+
+  # Remove from polkit
+  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+    print_info "Removing fingerprint authentication from polkit..."
+    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/polkit-1
+  fi
+}
+
+if [[ "--remove" == $1 ]]; then
+  print_success "Removing fingerprint scanner from authentication.\n"
+
+  # Remove PAM configuration
+  remove_pam_config
+
+  # Remove fingerprint icon from hyprlock placeholder text
+  remove_hyprlock_fingerprint_icon
+
+  # Uninstall packages
+  print_info "Removing fingerprint packages..."
+  sudo pacman -Rns --noconfirm fprintd
+
+  print_success "Fingerprint authentication has been completely removed."
+else
+  print_success "Setting up fingerprint scanner for authentication.\n"
+
+  # Install required packages
+  print_info "Installing required packages..."
+
+  # ASUS ExpertBook B9406CAA ships a FocalTech FT9349 ESS reader (USB
+  # 2808:a97a). Mainline libfprint at 1.94.x lacks the focaltech_moc
+  # driver (and its 0xa97a id_table entry); OPR ships libfprint-git
+  # which carries both. Once upstream catches up, this branch is a
+  # no-op and `libfprint-git` provides=libfprint anyway. Detect via
+  # /sys to avoid depending on usbutils being installed first.
+  for v in /sys/bus/usb/devices/*/idVendor; do
+    [[ "$(cat "$v" 2>/dev/null)" == "2808" ]] || continue
+    [[ "$(cat "${v%idVendor}idProduct" 2>/dev/null)" == "a97a" ]] || continue
+    print_info "FocalTech FT9349 detected (B9406CAA) — using libfprint-git from OPR..."
+    # libfprint-git provides+conflicts libfprint; pacman -S --noconfirm
+    # defaults the conflict prompt to N and aborts. Pre-remove libfprint
+    # with -Rdd so the install goes silent. -Rdd (not omarchy-pkg-drop's
+    # -Rns) is required because fprintd requires libfprint; the dep is
+    # re-satisfied immediately by libfprint-git's provides=libfprint.
+    if omarchy-pkg-present libfprint; then
+      sudo pacman -Rdd --noconfirm libfprint
+    fi
+    omarchy-pkg-add libfprint-git
+    break
+  done
+
+  omarchy-pkg-add fprintd usbutils
+
+  if ! check_fingerprint_hardware; then
+    exit 1
+  fi
+
+  # Configure PAM
+  setup_pam_config
+
+  # Add fingerprint icon to hyprlock placeholder text
+  add_hyprlock_fingerprint_icon
+
+  # Enroll first fingerprint
+  print_success "\nLet's setup your right index finger as the first fingerprint."
+  print_info "Keep moving the finger around on sensor until the process completes.\n"
+
+  if sudo fprintd-enroll "$USER"; then
+    print_success "\nFingerprint enrolled successfully!"
+
+    # Verify
+    print_info "\nNow let's verify that it's working correctly.\n"
+    if fprintd-verify; then
+      print_success "\nPerfect! Fingerprint authentication is now configured."
+      print_info "You can use your fingerprint for sudo, polkit, and lock screen (Super + Escape)."
+    else
+      print_error "\nVerification failed. You may want to try enrolling again."
+    fi
+  else
+    print_error "\nEnrollment failed. Please try again."
+    exit 1
+  fi
+fi

bin/omarchy-setup-security-fido2

@@ -1,81 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set up FIDO2 authentication for sudo and polkit
-# omarchy:requires-sudo=true
-
-set -e
-
-
-check_fido2_hardware() {
-  tokens=$(fido2-token -L 2>/dev/null)
-  if [[ -z $tokens ]]; then
-    echo -e "\e[31m\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well).\e[0m"
-    return 1
-  fi
-  return 0
-}
-
-setup_pam_config() {
-  # Configure sudo
-  if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
-    echo "Configuring sudo for FIDO2 authentication..."
-    sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
-  fi
-
-  # Configure polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
-    echo "Configuring polkit for FIDO2 authentication..."
-    sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
-  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
-    echo "Creating polkit configuration with FIDO2 authentication..."
-    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
-auth      required pam_unix.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-  fi
-}
-
-echo -e "\e[32mSetting up FIDO2 device for authentication.\n\e[0m"
-
-# Install required packages
-echo "Installing required packages..."
-omarchy-pkg-add libfido2 pam-u2f
-
-if ! check_fido2_hardware; then
-  exit 1
-fi
-
-# Create the pamu2fcfg file
-if [[ ! -f /etc/fido2/fido2 ]]; then
-  sudo mkdir -p /etc/fido2
-  echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
-  echo -e "Touch your FIDO2 key when it lights up...\n"
-
-  if pamu2fcfg >/tmp/fido2; then
-    sudo mv /tmp/fido2 /etc/fido2/fido2
-    echo -e "\e[32mFIDO2 device registered successfully!\e[0m"
-  else
-    echo -e "\e[31m\nFIDO2 registration failed. Please try again.\e[0m"
-    exit 1
-  fi
-else
-  echo "FIDO2 device already registered."
-fi
-
-# Configure PAM
-setup_pam_config
-
-# Test with sudo
-echo -e "\nTesting FIDO2 authentication with sudo..."
-echo -e "Touch your FIDO2 key when prompted.\n"
-
-if sudo echo "FIDO2 authentication test successful"; then
-  echo -e "\e[32m\nPerfect! FIDO2 authentication is now configured.\e[0m"
-  echo "You can use your FIDO2 key for sudo and polkit authentication."
-else
-  echo -e "\e[31m\nVerification failed. You may want to check your configuration.\e[0m"
-fi

bin/omarchy-setup-security-fingerprint

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set up fingerprint authentication for sudo, polkit, and lock screen
-# omarchy:requires-sudo=true
-
-set -e
-
-
-check_fingerprint_hardware() {
-  # Get fingerprint devices for the user
-  devices=$(fprintd-list "$USER" 2>/dev/null)
-
-  # Exit if no devices found
-  if [[ -z $devices ]]; then
-    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-    return 1
-  fi
-  return 0
-}
-
-setup_pam_config() {
-  # Configure sudo
-  if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-    echo "Configuring sudo for fingerprint authentication..."
-    sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-  fi
-
-  # Configure polkit
-  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
-    echo "Configuring polkit for fingerprint authentication..."
-    sudo sed -i '1i auth      sufficient pam_fprintd.so' /etc/pam.d/polkit-1
-  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
-    echo "Creating polkit configuration with fingerprint authentication..."
-    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
-auth      sufficient pam_fprintd.so
-auth      required pam_unix.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-  fi
-}
-
-add_hyprlock_fingerprint_icon() {
-  echo "Adding fingerprint icon to hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
-  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = true/' ~/.config/hypr/hyprlock.conf
-}
-
-echo -e "\e[32mSetting up fingerprint scanner for authentication.\n\e[0m"
-
-# Install required packages
-echo "Installing required packages..."
-
-installed_libfprint=$(pacman -Qq libfprint 2>/dev/null || true)
-
-# libfprint-git provides+conflicts libfprint; pacman -S --noconfirm
-# defaults the conflict prompt to N and aborts. Pre-remove the exact
-# libfprint package, but not an installed provider like libfprint-git.
-if [[ $installed_libfprint == "libfprint" ]]; then
-  sudo pacman -Rdd --noconfirm libfprint
-fi
-
-omarchy-pkg-add libfprint-git fprintd usbutils
-
-if ! check_fingerprint_hardware; then
-  exit 1
-fi
-
-# Configure PAM
-setup_pam_config
-
-# Add fingerprint icon to hyprlock placeholder text
-add_hyprlock_fingerprint_icon
-
-# Enroll first fingerprint
-echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\e[0m"
-echo -e "Keep moving the finger around on sensor until the process completes.\n"
-
-if sudo fprintd-enroll "$USER"; then
-  echo -e "\e[32m\nFingerprint enrolled successfully!\e[0m"
-
-  # Verify
-  echo -e "\nNow let's verify that it's working correctly.\n"
-  if fprintd-verify; then
-    echo -e "\e[32m\nPerfect! Fingerprint authentication is now configured.\e[0m"
-    echo "You can use your fingerprint for sudo, polkit, and lock screen (Super + Escape)."
-  else
-    echo -e "\e[31m\nVerification failed. You may want to try enrolling again.\e[0m"
-  fi
-else
-  echo -e "\e[31m\nEnrollment failed. Please try again.\e[0m"
-  exit 1
-fi

bin/omarchy-state

@@ -2,7 +2,6 @@
 
 # omarchy:summary=Manage persistent state files for Omarchy toggles and settings.
 # omarchy:args=<set|clear> <state-name-or-pattern>
-# omarchy:hidden=true
 
 STATE_DIR="$HOME/.local/state/omarchy"
 mkdir -p "$STATE_DIR"

bin/omarchy-swayosd-brightness

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 # omarchy:summary=Display brightness level using SwayOSD on the current monitor.
-# omarchy:args=<0-100>
-# omarchy:examples=omarchy swayosd brightness 0 | omarchy swayosd brightness 50 | omarchy swayosd brightness 100
+# omarchy:args=<percent>
 
 percent="$1"
 

bin/omarchy-swayosd-kbd-brightness

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 # omarchy:summary=Display keyboard brightness level using SwayOSD on the current monitor.
-# omarchy:args=<0-100>
-# omarchy:examples=omarchy swayosd kbd brightness 0 | omarchy swayosd kbd brightness 50 | omarchy swayosd kbd brightness 100
+# omarchy:args=<percent>
 
 percent="$1"
 

bin/omarchy-system-lock

@@ -1,16 +1,11 @@
 #!/bin/bash
 
-# omarchy:summary=Lock the computer and turn off the display
+# omarchy:summary=Lock the screen
 # omarchy:group=system
 # omarchy:name=lock
 # omarchy:examples=omarchy system lock
 
-if ! pidof hyprlock >/dev/null; then
-  (
-    hyprlock
-    omarchy-system-wake
-  ) &
-fi
+pidof hyprlock || hyprlock &
 
 # Set keyboard layout to default (first layout)
 hyprctl switchxkblayout all 0 > /dev/null 2>&1
@@ -22,12 +17,3 @@ fi
 
 # Avoid running screensaver when locked
 pkill -f org.omarchy.screensaver
-
-if [[ ${OMARCHY_LOCK_ONLY:-false} != "true" ]]; then
-  (
-    sleep 3
-    pidof hyprlock >/dev/null || exit 0
-    omarchy-brightness-keyboard off
-    omarchy-brightness-display off
-  ) &
-fi

bin/omarchy-system-wake

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Wake displays and restore brightness after idle
-# omarchy:group=system
-# omarchy:name=wake
-# omarchy:examples=omarchy system wake
-
-omarchy-brightness-display on
-omarchy-brightness-keyboard restore

bin/omarchy-theme-bg-set

@@ -9,14 +9,9 @@ if [[ -z $1 ]]; then
   exit 1
 fi
 
-BACKGROUND="$(realpath "$1")"
+BACKGROUND="$1"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-if [[ ! -f "$BACKGROUND" ]]; then
-  echo "File does not exist: $BACKGROUND" >&2
-  exit 1
-fi
-
 # Create symlink to the new background
 ln -nsf "$BACKGROUND" "$CURRENT_BACKGROUND_LINK"
 

bin/omarchy-theme-colors-from-alacritty

@@ -2,7 +2,6 @@
 
 # omarchy:summary=Generate a theme's colors.toml from its alacritty.toml palette
 # omarchy:args=<theme-dir>
-# omarchy:hidden=true
 
 set -e
 

bin/omarchy-theme-install

@@ -3,11 +3,10 @@
 # omarchy:summary=Install a theme from a git repository
 # omarchy:args=[git-repo-url]
 # omarchy:examples=omarchy theme install https://github.com/example/omarchy-example-theme.git
-# omarchy:examples=omarchy theme install git@github.com:example/omarchy-example-theme.git
 
 if [[ -z $1 ]]; then
   echo -e "\e[32mSee https://manuals.omamix.org/2/the-omarchy-manual/90/extra-themes\n\e[0m"
-  REPO_URL=$(gum input --placeholder="Git repo URL (https or git@host:org/repo.git)" --header="")
+  REPO_URL=$(gum input --placeholder="Git repo URL for theme" --header="")
 else
   REPO_URL="$1"
 fi
@@ -17,11 +16,7 @@ if [[ -z $REPO_URL ]]; then
 fi
 
 THEMES_DIR="$HOME/.config/omarchy/themes"
-
-# Strip user@host: prefix from scp-style SSH URLs so basename sees just the path
-REPO_PATH="$REPO_URL"
-[[ $REPO_PATH != *"://"* && $REPO_PATH == *:*/* ]] && REPO_PATH="${REPO_PATH#*:}"
-THEME_NAME=$(basename "$REPO_PATH" .git | sed -E 's/^omarchy-//; s/-theme$//' | tr '[:upper:]' '[:lower:]')
+THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//' | tr '[:upper:]' '[:lower:]')
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
 # Remove existing theme if present

bin/omarchy-theme-refresh

@@ -5,5 +5,5 @@
 THEME_NAME_PATH="$HOME/.config/omarchy/current/theme.name"
 
 if [[ -f $THEME_NAME_PATH ]]; then
-  OMARCHY_THEME_SKIP_BACKGROUND=1 omarchy-theme-set "$(cat $THEME_NAME_PATH)"
+  omarchy-theme-set "$(cat $THEME_NAME_PATH)"
 fi

bin/omarchy-theme-set

@@ -45,9 +45,7 @@ mv "$NEXT_THEME_PATH" "$CURRENT_THEME_PATH"
 echo "$THEME_NAME" >"$HOME/.config/omarchy/current/theme.name"
 
 # Change background with theme
-if [[ $OMARCHY_THEME_SKIP_BACKGROUND != "1" ]]; then
-  omarchy-theme-bg-next
-fi
+omarchy-theme-bg-next
 
 # Restart components to apply new theme
 if pgrep -x waybar >/dev/null; then
@@ -62,7 +60,6 @@ omarchy-restart-mako
 omarchy-restart-helix
 
 # Change app-specific themes
-omarchy-theme-set-foot
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode
@@ -70,4 +67,4 @@ omarchy-theme-set-obsidian
 omarchy-theme-set-keyboard
 
 # Call hook on theme set
-omarchy-hook theme-set "$THEME_NAME" >/dev/null
+omarchy-hook theme-set "$THEME_NAME"

bin/omarchy-theme-set-browser

@@ -1,44 +1,30 @@
 #!/bin/bash
 
-# omarchy:summary=Apply the current theme color to Chromium, Chrome, Edge, and Brave
-# omarchy:hidden=true
+# omarchy:summary=Apply the current theme color to Chromium and Brave
 
 CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme
 
-if [[ -f $CHROMIUM_THEME ]]; then
-  THEME_RGB_COLOR=$(<$CHROMIUM_THEME)
-  THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${THEME_RGB_COLOR//,/ })
-else
-  # Use a default, neutral grey if theme doesn't have a color
-  THEME_HEX_COLOR="#1c2027"
-fi
-
-set_browser_policy() {
-  local policy_dir="$1"
-
-  [[ -d $policy_dir ]] || return
-  echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\", \"BrowserColorScheme\": \"device\"}" | tee "$policy_dir/color.json" >/dev/null
-}
-
-refresh_running_browser() {
-  local process="$1"
-  local command="$2"
-  local pgrep_args="${3:--x}"
-
-  if omarchy-cmd-present "$command" && pgrep $pgrep_args "$process" >/dev/null; then
-    "$command" --refresh-platform-policy --no-startup-window &>/dev/null
+if omarchy-cmd-present chromium || omarchy-cmd-present brave || omarchy-cmd-present brave-origin-beta; then
+  if [[ -f $CHROMIUM_THEME ]]; then
+    THEME_RGB_COLOR=$(<$CHROMIUM_THEME)
+    THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${THEME_RGB_COLOR//,/ })
+  else
+    # Use a default, neutral grey if theme doesn't have a color
+    THEME_RGB_COLOR="28,32,39"
+    THEME_HEX_COLOR="#1c2027"
   fi
-}
 
-set_browser_policy /etc/chromium/policies/managed
-refresh_running_browser chromium chromium
+  if omarchy-cmd-present chromium; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\", \"BrowserColorScheme\": \"device\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
+    pgrep -x chromium >/dev/null && chromium --refresh-platform-policy --no-startup-window &>/dev/null
+  fi
 
-set_browser_policy /etc/opt/chrome/policies/managed
-refresh_running_browser chrome google-chrome-stable || refresh_running_browser chrome google-chrome
-
-set_browser_policy /etc/opt/edge/policies/managed
-refresh_running_browser msedge microsoft-edge-stable
-
-set_browser_policy /etc/brave/policies/managed
-refresh_running_browser brave brave
-refresh_running_browser brave-origin-beta brave-origin-beta -f
+  # Brave and Brave Origin Beta share /etc/brave/policies, so a single write covers both
+  if omarchy-cmd-present brave || omarchy-cmd-present brave-origin-beta; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\", \"BrowserColorScheme\": \"device\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
+    if pgrep -x brave >/dev/null; then
+      omarchy-cmd-present brave && brave --refresh-platform-policy --no-startup-window &>/dev/null
+      omarchy-cmd-present brave-origin-beta && brave-origin-beta --refresh-platform-policy --no-startup-window &>/dev/null
+    fi
+  fi
+fi

bin/omarchy-theme-set-foot

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Apply current Omarchy theme colors to running Foot terminals
-# omarchy:hidden=true
-
-foot_theme=~/.config/omarchy/current/theme/foot.ini
-
-if [[ ! -f $foot_theme ]] || ! pgrep -x foot >/dev/null; then
-  exit 0
-fi
-
-foot_osc=$(awk -F= '
-  function color(value) { return "#" value }
-  /^foreground=/ { printf "\033]10;%s\007", color($2) }
-  /^background=/ { printf "\033]11;%s\007", color($2) }
-  /^cursor=/ { split($2, parts, " "); printf "\033]12;%s\007", color(parts[2]) }
-  /^selection-background=/ { printf "\033]17;%s\007", color($2) }
-  /^selection-foreground=/ { printf "\033]19;%s\007", color($2) }
-  /^regular[0-7]=/ { split($1, parts, "regular"); printf "\033]4;%d;%s\007", parts[2], color($2) }
-  /^bright[0-7]=/ { split($1, parts, "bright"); printf "\033]4;%d;%s\007", parts[2] + 8, color($2) }
-' "$foot_theme")
-
-for foot_pid in $(pgrep -x foot); do
-  for child_pid in $(pgrep -P "$foot_pid"); do
-    tty=$(readlink "/proc/$child_pid/fd/1" 2>/dev/null)
-    [[ $tty == /dev/pts/* ]] && printf '%b' "$foot_osc" >"$tty"
-  done
-done

bin/omarchy-theme-set-gnome

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # omarchy:summary=Apply the current theme to GNOME color mode and icon settings
-# omarchy:hidden=true
 
 if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
   gsettings set org.gnome.desktop.interface color-scheme "prefer-light"