Version bump

Add migration to handle lingering panel_replay addition
Merge pull request #5467 from basecamp/rc
2026-08-02 04:37:49 +02:00 · 2026-05-04 19:46:42 -04:00 · 2026-05-04 19:46:00 -04:00 · 2026-05-04 15:44:57 +02:00 · 2026-05-04 15:42:37 +02:00 · 2026-05-04 15:33:23 +02:00
359 changed files with 2041 additions and 5495 deletions
@@ -1,11 +0,0 @@
-{
-  "workspace": {
-    "library": [
-      "/usr/share/hypr/stubs"
-    ],
-    "checkThirdParty": false
-  },
-  "diagnostics": {
-    "globals": ["hl"]
-  }
-}
@@ -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:
@@ -82,25 +31,14 @@ Use these instead of raw shell commands:
 - `omarchy-cmd-missing` / `omarchy-cmd-present` - check for commands
 - `omarchy-pkg-missing` / `omarchy-pkg-present` - check for packages
 - `omarchy-pkg-add` - install packages (handles both pacman and AUR)
- `omarchy-notification-send` - send desktop notifications; do not call `notify-send` directly
 - `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.
-
-For interactive UI work, use `wtype` to simulate keyboard input when available. Example: start the UI in the background, wait briefly for focus, then run `wtype -k Right -k Return` to exercise keyboard selection and confirm the resulting command output or state change. Prefer this over manual-only verification when a UI returns a selected value or changes a symlink/config.
-
-When testing layer-shell UI, capture the reference and candidate states as separate screenshots, then compare them visually before further edits. If a launched UI would otherwise remain open, keep track of its PID and stop it after the screenshot; avoid broad process kills unless checking with `ps` first.
-
 # Refresh Pattern

 To copy a default config to user config with automatic backup:
@@ -115,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
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -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,25 +28,21 @@ 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"
-GROUP_DESCRIPTIONS[games]="Game launchers and helpers"
 GROUP_DESCRIPTIONS[hibernation]="Hibernation setup and removal"
 GROUP_DESCRIPTIONS[hook]="User hook runner"
 GROUP_DESCRIPTIONS[hw]="Hardware detection and controls"
 GROUP_DESCRIPTIONS[hyprland]="Hyprland window, monitor, and toggle controls"
 GROUP_DESCRIPTIONS[install]="Optional software installers"
 GROUP_DESCRIPTIONS[launch]="Application launchers"
-GROUP_DESCRIPTIONS[mako]="Mako notification controls"
 GROUP_DESCRIPTIONS[menu]="Omarchy menu commands"
 GROUP_DESCRIPTIONS[migrate]="Migration runner"
 GROUP_DESCRIPTIONS[notification]="Notification helpers"
@@ -57,25 +52,22 @@ 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[snapshot]="System snapshots"
-GROUP_DESCRIPTIONS[style]="Global UI style controls"
+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"
@@ -137,7 +129,6 @@ register_command() {
  local examples=""
  local aliases=""
  local requires_sudo=""
-  local hidden=""
  local line=""
  local metadata_key=""
  local metadata_value=""
@@ -193,10 +184,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
@@ -240,7 +227,6 @@ register_command() {
  fi

  [[ $requires_sudo == "true" ]] || requires_sudo="false"
-  [[ $hidden == "true" ]] || hidden="false"

  local key="$file_binary"
  COMMAND_KEYS+=("$key")
@@ -254,7 +240,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"

@@ -334,6 +319,16 @@ command_requires_args() {
  [[ -n $required ]]
 }

+load_group_extra_commands() {
+  local group="$1"
+
+  case "$group" in
+  install)
+    load_command_by_binary omarchy-pkg-add
+    ;;
+  esac
+}
+
 load_group_commands() {
  local group="$1"
  local file=""
@@ -347,6 +342,7 @@ load_group_commands() {
    register_command "$file"
  done

+  load_group_extra_commands "$group"
 }

 resolve_direct_route() {
@@ -379,9 +375,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-
 }
@@ -425,10 +418,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
@@ -506,6 +495,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
 }

@@ -517,7 +508,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
@@ -569,9 +560,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

@@ -610,14 +598,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]}" \
@@ -635,12 +622,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
 }
@@ -694,14 +680,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]}" \
@@ -794,25 +779,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]}"
@@ -1030,10 +996,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
@@ -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"
@@ -1,30 +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
-
-SOURCE_DIR="${XDG_PICTURES_DIR:-$HOME/Pictures}"
-
-case "${1:-}" in
-image)
-  image=$(omarchy-menu-file "Pick png/svg from $SOURCE_DIR" "${SOURCE_DIR}" "svg png")
-  if [[ -n $image ]] && omarchy-transcode-ascii "$image" ~/.config/omarchy/branding/about.txt --width 54 --height 26; 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
@@ -1,30 +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
-
-SOURCE_DIR="${XDG_PICTURES_DIR:-$HOME/Pictures}"
-
-case "${1:-}" in
-image)
-  image=$(omarchy-menu-file "Pick png/svg from $SOURCE_DIR" "${SOURCE_DIR}" "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
@@ -1,26 +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 [[ $step == "off" ]]; then
-  hyprctl dispatch 'hl.dsp.dpms({ action = "disable" })' >/dev/null 2>&1 || hyprctl dispatch dpms off >/dev/null 2>&1
-  exit 0
-elif [[ $step == "on" ]]; then
-  hyprctl dispatch 'hl.dsp.dpms({ action = "enable" })' >/dev/null 2>&1 || hyprctl dispatch dpms on >/dev/null 2>&1
-  exit 0
+if omarchy-hyprland-monitor-focused-apple; then
+  omarchy-brightness-display-apple "$step"
+  exit
 fi

-runtime_dir="${XDG_RUNTIME_DIR:-/tmp}"
-
-# Drop overlapping brightness key events so concurrent invocations do not race.
-# Hardware key repeat present on some devices can otherwise glitch SwayOSD rendering.
-exec 9>"$runtime_dir/omarchy-brightness-display.lock"
-flock -n 9 || exit 0
-
 # 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
@@ -30,12 +19,6 @@ for candidate in amdgpu_bl* intel_backlight acpi_video*; do
  fi
 done

-
-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 '%')

@@ -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%"
@@ -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)"
@@ -233,7 +233,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
@@ -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
@@ -18,7 +18,7 @@ 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
+TEXT=$(grim -g "$SELECTION" - | tesseract stdin stdout --oem 1 --psm 6 -l eng --dpi 300 -c preserve_interword_spaces=1 2>/dev/null) || exit 1

 [[ -z $TEXT ]] && exit 1

@@ -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)
@@ -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"
@@ -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"
@@ -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"
@@ -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
@@ -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)')
@@ -16,11 +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/gdk-scale.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"
@@ -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."
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=List installed RetroArch core names
-
-set -e
-
-core_dir="/usr/lib/libretro"
-preferred_cores=(
-  "Amstrad CPC|cap32"
-  "Arcade FBNeo|fbneo"
-  "Arcade MAME|mame"
-  "Commodore Amiga|puae"
-  "Commodore C128|vice_x128"
-  "Commodore C64|vice_x64"
-  "Commodore VIC-20|vice_xvic"
-  "Nintendo DS|desmume"
-  "Nintendo Game Boy / Color|gambatte"
-  "Nintendo Game Boy Advance|mgba"
-  "Nintendo GameCube / Wii|dolphin"
-  "Nintendo NES / Famicom|mesen"
-  "Nintendo 64|parallel_n64"
-  "Nintendo SNES / SFC|snes9x"
-  "NEC PC Engine / TurboGrafx-16|mednafen_pce_fast"
-  "NEC PC Engine CD / TurboGrafx-CD|mednafen_pce"
-  "NEC PC Engine SuperGrafx|mednafen_supergrafx"
-  "Sega Dreamcast|flycast"
-  "Sega Mega Drive / Master System / Game Gear|genesis_plus_gx"
-  "Sega Saturn|kronos"
-  "Sony PlayStation|mednafen_psx_hw"
-  "Sony PlayStation Portable|ppsspp"
-)
-
-[[ -d $core_dir ]] || exit 0
-
-for preferred_core in "${preferred_cores[@]}"; do
-  label="${preferred_core%%|*}"
-  core="${preferred_core#*|}"
-  [[ -f $core_dir/${core}_libretro.so ]] && printf '%s (%s)\n' "$label" "$core"
-done
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Create a desktop launcher for a RetroArch game
-# omarchy:args=[core path-to-game]
-# omarchy:examples=omarchy games retro install snes9x ~/Games/roms/snes/game.sfc | omarchy-games-retro-install /usr/lib/libretro/mgba_libretro.so ~/Games/roms/gba/game.gba
-
-set -e
-
-if (( $# == 0 )); then
-  mapfile -t cores < <(omarchy-games-retro-cores)
-
-  if (( ${#cores[@]} == 0 )); then
-    omarchy-notification-send -g "󰯉" "No RetroArch cores found" "/usr/lib/libretro"
-    exit 1
-  fi
-
-  core=$(omarchy-menu-select "RetroArch core" "${cores[@]}") || exit 0
-  [[ -n $core ]] || exit 0
-  core="${core##*(}"
-  core="${core%)}"
-
-  game_path=$(omarchy-menu-file "Retro game" "$HOME/Games/roms" "7z bin ccd chd cue dmg elf fds gb gba gbc iso lha m3u md n64 nds nes pbp sfc smc swc zip z64") || exit 0
-  [[ -n $game_path ]] || exit 0
-elif (( $# == 2 )); then
-  core="$1"
-  game_path="$2"
-else
-  echo "Usage: omarchy-games-retro-install [core path-to-game]"
-  echo "Example: omarchy-games-retro-install snes9x ~/Games/roms/snes/game.sfc"
-  exit 1
-fi
-
-if [[ ! -f $game_path ]]; then
-  echo "Game not found: $game_path"
-  exit 1
-fi
-
-if [[ $core == */* ]]; then
-  core_path="$core"
-else
-  core_path="/usr/lib/libretro/${core}_libretro.so"
-fi
-
-if [[ ! -f $core_path ]]; then
-  echo "Core not found: $core_path"
-  exit 1
-fi
-
-game_name=$(printf '%s' "${game_path##*/}" | sed 's/\.[^.]*$//; s/[[:space:]]*([^)]*)//g; s/[[:space:]]\+/ /g; s/^ //; s/ $//' | perl -Mopen=locale -pe 's/(^|[[:space:]])([^[:space:]])/$1\U$2/g')
-desktop_name="$game_name"
-desktop_id=$(printf '%s' "$desktop_name" | tr '[:upper:]' '[:lower:]' | tr -cs '[:alnum:]' '-' | sed 's/^-//; s/-$//')
-desktop_dir="$HOME/.local/share/applications"
-desktop_file="$desktop_dir/$desktop_id.desktop"
-icon_dir="$desktop_dir/icons"
-icon_path="$icon_dir/Retro Gaming.png"
-
-mkdir -p "$desktop_dir" "$icon_dir"
-[[ -f $icon_path ]] || cp "$HOME/.local/share/omarchy/applications/icons/Retro Gaming.png" "$icon_path"
-
-cat >"$desktop_file" <<EOF
-[Desktop Entry]
-Version=1.0
-Name=$desktop_name
-Comment=Play $game_name with RetroArch
-Exec=retroarch -L "$core_path" "$game_path"
-Terminal=false
-Type=Application
-Icon=$icon_path
-StartupNotify=true
-Categories=Game;Emulator;
-EOF
-
-chmod +x "$desktop_file"
-update-desktop-database "$desktop_dir" &>/dev/null || true
-
-omarchy-notification-send -g "󰯉" "$game_name installed" "Start it with Super + Space"
@@ -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()
@@ -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
@@ -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"
@@ -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
@@ -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 ]]
@@ -2,7 +2,7 @@

 # omarchy:summary=Clear the internal-monitor-disable toggle if no external display is connected.

-TOGGLE="$HOME/.local/state/omarchy/toggles/hypr/internal-monitor-disable.lua"
+TOGGLE="$HOME/.local/state/omarchy/toggles/hypr/internal-monitor-disable.conf"

 if [[ -f $TOGGLE ]] && ! omarchy-hw-external-monitors; then
  rm -f "$TOGGLE"
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# omarchy:summary=Toggles transparency for the currently focused window.
+
+hyprctl dispatch setprop "address:$(hyprctl activewindow -j | jq -r '.address')" opaque toggle
@@ -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
@@ -4,50 +4,40 @@
 # omarchy:args=<on|off|toggle|recover>

 TOGGLE="internal-monitor-disable"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
+TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.conf"
 MIRROR_TOGGLE="internal-monitor-mirror"

 # Get internal monitor name dynamically
 INTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP")).name' | head -n 1)

-on() {
-  if omarchy-hyprland-toggle-enabled $TOGGLE; then
-    omarchy-hyprland-toggle $TOGGLE off
-    omarchy-notification-send -g 󰍹 "Laptop display enabled"
+enable() {
+  if omarchy-hyprland-toggle-enabled "$TOGGLE"; then
+    omarchy-hyprland-toggle --disabled-notification "󰍹    Laptop display enabled" "$TOGGLE"
  fi
 }

-off() {
+disable() {
  if ! omarchy-hw-external-monitors; then
-    omarchy-notification-send -g 󰍹 "Can't disable the only active display"
+    notify-send -u low "󰍹    Can't disable the only active display"
    exit 1
  fi
-
-  if omarchy-hyprland-toggle-disabled $TOGGLE && omarchy-hyprland-toggle-disabled $MIRROR_TOGGLE; then
-    printf 'hl.monitor({ output = "%s", disabled = true })\n' "$INTERNAL" >"$TOGGLE_FLAG"
-    omarchy-notification-send -g 󰍹 "Laptop display disabled"
+  if omarchy-hyprland-toggle-disabled "$TOGGLE" && omarchy-hyprland-toggle-disabled "$MIRROR_TOGGLE"; then
+    echo "monitor=$INTERNAL,disable" >"$TOGGLE_FLAG"
+    notify-send -u low "󰍹    Laptop display disabled"
    hyprctl reload
  fi
 }

 recover() {
-  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled $TOGGLE; then
-    omarchy-hyprland-toggle $TOGGLE off
-  fi
-}
-
-toggle() {
-  if omarchy-hyprland-toggle-enabled $TOGGLE; then
-    on
-  else
-    off
+  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled "$TOGGLE"; then
+    omarchy-hyprland-toggle "$TOGGLE"
  fi
 }

 case "$1" in
-  on) on ;;
-  off) off ;;
-  toggle) toggle ;;
+  on) enable ;;
+  off) disable ;;
+  toggle) if omarchy-hyprland-toggle-enabled "$TOGGLE"; then enable; else disable; fi ;;
  recover) recover ;;
  *)
    echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
@@ -4,7 +4,7 @@
 # omarchy:args=<on|off|toggle|recover>

 TOGGLE="internal-monitor-mirror"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
+TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.conf"
 DISABLE_TOGGLE="internal-monitor-disable"

 # Get names dynamically
@@ -12,51 +12,44 @@ INTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP")).na
 # Get the first available external monitor
 EXTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP") | not).name' | head -n 1)

-on() {
-  if [[ -z $EXTERNAL ]]; then
-    omarchy-notification-send -g 󰍹 "No external monitors found for mirror"
+enable() {
+  if [[ -z "$EXTERNAL" ]]; then
+    notify-send -u low "󰍹    No external monitors found for mirror"
    exit 1
  fi

-  if [[ -z $INTERNAL ]]; then
-    omarchy-notification-send -g 󰍹 "No laptop monitor found to mirror"
+  if [[ -z "$INTERNAL" ]]; then
+    notify-send -u low "󰍹    No laptop monitor found to mirror"
    exit 1
  fi

-  omarchy-hyprland-toggle $DISABLE_TOGGLE off
+  if omarchy-hyprland-toggle-enabled "$DISABLE_TOGGLE"; then
+    omarchy-hyprland-toggle "$DISABLE_TOGGLE"
+  fi

-  if omarchy-hyprland-toggle-disabled $TOGGLE; then
-    printf 'hl.monitor({ output = "%s", mode = "preferred", position = "auto", scale = 1, mirror = "%s" })\n' "$EXTERNAL" "$INTERNAL" >"$TOGGLE_FLAG"
-    omarchy-notification-send -g 󰍹 "Mirroring enabled ($EXTERNAL)"
+  if omarchy-hyprland-toggle-disabled "$TOGGLE"; then
+    echo "monitor=$EXTERNAL, preferred, auto, 1, mirror, $INTERNAL" > "$TOGGLE_FLAG"
+    notify-send -u low "󰍹    Mirroring enabled ($EXTERNAL)"
    hyprctl reload
  fi
 }

-off() {
-  if omarchy-hyprland-toggle-enabled $TOGGLE; then
-    omarchy-hyprland-toggle $TOGGLE off
-    omarchy-notification-send -g 󰍹 "Extended mode restored"
-  fi
-}
-
-toggle() {
-  if omarchy-hyprland-toggle-enabled $TOGGLE; then
-    off
-  else
-    on
+disable() {
+  if omarchy-hyprland-toggle-enabled "$TOGGLE"; then
+    omarchy-hyprland-toggle --disabled-notification "󰍹    Extended mode restored" "$TOGGLE"
  fi
 }

 recover() {
-  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled $TOGGLE; then
-    omarchy-hyprland-toggle $TOGGLE off
+  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled "$TOGGLE"; then
+    omarchy-hyprland-toggle "$TOGGLE"
  fi
 }

 case "$1" in
-  on) on ;;
-  off) off ;;
-  toggle) toggle ;;
+  on) enable ;;
+  off) disable ;;
+  toggle) if omarchy-hyprland-toggle-enabled "$TOGGLE"; then disable; else enable; fi ;;
  recover) recover ;;
  *)
    echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Print the monitor scale of the internal monitor or first other monitor
-
-hyprctl monitors -j | jq -r '([.[] | select(.name | contains("eDP"))][0] // .[0]).scale // empty | tonumber | if . == floor then floor else . end'
@@ -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,9 +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 monitor/GDK scale pairs: 1 → 1.25 → 1.6 → 2 → 3 → 4 → 1 (or reverse with --reverse)
-SCALES=(1 1.25 1.6 2 3 4)
-GDK_SCALES=(1 1.25 1.75 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)
@@ -25,30 +24,24 @@ CURRENT_IDX=$(awk -v s="$CURRENT_SCALE" -v list="${SCALES[*]}" 'BEGIN {
  print best
 }')

-if [[ $1 == "--reverse" ]]; then
+if [[ "$1" == "--reverse" ]]; then
  NEW_IDX=$(( (CURRENT_IDX - 1 + ${#SCALES[@]}) % ${#SCALES[@]} ))
 else
  NEW_IDX=$(( (CURRENT_IDX + 1) % ${#SCALES[@]} ))
 fi

 NEW_SCALE=${SCALES[$NEW_IDX]}
-NEW_GDK_SCALE=${GDK_SCALES[$NEW_IDX]}

-hyprctl eval "hl.monitor({ output = \"$ACTIVE_MONITOR\", mode = \"${WIDTH}x${HEIGHT}@${REFRESH_RATE}\", position = \"auto\", scale = $NEW_SCALE })" >/dev/null
+hyprctl keyword monitor "$ACTIVE_MONITOR,${WIDTH}x${HEIGHT}@${REFRESH_RATE},auto,$NEW_SCALE"

-# Persist to monitors.lua if the user still has Omarchy's generic catch-all
-# defaults, so the scale survives reboots.
-MONITOR_LUA="$HOME/.config/hypr/monitors.lua"
-if [[ -f $MONITOR_LUA ]] && grep -q '^local omarchy_monitor_scale = ' "$MONITOR_LUA"; then
-  sed -i -E \
-    -e "s|^local omarchy_monitor_scale = .*|local omarchy_monitor_scale = ${NEW_SCALE}|" \
-    -e "s|^local omarchy_gdk_scale = .*|local omarchy_gdk_scale = ${NEW_GDK_SCALE}|" \
-    "$MONITOR_LUA"
-elif [[ -f $MONITOR_LUA ]] && grep -Eq '^hl\.monitor\(\{ output = "", mode = "preferred", position = "auto", scale = ("auto"|[0-9.]+) \}\)' "$MONITOR_LUA"; then
-  sed -i -E \
-    -e "s|^(hl\.monitor\(\{ output = \"\", mode = \"preferred\", position = \"auto\", scale = )([^ ]+)( \}\))|\\1${NEW_SCALE}\\3|" \
-    -e 's|^hl\.env\("GDK_SCALE", ".*"\)|hl.env("GDK_SCALE", "'"$NEW_GDK_SCALE"'")|' \
-    "$MONITOR_LUA"
+# Persist to monitors.conf if the user has a single generic catch-all line
+# (ignoring disabled monitors), so the scale survives reboots.
+MONITOR_CONF="$HOME/.config/hypr/monitors.conf"
+if [[ -f $MONITOR_CONF ]]; then
+  mapfile -t ACTIVE_LINES < <(grep -E '^[[:space:]]*monitor=' "$MONITOR_CONF" | grep -vE 'disable[[:space:]]*$')
+  if [[ ${#ACTIVE_LINES[@]} -eq 1 ]] && [[ "${ACTIVE_LINES[0]}" =~ ^monitor=,preferred,auto, ]]; then
+    sed -i -E "s|^(monitor=,preferred,auto,).*|\\1${NEW_SCALE}|" "$MONITOR_CONF"
+  fi
 fi

 notify-send -u low "󰍹    Display scaling set to ${NEW_SCALE}x"
@@ -1,77 +1,32 @@
 #!/bin/bash

 # omarchy:summary=Toggle permanent Hyprland flags by copying them into a directory that's sourced entirely.
-# omarchy:args=[--enabled-notification <text>] [--disabled-notification <text>] <flag-name> [on|off|toggle]
+# omarchy:args=[--enabled-notification <text>] [--disabled-notification <text>] <flag-name>

 ENABLED_NOTIFICATION=""
 DISABLED_NOTIFICATION=""

-while (($# > 0)); do
+while [[ $# -gt 1 ]]; do
  case $1 in
-    --enabled-notification)
-      if (($# < 2)); then
-        echo "Missing value for $1" >&2
-        exit 1
-      fi
-      ENABLED_NOTIFICATION="$2"
-      shift 2
-      ;;
-    --disabled-notification)
-      if (($# < 2)); then
-        echo "Missing value for $1" >&2
-        exit 1
-      fi
-      DISABLED_NOTIFICATION="$2"
-      shift 2
-      ;;
+    --enabled-notification) ENABLED_NOTIFICATION="$2"; shift 2 ;;
+    --disabled-notification) DISABLED_NOTIFICATION="$2"; shift 2 ;;
    *) break ;;
  esac
 done

-if (($# < 1)); then
-  echo "Usage: omarchy-hyprland-toggle [--enabled-notification <text>] [--disabled-notification <text>] <flag-name> [on|off|toggle]" >&2
+FLAG_NAME="$1"
+FLAG="$HOME/.local/state/omarchy/toggles/hypr/$FLAG_NAME.conf"
+FLAG_SOURCE="$OMARCHY_PATH/default/hypr/toggles/$FLAG_NAME.conf"
+
+if [[ -f $FLAG ]]; then
+  rm $FLAG
+  [[ -n $DISABLED_NOTIFICATION ]] && notify-send -u low "$DISABLED_NOTIFICATION"
+elif [[ -f $FLAG_SOURCE ]]; then
+  cp $FLAG_SOURCE $FLAG
+  [[ -n $ENABLED_NOTIFICATION ]] && notify-send -u low "$ENABLED_NOTIFICATION"
+else
+  echo "Flag not found: $FLAG_NAME"
  exit 1
 fi

-FLAG_NAME="$1"
-ACTION="${2:-toggle}"
-FLAG_FILE="$HOME/.local/state/omarchy/toggles/hypr/$FLAG_NAME.lua"
-FLAG_SOURCE="$OMARCHY_PATH/default/hypr/toggles/$FLAG_NAME.lua"
-
-on() {
-  if [[ -f $FLAG_SOURCE ]]; then
-    mkdir -p "$(dirname "$FLAG_FILE")"
-    cp "$FLAG_SOURCE" "$FLAG_FILE"
-    [[ -n $ENABLED_NOTIFICATION ]] && notify-send -u low "$ENABLED_NOTIFICATION"
-  else
-    echo "Flag not found: $FLAG_NAME" >&2
-    exit 1
-  fi
-}
-
-off() {
-  rm -f "$FLAG_FILE"
-  [[ -n $DISABLED_NOTIFICATION ]] && notify-send -u low "$DISABLED_NOTIFICATION"
-}
-
-toggle() {
-  if [[ -f $FLAG_FILE ]]; then
-    off
-    echo "off"
-  else
-    on
-    echo "on"
-  fi
-}
-
-case $ACTION in
-  on) on ;;
-  off) off ;;
-  toggle) toggle ;;
-  *)
-    echo "Usage: omarchy-hyprland-toggle [--enabled-notification <text>] [--disabled-notification <text>] <flag-name> [on|off|toggle]" >&2
-    exit 1
-    ;;
-esac
-
-hyprctl reload >/dev/null
+hyprctl reload
@@ -3,4 +3,4 @@
 # omarchy:summary=Check if a Hyprland toggle is currently disabled (missing).
 # omarchy:args=<flag-name>

-[[ ! -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
+[[ ! -f "$HOME/.local/state/omarchy/toggles/hypr/$1.conf" ]]
@@ -3,4 +3,4 @@
 # omarchy:summary=Check if a Hyprland toggle is currently enabled.
 # omarchy:args=<flag-name>

-[[ -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
+[[ -f "$HOME/.local/state/omarchy/toggles/hypr/$1.conf" ]]
@@ -4,9 +4,7 @@

 hyprctl clients -j | \
  jq -r ".[].address" | \
-  while read -r addr; do
-    hyprctl dispatch "hl.dsp.window.close(\"address:$addr\")" >/dev/null 2>&1 || hyprctl dispatch closewindow "address:$addr"
-  done
+  xargs -I{} hyprctl dispatch closewindow address:{}

 # Move to first workspace
-hyprctl dispatch 'hl.dsp.focus({ workspace = "1" })' >/dev/null 2>&1 || hyprctl dispatch workspace 1
+hyprctl dispatch workspace 1
@@ -11,30 +11,24 @@ y=${4:-}
 active=$(hyprctl activewindow -j)
 pinned=$(echo "$active" | jq ".pinned")
 addr=$(echo "$active" | jq -r ".address")
-window="address:$addr"
-
-hypr_dispatch() {
-  local lua="$1"
-  shift
-
-  hyprctl dispatch "$lua" >/dev/null 2>&1 || hyprctl dispatch "$@" >/dev/null
-}

 if [[ $pinned == "true" ]]; then
-  hypr_dispatch "hl.dsp.window.pin({ window = \"$window\" })" pin "$window"
-  hypr_dispatch "hl.dsp.window.float({ window = \"$window\", action = \"toggle\" })" togglefloating "$window"
-  hypr_dispatch "hl.dsp.window.tag({ window = \"$window\", tag = \"-pop\" })" tagwindow -pop "$window"
+  hyprctl -q --batch \
+    "dispatch pin address:$addr;" \
+    "dispatch togglefloating address:$addr;" \
+    "dispatch tagwindow -pop address:$addr;"
 elif [[ -n $addr ]]; then
-  hypr_dispatch "hl.dsp.window.float({ window = \"$window\", action = \"toggle\" })" togglefloating "$window"
-  hypr_dispatch "hl.dsp.window.resize({ window = \"$window\", x = $width, y = $height })" resizeactive exact "$width" "$height" "$window"
+  hyprctl dispatch togglefloating address:$addr
+  hyprctl dispatch resizeactive exact $width $height address:$addr

  if [[ -n $x && -n $y ]]; then
-    hypr_dispatch "hl.dsp.window.move({ window = \"$window\", x = $x, y = $y })" moveactive "$x" "$y" "$window"
+    hyprctl dispatch moveactive $x $y address:$addr
  else
-    hypr_dispatch "hl.dsp.window.center({ window = \"$window\" })" centerwindow "$window"
+    hyprctl dispatch centerwindow address:$addr
  fi

-  hypr_dispatch "hl.dsp.window.pin({ window = \"$window\" })" pin "$window"
-  hypr_dispatch "hl.dsp.window.alter_zorder({ window = \"$window\", mode = \"top\" })" alterzorder top "$window"
-  hypr_dispatch "hl.dsp.window.tag({ window = \"$window\", tag = \"+pop\" })" tagwindow +pop "$window"
+  hyprctl -q --batch \
+    "dispatch pin address:$addr;" \
+    "dispatch alterzorder top address:$addr;" \
+    "dispatch tagwindow +pop address:$addr;"
 fi
@@ -2,7 +2,7 @@

 # omarchy:summary=Toggle single-window square aspect ratio.

-case $(omarchy-hyprland-toggle single-window-aspect-ratio) in
-  on) omarchy-notification-send -g  "Enable single-window square aspect ratio" ;;
-  off) omarchy-notification-send -g  "Disable single-window square aspect ratio" ;;
-esac
+omarchy-hyprland-toggle \
+  --enabled-notification "      Enable single-window square aspect ratio" \
+  --disabled-notification "      Disable single-window square aspect ratio" \
+  single-window-aspect-ratio
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Toggles transparency for the currently focused window.
-
-addr=$(hyprctl activewindow -j | jq -r '.address')
-hyprctl dispatch "hl.dsp.window.set_prop({ window = \"address:$addr\", prop = \"opaque\", value = \"toggle\" })" >/dev/null 2>&1 || \
-  hyprctl dispatch setprop "address:$addr" opaque toggle
@@ -10,6 +10,5 @@ case "$CURRENT_LAYOUT" in
  *) NEW_LAYOUT=dwindle ;;
 esac

-hyprctl eval "hl.workspace_rule({ workspace = \"$ACTIVE_WORKSPACE\", layout = \"$NEW_LAYOUT\" })" >/dev/null 2>&1 || \
-  hyprctl keyword workspace $ACTIVE_WORKSPACE, layout:$NEW_LAYOUT
+hyprctl keyword workspace $ACTIVE_WORKSPACE, layout:$NEW_LAYOUT
 notify-send -u low "󱂬    Workspace layout set to $NEW_LAYOUT"
@@ -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
@@ -21,12 +21,8 @@ omarchy-pkg-add \
  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
+  libretro-fbneo-git \
+  libretro-database-git

 # Set up ~/Games for BIOS files and ROMs
 mkdir -p "$HOME/Games/bios" "$HOME/Games/roms"
@@ -53,7 +49,6 @@ 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"
@@ -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
@@ -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" ;;
 *)
@@ -27,18 +26,10 @@ 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
@@ -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
@@ -13,7 +13,7 @@ LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
 WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)

 if [[ -n $WINDOW_ADDRESS ]]; then
-  hyprctl dispatch "hl.dsp.focus({ window = \"address:$WINDOW_ADDRESS\" })" >/dev/null 2>&1 || hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
+  hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
  eval exec setsid $LAUNCH_COMMAND
 fi
@@ -20,36 +20,34 @@ walker -q
 focused=$(omarchy-hyprland-monitor-focused)
 terminal=$(xdg-terminal-exec --print-id)

-hypr_focus_monitor() {
-  hyprctl dispatch "hl.dsp.focus({ monitor = \"$1\" })" >/dev/null 2>&1 || hyprctl dispatch focusmonitor "$1" >/dev/null
-}
-
-hypr_exec() {
-  local command="$1"
-
-  hyprctl dispatch "hl.dsp.exec_cmd([[$command]])" >/dev/null 2>&1 || hyprctl dispatch exec -- bash -lc "$command" >/dev/null
-}
-
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
-  hypr_focus_monitor "$m"
+  hyprctl dispatch focusmonitor $m

  case $terminal in
  *Alacritty*)
-    hypr_exec "alacritty --class=org.omarchy.screensaver --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml -e omarchy-screensaver"
+    hyprctl dispatch exec -- \
+      alacritty --class=org.omarchy.screensaver \
+      --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
+      -e omarchy-screensaver
    ;;
  *ghostty*)
-    hypr_exec "ghostty --class=org.omarchy.screensaver --config-file=~/.local/share/omarchy/default/ghostty/screensaver --font-size=18 -e omarchy-screensaver"
-    ;;
-  *foot*)
-    hypr_exec "foot --app-id=org.omarchy.screensaver --config=\"$OMARCHY_PATH/default/foot/screensaver.ini\" -e omarchy-screensaver"
+    hyprctl dispatch exec -- \
+      ghostty --class=org.omarchy.screensaver \
+      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
+      --font-size=18 \
+      -e omarchy-screensaver
    ;;
  *kitty*)
-    hypr_exec "kitty --class=org.omarchy.screensaver --override font_size=18 --override window_padding_width=0 -e omarchy-screensaver"
+    hyprctl dispatch exec -- \
+      kitty --class=org.omarchy.screensaver \
+      --override font_size=18 \
+      --override window_padding_width=0 \
+      -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

-hypr_focus_monitor "$focused"
+hyprctl dispatch focusmonitor $focused
@@ -56,11 +56,6 @@ open_in_editor() {
  omarchy-launch-editor "$1"
 }

-hypr_config_file() {
-  local name="$1"
-  printf '%s/.config/hypr/%s.lua' "$HOME" "$name"
-}
-
 install() {
  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2"
 }
@@ -98,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 ;;
@@ -109,41 +102,6 @@ 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 -g 󰔛 "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
  *Screenshot*) omarchy-capture-screenshot ;;
@@ -200,8 +158,7 @@ show_screenrecord_menu() {
 }

 show_share_menu() {
-  case $(menu "Share" "  Clipboard\n  File \n  Folder\n󰥦  Receive") in
-  *Receive*) uwsm-app -- localsend ;;
+  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
  *Clipboard*) omarchy-menu-share clipboard ;;
  *File*) terminal bash -c "omarchy-menu-share file" ;;
  *Folder*) terminal bash -c "omarchy-menu-share folder" ;;
@@ -239,18 +196,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 ;;
@@ -258,69 +210,19 @@ 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󰍜  Waybar\n󰘇  Corners\n  Hyprland\n󱄄  Screensaver\n  About") in
-
+  case $(menu "Style" "󰸌  Theme\n󰟵  Unlock\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
  *Theme*) show_theme_menu ;;
  *Unlock*) omarchy-launch-walker -m menus:omarchyunlocks --width 800 --minheight 400 ;;
  *Font*) show_font_menu ;;
  *Background*) show_background_menu ;;
-  *Corners*) show_style_corners_menu ;;
-  *Hyprland*) open_in_editor "$(hypr_config_file looknfeel)" ;;
-  *Waybar*) show_waybar_position_menu ;;
-  *Screensaver*) show_screensaver_menu ;;
-  *About*) show_about_menu ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
+  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
  *) show_main_menu ;;
  esac
 }

-show_style_corners_menu() {
-  case $(omarchy-menu-select "Corners" "󰝣  Sharp" "󰘇  Round") in
-  *Sharp*) omarchy-style-corners sharp ;;
-  *Round*) omarchy-style-corners round ;;
-  *) show_style_menu ;;
-  esac
-}
-
-show_waybar_position_menu() {
-  case $(menu "Waybar Position" "󰁝  Top\n󰁅  Bottom\n󰁍  Left\n󰁔  Right") in
-  *Top*) omarchy-style-waybar-position top ;;
-  *Bottom*) omarchy-style-waybar-position bottom ;;
-  *Left*) omarchy-style-waybar-position left ;;
-  *Right*) omarchy-style-waybar-position right ;;
-  *) show_style_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
 }
@@ -340,9 +242,9 @@ show_font_menu() {

 show_setup_menu() {
  local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
-  [[ -f ~/.config/hypr/bindings.lua ]] && options="$options\n  Keybindings"
-  [[ -f ~/.config/hypr/input.lua ]] && options="$options\n  Input"
-  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
+  [[ -f ~/.config/hypr/bindings.conf ]] && options="$options\n  Keybindings"
+  [[ -f ~/.config/hypr/input.conf ]] && options="$options\n  Input"
+  options="$options\n󰱔  DNS\n  Security\n  Config"

  case $(menu "Setup" "$options") in
  *Audio*) omarchy-launch-audio ;;
@@ -350,10 +252,9 @@ show_setup_menu() {
  *Bluetooth*) omarchy-launch-bluetooth ;;
  *Power*) show_setup_power_menu ;;
  *System*) show_setup_system_menu ;;
-  *Monitors*) open_in_editor "$(hypr_config_file monitors)" ;;
-  *Keybindings*) open_in_editor "$(hypr_config_file bindings)" ;;
-  *Input*) open_in_editor "$(hypr_config_file input)" ;;
-  *Defaults*) show_setup_default_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 ;;
  *DNS*) present_terminal omarchy-setup-dns ;;
  *Security*) show_setup_security_menu ;;
  *Config*) show_setup_config_menu ;;
@@ -373,121 +274,16 @@ 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
-  *Hyprland*) open_in_editor "$(hypr_config_file hyprland)" ;;
+  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 ;;
  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
@@ -523,7 +319,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 ;;
@@ -533,26 +329,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 ;;
@@ -566,22 +349,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 ;;
@@ -605,9 +386,8 @@ 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)\n󰯉  RetroArch Game Launcher") in
+  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 Game Launcher"*) omarchy-games-retro-install ;;
  *RetroArch*) present_terminal omarchy-install-gaming-retroarch ;;
  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
  *GeForce*) present_terminal omarchy-install-gaming-geforce-now ;;
@@ -688,42 +468,22 @@ 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  Gaming\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 ;;
@@ -848,7 +608,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
@@ -888,8 +648,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 ;;
@@ -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
@@ -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
@@ -3,28 +3,6 @@
 # omarchy:summary=Display Hyprland keybindings defined in your configuration using walker for an interactive search menu.

 declare -A KEYCODE_SYM_MAP
-# Hyprland reports XKB keycodes for code: bindings. Keep a small fallback for
-# common keys so the menu remains readable if xkbcli cannot resolve a symbol.
-declare -A FALLBACK_KEYCODE_SYM_MAP=(
-  [10]="1"
-  [11]="2"
-  [12]="3"
-  [13]="4"
-  [14]="5"
-  [15]="6"
-  [16]="7"
-  [17]="8"
-  [18]="9"
-  [19]="0"
-  [20]="MINUS"
-  [21]="EQUAL"
-  [61]="SLASH"
-)
-
-# Hyprland's Lua config provider currently reports code:... binds from hl.bind()
-# as key="" and keycode=0 in `hyprctl -j binds`. Keep a lightweight
-# source-derived key cache so the menu can still show those bindings.
-declare -A LUA_BIND_KEY_MAP

 build_keymap_cache() {
  local keymap
@@ -59,18 +37,7 @@ build_keymap_cache() {
 }

 lookup_keycode_cached() {
-  local symbol
-  symbol="${KEYCODE_SYM_MAP[$1]}"
-
-  if [[ -z $symbol ]]; then
-    symbol="${FALLBACK_KEYCODE_SYM_MAP[$1]}"
-  fi
-
-  if [[ -z $symbol ]]; then
-    symbol="code:$1"
-  fi
-
-  printf '%s\n' "${symbol^^}"
+  printf '%s\n' "${KEYCODE_SYM_MAP[$1]}"
 }

 parse_keycodes() {
@@ -113,151 +80,44 @@ parse_keycodes() {
  fi
 }

-# Supplement `hyprctl -j binds` for Lua-only binds that Hyprland currently
-# reports without their original key, such as hl.bind("SUPER + code:10", ...).
-build_lua_bind_key_cache() {
-  local modmask description key
-
-  omarchy-cmd-present lua || return 0
-
-  while IFS=$'\t' read -r modmask description key; do
-    [[ -z $modmask || -z $description || -z $key ]] && continue
-    LUA_BIND_KEY_MAP["$modmask,$description"]="$key"
-  done < <(
-    lua <<'LUA'
-local modifiers = { SHIFT = 1, CTRL = 4, CONTROL = 4, ALT = 8, SUPER = 64 }
-
-local function split_keys(keys)
-  local modmask = 0
-  local key = ""
-
-  for part in string.gmatch(keys, "[^+]+") do
-    local value = part:gsub("^%s+", ""):gsub("%s+$", "")
-    local modifier = modifiers[string.upper(value)]
-
-    if modifier then
-      modmask = modmask + modifier
-    else
-      key = value
-    end
-  end
-
-  return modmask, key
-end
-
-local function proxy()
-  local p = {}
-
-  return setmetatable(p, {
-    __index = function()
-      return p
-    end,
-    __call = function()
-      return p
-    end,
-  })
-end
-
-local p = proxy()
-
-hl = setmetatable({
-  dsp = p,
-  bind = function(keys, _, opts)
-    opts = opts or {}
-    if opts.description and opts.description ~= "" then
-      local modmask, key = split_keys(keys)
-      print(modmask .. "\t" .. opts.description .. "\t" .. key)
-    end
-    return p
-  end,
-  unbind = function() end,
-  config = function() end,
-  env = function() end,
-  monitor = function() end,
-  window_rule = function() end,
-  gesture = function() end,
-  animation = function() end,
-  curve = function() end,
-  exec_cmd = function() end,
-}, {
-  __index = function()
-    return function()
-      return p
-    end
-  end,
-})
-
-local config = (os.getenv("HOME") or "") .. "/.config/hypr/hyprland.lua"
-local file = io.open(config, "r")
-
-if file then
-  file:close()
-  local ok, err = pcall(dofile, config)
-  if not ok and os.getenv("DEBUG") == "1" then
-    io.stderr:write("[DEBUG] lua bind scan failed: " .. tostring(err) .. "\n")
-  end
-end
-LUA
-  )
-}
-
-modmask_to_text() {
-  case "$1" in
-    0)  printf '' ;;
-    1)  printf 'SHIFT' ;;
-    4)  printf 'CTRL' ;;
-    5)  printf 'SHIFT CTRL' ;;
-    8)  printf 'ALT' ;;
-    9)  printf 'SHIFT ALT' ;;
-    12) printf 'CTRL ALT' ;;
-    13) printf 'SHIFT CTRL ALT' ;;
-    64) printf 'SUPER' ;;
-    65) printf 'SUPER SHIFT' ;;
-    68) printf 'SUPER CTRL' ;;
-    69) printf 'SUPER SHIFT CTRL' ;;
-    72) printf 'SUPER ALT' ;;
-    73) printf 'SUPER SHIFT ALT' ;;
-    76) printf 'SUPER CTRL ALT' ;;
-    77) printf 'SUPER SHIFT CTRL ALT' ;;
-    *)  printf '%s' "$1" ;;
-  esac
-}
-
-# Fetch dynamic keybindings from Hyprland.
+# Fetch dynamic keybindings from Hyprland
 #
 # Also do some pre-processing:
-# - Fill missing Lua code:... keys from the Lua source cache
 # - Remove standard Omarchy bin path prefix
+# - Remove uwsm prefix
 # - Map numeric modifier key mask to a textual rendition
 # - Output comma-separated values that the parser can understand
 dynamic_bindings() {
-  local modmask key keycode description dispatcher arg modifiers
-
  hyprctl -j binds |
-    jq -r '.[] | [.modmask, (.key // ""), (.keycode // 0), (.description // ""), (.dispatcher // ""), (.arg // "") | tostring] | join("\u001f")' |
-    while IFS=$'\x1f' read -r modmask key keycode description dispatcher arg; do
-      if [[ -z $key && $keycode != "0" ]]; then
-        key="code:$keycode"
-      fi
-
-      if [[ -z $key && -n $description ]]; then
-        key="${LUA_BIND_KEY_MAP["$modmask,$description"]}"
-      fi
-
-      [[ -z $description && $dispatcher == "__lua" ]] && continue
-
-      modifiers=$(modmask_to_text "$modmask")
-      arg="${arg//~\/.local\/share\/omarchy\/bin\//}"
-      arg="${arg//uwsm app -- /}"
-      arg="${arg//uwsm-app -- /}"
-
-      printf '%s,%s,%s,%s,%s\n' "$modifiers" "$key" "$description" "$dispatcher" "$arg"
-    done
+    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
+    sed -r \
+      -e 's/null//' \
+      -e 's,~/.local/share/omarchy/bin/,,' \
+      -e 's,uwsm app -- ,,' \
+      -e 's,uwsm-app -- ,,' \
+      -e 's/@0//' \
+      -e 's/,@/,code:/' \
+      -e 's/^0,/,/' \
+      -e 's/^1,/SHIFT,/' \
+      -e 's/^4,/CTRL,/' \
+      -e 's/^5,/SHIFT CTRL,/' \
+      -e 's/^8,/ALT,/' \
+      -e 's/^9,/SHIFT ALT,/' \
+      -e 's/^12,/CTRL ALT,/' \
+      -e 's/^13,/SHIFT CTRL ALT,/' \
+      -e 's/^64,/SUPER,/' \
+      -e 's/^65,/SUPER SHIFT,/' \
+      -e 's/^68,/SUPER CTRL,/' \
+      -e 's/^69,/SUPER SHIFT CTRL,/' \
+      -e 's/^72,/SUPER ALT,/' \
+      -e 's/^73,/SUPER SHIFT ALT,/' \
+      -e 's/^76,/SUPER CTRL ALT,/' \
+      -e 's/^77,/SUPER SHIFT CTRL ALT,/'
 }

 # Hardcoded bindings, like the copy-url extension and such
 static_bindings() {
-  echo "SHIFT ALT,L,Copy URL from Web App,sendshortcut,SHIFT ALT,L,"
+    echo "SHIFT ALT,L,Copy URL from Web App,extension,copy-url"
 }

 # Parse and format keybindings
@@ -266,8 +126,8 @@ static_bindings() {
 # - Set the field separator to a comma ','.
 # - Joins the key combination (e.g., "SUPER + Q").
 # - Joins the command that the key executes.
-# - Prints display text and dispatch metadata as tab-separated fields.
-parse_binding_records() {
+# - Prints everything in a nicely aligned format.
+parse_bindings() {
  awk -F, '
 {
    # Combine the modifier and key (first two fields)
@@ -279,13 +139,6 @@ parse_binding_records() {

    # Use description, if set
    action = $3;
-    dispatcher = $4;
-
-    # Reconstruct the dispatcher arg from the remaining fields
-    arg = "";
-    for (i = 5; i <= NF; i++) {
-        arg = arg $i (i < NF ? "," : "");
-    }

    if (action == "") {
        # Reconstruct the command from the remaining fields
@@ -296,7 +149,6 @@ parse_binding_records() {
        # Clean up trailing commas, remove leading "exec, ", and trim
        sub(/,$/, "", action);
        gsub(/(^|,)[[:space:]]*exec[[:space:]]*,?/, "", action);
-        gsub(/(^|[[:space:]])uwsm(-app| app)[[:space:]]+--[[:space:]]+/, "", action);
        gsub(/^[ \t]+|[ \t]+$/, "", action);
        gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one

@@ -309,15 +161,15 @@ parse_binding_records() {
    }

    if (action != "") {
-        printf "%-35s → %s\t%s\t%s\n", key_combo, action, dispatcher, arg;
+        printf "%-35s → %s\n", key_combo, action;
    }
 }'
 }

 prioritize_entries() {
-  awk -F '\t' '
+  awk '
  {
-    line = $1
+    line = $0
    prio = 50
    if (match(line, /Terminal/)) prio = 0
    if (match(line, /Tmux/)) prio = 1
@@ -368,16 +220,15 @@ prioritize_entries() {
    if (match(line, /Apple Display/))  prio = 98
    if (match(line, /XF86/))  prio = 99

-    # print "priority<TAB>record"
-    printf "%d\t%s\n", prio, $0
+    # print "priority<TAB>line"
+    printf "%d\t%s\n", prio, line
  }' |
  sort -k1,1n -k2,2 |
  cut -f2-
 }

-output_binding_records() {
+output_keybindings() {
  build_keymap_cache
-  build_lua_bind_key_cache

  {
    dynamic_bindings
@@ -385,47 +236,16 @@ output_binding_records() {
  } |
    sort -u |
    parse_keycodes |
-    parse_binding_records |
+    parse_bindings |
    prioritize_entries
 }

-output_keybindings() {
-  output_binding_records | cut -f1
-}
-
-dispatch_binding() {
-  local dispatcher="$1"
-  local arg="$2"
-
-  case "$dispatcher" in
-    exec)
-      [[ -n $arg ]] && hyprctl dispatch exec "$arg"
-      ;;
-    "") return 1 ;;
-    *)
-      if [[ -n $arg ]]; then
-        hyprctl dispatch "$dispatcher" "$arg"
-      else
-        hyprctl dispatch "$dispatcher"
-      fi
-      ;;
-  esac
-}
-
 if [[ $1 == "--print" || $1 == "-p" ]]; then
  output_keybindings
 else
-  records=$(output_binding_records)
  monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
  menu_height=$((monitor_height * 40 / 100))
-  selection=$(cut -f1 <<<"$records" |
-    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height")

-  if [[ -n $selection ]]; then
-    record=$(awk -F '\t' -v selection="$selection" '$1 == selection { print; exit }' <<<"$records")
-    dispatcher=$(cut -f2 <<<"$record")
-    arg=$(cut -f3- <<<"$record")
-
-    dispatch_binding "$dispatcher" "$arg"
-  fi
+  output_keybindings |
+    walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
 fi
@@ -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
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Send a desktop notification with Omarchy glyph and body spacing
-# omarchy:args=<headline> [description] [-g <glyph>] [-u <low|normal|critical>] [notify-send options]
-# omarchy:examples=omarchy notification send "Reminder" "5 minutes are up" -g 󰔛 -u critical
-
-set -euo pipefail
-
-headline=""
-description=""
-glyph=""
-urgency="low"
-args=()
-
-parse_omarchy_option() {
-  case $1 in
-  -g | --glyph)
-    if (($# < 2)); then
-      echo "Missing value for $1" >&2
-      exit 1
-    fi
-    glyph="$2"
-    return 0
-    ;;
-  -u | --urgency)
-    if (($# < 2)); then
-      echo "Missing value for $1" >&2
-      exit 1
-    fi
-    urgency="$2"
-    return 0
-    ;;
-  esac
-
-  return 1
-}
-
-while (($# > 0)); do
-  if parse_omarchy_option "$@"; then
-    shift 2
-  else
-    break
-  fi
-done
-
-if (($# < 1)); then
-  echo "Usage: omarchy-notification-send [-g <glyph>] [-u <low|normal|critical>] <headline> [description] [notify-send options]"
-  exit 1
-fi
-
-headline=$1
-shift
-
-if (($# > 0)) && [[ $1 != -* ]]; then
-  description=$1
-  shift
-fi
-
-while (($# > 0)); do
-  if parse_omarchy_option "$@"; then
-    shift 2
-  else
-    args+=("$1")
-    shift
-  fi
-done
-
-summary="$glyph    $headline"
-args+=("-u" "$urgency")
-
-if [[ -n $description ]]; then
-  description=$(printf '%b' "$description" | sed 's/^/      /')
-  notify-send "${args[@]}" "$summary" "$description"
-else
-  notify-send "${args[@]}" "$summary"
-fi
@@ -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
@@ -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.
@@ -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"
@@ -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
@@ -1,12 +1,11 @@
 #!/bin/bash

-# omarchy:summary=Overwrite all the user Hyprland Lua configs in ~/.config/hypr with the Omarchy defaults.
+# omarchy:summary=Overwrite all the user configs in ~/.config/hypr with the Omarchy defaults.

-omarchy-refresh-config hypr/.luarc.json
-omarchy-refresh-config hypr/autostart.lua
-omarchy-refresh-config hypr/bindings.lua
-omarchy-refresh-config hypr/input.lua
-omarchy-refresh-config hypr/looknfeel.lua
-omarchy-refresh-config hypr/hyprland.lua
-omarchy-refresh-config hypr/monitors.lua
+omarchy-refresh-config hypr/autostart.conf
+omarchy-refresh-config hypr/bindings.conf
+omarchy-refresh-config hypr/input.conf
+omarchy-refresh-config hypr/looknfeel.conf
+omarchy-refresh-config hypr/hyprland.conf
+omarchy-refresh-config hypr/monitors.conf
 bash "$OMARCHY_PATH/install/config/detect-keyboard-layout.sh"
@@ -19,8 +19,5 @@ echo
 sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
 sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist

-# Allow user customization of /etc/pacman.conf before the upgrade runs
-omarchy-hook pre-refresh-pacman
-
 # Reset all package DBs and then update
 sudo pacman -Syyuu --noconfirm
@@ -1,11 +1,11 @@
 #!/bin/bash

-# omarchy:summary=Reinstall the stable Omarchy source directory from git
+# omarchy:summary=Reinstall the Omarchy source directory from git

 set -e

 # Reinstall the Omarchy configuration directory from the git source.

-git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+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
@@ -1,136 +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 timer next remaining body=""
-  local reminder_dir="${XDG_RUNTIME_DIR:-/tmp}/omarchy-reminders"
-  local reminder_message=""
-  local now=$(date +%s)
-
-  while IFS=$'\t' read -r timer next; do
-    [[ -z $timer || -z $next ]] && continue
-
-    next=$((next / 1000000))
-    ((next <= now)) && continue
-
-    remaining=$((next - now))
-    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 "@$next" +%-H:%M))"$'\n'
-    else
-      body+="${reminder_minutes}-min reminder in $(format_remaining $remaining) ($(date -d "@$next" +%-H:%M))"$'\n'
-    fi
-  done < <(systemctl --user list-timers --all --output=json "omarchy-reminder-*.timer" 2>/dev/null | jq -r '.[] | [.unit, .next] | @tsv')
-
-  if [[ -z $body ]]; then
-    omarchy-notification-send -g 󰔛 "Upcoming reminders" "No outstanding reminders"
-  else
-    omarchy-notification-send -g 󰔛 "Upcoming reminders" "${body%$'\n'}"
-  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 -g 󰔛 "All reminders have been cleared"
-}
-
-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 -g 󰔛 "Reminder" "$1" -u critical; rm -f "$2"' bash "$message" "$message_file"
-
-omarchy-notification-send -g 󰔛 "$confirmation_title" "$confirmation"
@@ -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
@@ -21,11 +21,7 @@ omarchy-pkg-drop \
  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
+  libretro-fbneo-git

 rm -rf \
  "$HOME/.config/retroarch" \
@@ -8,8 +8,8 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
  omarchy-webapp-remove-all
  omarchy-tui-remove-all

-  [[ -f ~/.config/hypr/bindings.lua ]] && cp ~/.config/hypr/bindings.lua ~/.config/hypr/bindings.lua.bak
-  cp "$OMARCHY_PATH/default/hypr/plain-bindings.lua" ~/.config/hypr/bindings.lua
+  cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
+  cp "$OMARCHY_PATH/default/hypr/plain-bindings.conf" ~/.config/hypr/bindings.conf
  hyprctl reload

  # Remove npx stubs
@@ -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"
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ screensaver_in_focus() {
 }

 exit_screensaver() {
-  hyprctl eval 'hl.config({ cursor = { invisible = false } })' &>/dev/null || hyprctl keyword cursor:invisible false &>/dev/null || true
+  hyprctl keyword cursor:invisible false &>/dev/null || true
  pkill -x tte 2>/dev/null
  pkill -f org.omarchy.screensaver 2>/dev/null
  exit 0
@@ -18,7 +18,7 @@ trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT

 printf '\033]11;rgb:00/00/00\007'  # Set background color to black

-hyprctl eval 'hl.config({ cursor = { invisible = true } })' &>/dev/null || hyprctl keyword cursor:invisible true &>/dev/null
+hyprctl keyword cursor:invisible true &>/dev/null

 tty=$(tty 2>/dev/null)

@@ -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
@@ -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
@@ -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
@@ -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..."
-
-# 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 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
@@ -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"
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set Hyprland, Hyprlock, Mako, and Walker corners to sharp or round
-# omarchy:args=<sharp|round>
-# omarchy:examples=omarchy style corners round | omarchy style corners sharp
-
-if [[ $1 != "sharp" && $1 != "round" ]]; then
-  echo "Usage: omarchy-style-corners <sharp|round>"
-  exit 1
-fi
-
-omarchy-style-corners-hyprland "$1"
-omarchy-style-corners-hyprlock "$1"
-omarchy-style-corners-mako "$1"
-omarchy-style-corners-walker "$1"
-
-case $1 in
-  sharp) omarchy-notification-send "Sharp corners enabled" -g 󰝣 ;;
-  round) omarchy-notification-send "Round corners enabled" -g 󰘇 ;;
-esac
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set or toggle shape of Hyprland window corners
-# omarchy:args=[toggle|sharp|round]
-# omarchy:examples=omarchy style corners hyprland toggle | omarchy style corners hyprland round | omarchy style corners hyprland sharp
-
-case "${1:-toggle}" in
-  round) set -- on ;;
-  sharp) set -- off ;;
-  toggle) ;;
-  *)
-    echo "Usage: omarchy-style-corners-hyprland [toggle|sharp|round]"
-    exit 1
-    ;;
-esac
-
-omarchy-hyprland-toggle rounded-corners "$1"
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set or toggle rounded Hyprlock input field corners
-# omarchy:args=[toggle|sharp|round]
-# omarchy:examples=omarchy style corners hyprlock toggle | omarchy style corners hyprlock round | omarchy style corners hyprlock sharp
-
-TOGGLES_CONFIG="$HOME/.local/state/omarchy/toggles/hyprlock.conf"
-
-set_rounding() {
-  local radius="$1"
-
-  mkdir -p "$(dirname "$TOGGLES_CONFIG")"
-
-  cat >"$TOGGLES_CONFIG" <<EOF
-input-field {
-    rounding = $radius
-}
-EOF
-}
-
-case "${1:-toggle}" in
-  round) set_rounding 6 ;;
-  sharp) set_rounding 0 ;;
-  toggle)
-    if [[ -f $TOGGLES_CONFIG ]] && grep -q '^    rounding = 6$' "$TOGGLES_CONFIG"; then
-      set_rounding 0
-    else
-      set_rounding 6
-    fi
-    ;;
-  *)
-    echo "Usage: omarchy-style-corners-hyprlock [toggle|sharp|round]"
-    exit 1
-    ;;
-esac
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set or toggle rounded Mako notification corners
-# omarchy:args=[toggle|sharp|round]
-# omarchy:examples=omarchy style corners mako toggle | omarchy style corners mako round | omarchy style corners mako sharp
-
-TOGGLES_CONFIG="$HOME/.local/state/omarchy/toggles/mako.ini"
-
-set_radius() {
-  local radius="$1"
-
-  mkdir -p "$(dirname "$TOGGLES_CONFIG")"
-  touch "$TOGGLES_CONFIG"
-
-  if grep -q '^border-radius=' "$TOGGLES_CONFIG"; then
-    sed -i "s/^border-radius=.*/border-radius=$radius/" "$TOGGLES_CONFIG"
-  else
-    echo "border-radius=$radius" >>"$TOGGLES_CONFIG"
-  fi
-}
-
-case "${1:-toggle}" in
-  round) set_radius 6 ;;
-  sharp) set_radius 0 ;;
-  toggle)
-    if [[ -f $TOGGLES_CONFIG ]] && grep -q '^border-radius=6$' "$TOGGLES_CONFIG"; then
-      set_radius 0
-    else
-      set_radius 6
-    fi
-    ;;
-  *)
-    echo "Usage: omarchy-style-corners-mako [toggle|sharp|round]"
-    exit 1
-    ;;
-esac
-
-makoctl reload
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set or toggle rounded Walker corners
-# omarchy:args=[toggle|sharp|round]
-# omarchy:examples=omarchy style corners walker toggle | omarchy style corners walker round | omarchy style corners walker sharp
-
-TOGGLES_CSS="$HOME/.local/state/omarchy/toggles/walker.css"
-
-set_radius() {
-  local radius="$1"
-
-  mkdir -p "$(dirname "$TOGGLES_CSS")"
-  touch "$TOGGLES_CSS"
-
-  if grep -q '^  border-radius:' "$TOGGLES_CSS"; then
-    sed -i "s/^  border-radius:.*/  border-radius: ${radius}px;/" "$TOGGLES_CSS"
-  elif grep -q '^border-radius:' "$TOGGLES_CSS"; then
-    sed -i "s/^border-radius:.*/border-radius: ${radius}px;/" "$TOGGLES_CSS"
-  else
-    echo ".box-wrapper { border-radius: ${radius}px; }" >>"$TOGGLES_CSS"
-  fi
-}
-
-case "${1:-toggle}" in
-  round) set_radius 6 ;;
-  sharp) set_radius 0 ;;
-  toggle)
-    if [[ -f $TOGGLES_CSS ]] && grep -q 'border-radius: 6px;' "$TOGGLES_CSS"; then
-      set_radius 0
-    else
-      set_radius 6
-    fi
-    ;;
-  *)
-    echo "Usage: omarchy-style-corners-walker [toggle|sharp|round]"
-    exit 1
-    ;;
-esac
-
-omarchy-restart-walker
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set Waybar position
-# omarchy:args=<top|bottom|left|right>
-# omarchy:examples=omarchy-style-waybar-position top | omarchy style waybar-position bottom
-
-set -e
-
-WAYBAR_CONFIG="$HOME/.config/waybar/config.jsonc"
-
-position=$1
-
-if [[ ! $position =~ ^(top|bottom|left|right)$ ]]; then
-  echo "Usage: omarchy-style-waybar-position top|bottom|left|right" >&2
-  exit 1
-fi
-
-# Reset config and styles before making adjustments
-omarchy-refresh-config waybar/config.jsonc
-omarchy-refresh-config waybar/style.css
-
-if [[ $position == "left" || $position == "right" ]]; then
-  height=0
-  width=28
-  horizontal=false
-else
-  height=26
-  width=0
-  horizontal=true
-fi
-
-# Change position
-sed -i -E "s/(\"position\"[[:space:]]*:[[:space:]]*\")[a-z]+(\")/\\1${position}\\2/" "$WAYBAR_CONFIG"
-
-# Change height/width
-sed -i -E "s/(\"height\"[[:space:]]*:[[:space:]]*)[0-9]+/\\1${height}/; s/(\"width\"[[:space:]]*:[[:space:]]*)[0-9]+/\\1${width}/" "$WAYBAR_CONFIG"
-
-# Change the clock format
-if [[ $horizontal == true ]]; then
-  sed -i -E '/"clock"[[:space:]]*:[[:space:]]*\{/,/\}/ s/"format"[[:space:]]*:[[:space:]]*"[^"]*"/"format": "{:L%A %H:%M}"/' "$WAYBAR_CONFIG"
-else
-  sed -i -E '/"clock"[[:space:]]*:[[:space:]]*\{/,/\}/ s/"format"[[:space:]]*:[[:space:]]*"[^"]*"/"format": "{:%H\\n  —\\n%M}"/' "$WAYBAR_CONFIG"
-fi
-
-omarchy-restart-waybar
@@ -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"

@@ -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"

@@ -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
@@ -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
@@ -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"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ryan Hughes	a3aedb0c4d	Version bump	2026-05-04 19:46:42 -04:00
Ryan Hughes	0a5cd43aac	Add migration to handle lingering panel_replay addition	2026-05-04 19:46:00 -04:00
David Heinemeier HanssonandGitHub	9aa3858794	Merge pull request #5467 from basecamp/rc Omarchy 3.7.0	2026-05-04 15:44:57 +02:00
David Heinemeier Hansson	648d8339d2	Merge branch 'dev' into rc	2026-05-04 15:42:37 +02:00
David Heinemeier Hansson	7138044bd2	Merge branch 'dev' into rc	2026-05-04 15:33:23 +02:00
David Heinemeier Hansson	86a38c4a98	Merge branch 'dev' into rc	2026-05-04 14:43:07 +02:00
David Heinemeier Hansson	516882a43c	Merge branch 'dev' into rc	2026-05-04 13:57:18 +02:00
David Heinemeier Hansson	e3d3ee4044	Merge branch 'dev' into rc	2026-05-04 13:23:37 +02:00
David Heinemeier Hansson	48a771bdac	Merge branch 'dev' into rc	2026-05-04 12:38:16 +02:00
David Heinemeier Hansson	03750b31c1	Merge branch 'dev' into rc	2026-05-04 12:23:41 +02:00
David Heinemeier Hansson	a6280eed26	Merge branch 'dev' into rc	2026-05-04 11:36:24 +02:00
David Heinemeier Hansson	f4a0249ff3	Merge branch 'dev' into rc	2026-05-04 11:18:30 +02:00
David Heinemeier Hansson	011243f4fa	Merge branch 'dev' into rc	2026-05-04 10:52:16 +02:00
David Heinemeier Hansson	e7f45386d4	Merge branch 'dev' into rc	2026-05-04 10:38:50 +02:00
David Heinemeier Hansson	cb3fcf4f60	Merge branch 'dev' into rc	2026-05-04 07:55:06 +02:00
David Heinemeier Hansson	d7e3c0dcde	Merge branch 'dev' into rc	2026-05-03 22:53:51 +02:00
David Heinemeier Hansson	0edff316da	Merge branch 'dev' into rc	2026-05-03 22:02:43 +02:00
David Heinemeier Hansson	774acbf5af	Merge branch 'dev' into rc	2026-05-03 19:38:02 +02:00
David Heinemeier Hansson	fddaa5e869	Merge branch 'dev' into rc	2026-05-03 13:42:26 +02:00
David Heinemeier Hansson	f1a4e9f6e8	Merge branch 'dev' into rc	2026-05-03 13:38:42 +02:00
David Heinemeier Hansson	5cf34963d7	Merge branch 'dev' into rc	2026-05-03 12:47:41 +02:00
David Heinemeier Hansson	d40e314d4f	Merge branch 'dev' into rc	2026-05-03 12:05:52 +02:00
David Heinemeier Hansson	dc249dba95	Merge branch 'dev' into rc	2026-05-03 11:57:19 +02:00
David Heinemeier Hansson	4a7ade9c52	Merge branch 'dev' into rc	2026-05-02 16:43:10 +02:00
David Heinemeier Hansson	06fd369318	Merge branch 'dev' into rc	2026-05-02 14:47:48 +02:00
David Heinemeier Hansson	ea7979a057	No quoting needed for bash 5	2026-05-02 13:47:55 +02:00
David Heinemeier Hansson	60966d4553	Merge branch 'dev' into rc	2026-05-02 13:34:38 +02:00
David Heinemeier Hansson	211acd6f9f	Merge branch 'dev' into rc	2026-05-02 12:13:33 +02:00
David Heinemeier Hansson	1351cc6442	Merge branch 'dev' into rc	2026-05-02 11:47:54 +02:00
Ryan HughesandGitHub	59b16e7f0f	Merge pull request #5541 from dotsilva/dev fix: "Bistream" typo to "Bitstream"	2026-05-01 23:30:20 -04:00
Bruno da Silva	ff23d01fce	FIX: Bistream typo to Bitstream in three places	2026-05-01 21:24:41 -03:00
David Heinemeier Hansson	a4ab555516	Merge branch 'dev' into rc	2026-05-01 18:33:06 +02:00
David Heinemeier Hansson	1eaddf97ea	Quiet down so we don't get useless output spam	2026-05-01 18:27:20 +02:00
David Heinemeier Hansson	8537f41a9d	Merge branch 'dev' into rc	2026-05-01 18:22:57 +02:00
David Heinemeier Hansson	cf16a6a1a6	Merge branch 'dev' into rc	2026-05-01 14:15:08 +02:00
David Heinemeier Hansson	3d9a875104	Merge branch 'dev' into rc	2026-05-01 11:27:23 +02:00
David Heinemeier Hansson	0b35365f6b	Merge branch 'dev' into rc	2026-05-01 11:24:23 +02:00
David Heinemeier Hansson	58c350c171	Merge branch 'dev' into rc	2026-04-30 22:23:48 +02:00
David Heinemeier Hansson	efd34a2eea	Merge branch 'dev' into rc	2026-04-30 21:45:16 +02:00
David Heinemeier Hansson	0c972657c2	Merge branch 'dev' into rc	2026-04-30 18:32:37 +02:00
David Heinemeier Hansson	fa5d054173	Merge branch 'dev' into rc	2026-04-30 18:07:02 +02:00
David Heinemeier Hansson	cd7c38c8aa	Merge branch 'dev' into rc	2026-04-30 09:40:17 +02:00
David Heinemeier Hansson	9eb0f0e805	Merge branch 'dev' into rc	2026-04-29 20:19:48 +02:00
David Heinemeier Hansson	b77f900420	Merge branch 'dev' into rc	2026-04-29 15:49:48 +02:00
David Heinemeier Hansson	1770494fa2	Merge branch 'dev' into rc	2026-04-29 11:23:41 +02:00
David Heinemeier Hansson	53d073da7c	Merge branch 'dev' into rc	2026-04-28 09:37:27 +02:00
David Heinemeier Hansson	2fab15c0a7	Merge branch 'dev' into rc	2026-04-27 15:00:25 +02:00
David Heinemeier Hansson	4127c749fb	Proper fix for using device dark mode in Chrome	2026-04-24 10:16:31 +02:00
David Heinemeier HanssonandGitHub	bc9777c0b8	Merge pull request #5388 from basecamp/rc Omarchy 3.6.0	2026-04-23 15:12:57 +02:00
David Heinemeier Hansson	add6a3c506	Merge branch 'dev' into rc	2026-04-23 14:39:27 +02:00
David Heinemeier Hansson	7dc086bb47	Merge branch 'dev' into rc	2026-04-23 13:03:33 +02:00
David Heinemeier Hansson	8346eea614	Merge branch 'dev' into rc	2026-04-23 12:48:31 +02:00
David Heinemeier Hansson	1abc92aadd	Merge branch 'dev' into rc	2026-04-23 11:57:26 +02:00
copilot-swe-agent[bot]GitHub dhh	141edc262f	Quote OMARCHY_PATH in migration source command Agent-Logs-Url: https://github.com/basecamp/omarchy/sessions/36fb96d5-70fd-4365-9550-e7ff5f8735d1 Co-authored-by: dhh <2741+dhh@users.noreply.github.com>	2026-04-22 20:31:31 +00:00
David Heinemeier Hansson	12494bcd8f	Merge branch 'dev' into rc	2026-04-22 22:18:40 +02:00
David Heinemeier Hansson	577cd1e8ab	Merge branch 'dev' into rc	2026-04-22 21:28:28 +02:00
David Heinemeier Hansson	2f5be43407	Merge branch 'dev' into rc	2026-04-22 20:11:29 +02:00
David Heinemeier Hansson	77c9bca045	Merge branch 'dev' into rc	2026-04-22 16:33:50 +02:00
David Heinemeier Hansson	2537edb1e6	Merge branch 'dev' into rc	2026-04-22 16:31:09 +02:00
David Heinemeier HanssonandGitHub	236a34b23c	Merge pull request #5280 from basecamp/rc Omarchy 3.5.1	2026-04-16 16:12:03 +02:00
David Heinemeier Hansson	2c4b4488c0	Merge branch 'dev' into rc	2026-04-16 16:03:49 +02:00
David Heinemeier Hansson	8f7d64ba78	Merge branch 'dev' into rc	2026-04-16 15:34:24 +02:00
David Heinemeier Hansson	9ece3318ec	Merge branch 'dev' into rc	2026-04-16 15:24:11 +02:00
David Heinemeier Hansson	d51a3f6b37	Merge branch 'dev' into rc	2026-04-15 18:16:27 +02:00
David Heinemeier Hansson	cdb8628502	Merge branch 'dev' into rc	2026-04-15 16:21:03 +02:00
David Heinemeier Hansson	b919a5541a	Merge branch 'dev' into rc	2026-04-15 16:17:19 +02:00
David Heinemeier Hansson	4ee44c36a6	Merge branch 'dev' into rc	2026-04-15 15:55:55 +02:00
David Heinemeier Hansson	d71ddf022a	Merge branch 'dev' into rc	2026-04-15 15:02:11 +02:00
David Heinemeier Hansson	cd511f77b9	Merge branch 'dev' into rc	2026-04-15 14:36:44 +02:00
David Heinemeier Hansson	e6b105d0b2	Merge branch 'dev' into rc	2026-04-15 13:52:05 +02:00
David Heinemeier Hansson	2554fe8555	Merge branch 'dev' into rc	2026-04-15 12:34:23 +02:00
David Heinemeier Hansson	feda8b7231	Merge branch 'dev' into rc	2026-04-15 12:11:18 +02:00
David Heinemeier Hansson	46eb5568d9	Merge branch 'dev' into rc	2026-04-15 11:56:00 +02:00
David Heinemeier Hansson	33c92f554b	Merge branch 'dev' into rc	2026-04-15 11:49:29 +02:00
David Heinemeier Hansson	997011e985	Merge branch 'dev' into rc	2026-04-13 16:00:11 -07:00
David Heinemeier Hansson	0e126b7916	Merge branch 'dev' into rc	2026-04-13 15:59:23 -07:00
David Heinemeier Hansson	f81b3c842d	Merge branch 'dev' into rc	2026-04-11 20:48:42 -04:00
David Heinemeier Hansson	ecbd912b09	Merge branch 'dev' into rc	2026-04-11 18:02:01 -04:00
David Heinemeier HanssonandGitHub	76d09b29b7	Merge pull request #5192 from basecamp/rc Omarchy 3.5.0	2026-04-03 19:16:29 +02:00
David Heinemeier Hansson	f18dfdd101	Merge branch 'dev' into rc	2026-04-03 11:36:14 +02:00
David Heinemeier Hansson	e4757abb80	Merge branch 'dev' into rc	2026-04-03 10:57:18 +02:00
David Heinemeier Hansson	fc1cb1a751	Merge branch 'dev' into rc	2026-04-02 18:06:32 +02:00
David Heinemeier Hansson	50d3579d66	Don't use the names here since they break the all-themes setup in omarchy-nvim	2026-04-02 18:04:55 +02:00
David Heinemeier Hansson	b72a831bf5	Merge branch 'dev' into rc	2026-04-02 17:39:10 +02:00
David Heinemeier Hansson	e2b6b5ed5a	Merge branch 'dev' into rc	2026-04-02 17:23:41 +02:00
David Heinemeier Hansson	e5bcec53d1	Merge branch 'dev' into rc	2026-04-02 16:07:23 +02:00
David Heinemeier Hansson	1b07638732	Merge branch 'dev' into rc	2026-04-02 16:06:29 +02:00
David Heinemeier Hansson	4a3355e767	Merge branch 'dev' into rc	2026-04-01 18:16:31 +02:00
David Heinemeier Hansson	3b8ab81781	Merge branch 'dev' into rc	2026-03-08 18:29:04 +01:00
David Heinemeier Hansson	da0bb37a19	Merge branch 'dev' into rc	2026-03-08 17:54:04 +01:00