Merge pull request #5280 from basecamp/rc

Omarchy 3.5.1
Merge branch 'dev' into rc
2026-08-02 20:28:19 +02:00 · 2026-04-16 16:12:03 +02:00 · 2026-04-16 16:03:49 +02:00 · 2026-04-16 15:34:24 +02:00 · 2026-04-16 15:24:11 +02:00 · 2026-04-15 18:16:27 +02:00
742 changed files with 3507 additions and 14363 deletions
@@ -1,11 +0,0 @@
-{
-  "workspace": {
-    "library": [
-      "/usr/share/hypr/stubs"
-    ],
-    "checkThirdParty": false
-  },
-  "diagnostics": {
-    "globals": ["hl"]
-  }
-}
@@ -6,18 +6,12 @@
 - 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
 - `pkg-` - package management helpers
 - `hw-` - hardware detection (return exit codes for use in conditionals)
 - `refresh-` - copy default config to user's `~/.config/`
@@ -29,52 +23,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 +30,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 +52,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,21 +0,0 @@
-[Desktop Entry]
-Type=Application
-TryExec=foot
-Exec=foot
-Icon=foot
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Foot
-GenericName=Terminal
-Comment=A fast, lightweight and minimalistic Wayland terminal emulator
-StartupNotify=true
-StartupWMClass=foot
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--app-id=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=foot
@@ -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
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Hidden=true
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Returns true if AC power is connected.
+# Returns true if AC power is connected.

 for ac in /sys/class/power_supply/AC* /sys/class/power_supply/ADP*; do
  [[ -r $ac/online && $(cat "$ac/online") == "1" ]] && exit 0
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Toggle microphone mute. Drives the hardware mic-mute LED on laptops that expose one.
-
-wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle >/dev/null
-
-if pactl get-source-mute @DEFAULT_SOURCE@ | rg -q 'yes'; then
-  led=on
-  osd_message='Microphone muted'
-  osd_icon='microphone-sensitivity-muted-symbolic'
-else
-  led=off
-  osd_message='Microphone on'
-  osd_icon='audio-input-microphone-symbolic'
-fi
-
-omarchy-brightness-keyboard-mute "$led"
-
-omarchy-swayosd-client \
-  --custom-message "$osd_message" \
-  --custom-icon "$osd_icon"
@@ -1,6 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Returns the battery full capacity in Wh (rounded to whole number).
+# Returns the battery full capacity in Wh (rounded to whole number).
+# Used by omarchy-battery-status for displaying battery capacity.

 battery_info=$(upower -i $(upower -e | grep BAT))

@@ -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
+# Designed to be run by systemd timer every 30 seconds and alerts if battery is low

 BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
@@ -1,6 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Returns true if a battery is present on the system.
+# Returns true if a battery is present on the system.
+# Used by the battery monitor and other battery-related checks.

 for bat in /sys/class/power_supply/BAT*; do
  [[ -r $bat/present ]] &&
@@ -1,6 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Returns the battery percentage remaining as an integer.
+# Returns the battery percentage remaining as an integer.
+# Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.

 upower -i $(upower -e | grep BAT) | awk '/percentage/ { 
    print int($2)
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Returns the battery time remaining (to empty or full) in a compact format.
+# Returns the battery time remaining (to empty or full) in a compact format.

 battery_info=$(upower -i $(upower -e | grep BAT))

@@ -1,6 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Returns a formatted battery status string with percentage and power draw/charge.
+# Returns a formatted battery status string with percentage and power draw/charge.
+# Used by the battery notification hotkey (Ctrl + Shift + Super + B).

 battery_info=$(upower -i $(upower -e | grep BAT))

@@ -21,7 +22,7 @@ time_remaining=$(omarchy-battery-remaining-time)
 capacity=$(omarchy-battery-capacity)

 if [[ $state == "charging" ]]; then
-    echo "Battery ${percentage}%  ·  ${time_remaining} to full  ·   ${power_rate}W / ${capacity}Wh"
+    echo "󰁹    Battery ${percentage}%  ·  ${time_remaining} to full  ·   ${power_rate}W / ${capacity}Wh"
 else
-    echo "Battery ${percentage}%  ·  ${time_remaining} left  ·   ${power_rate}W / ${capacity}Wh"
+    echo "󰁹    Battery ${percentage}%  ·  ${time_remaining} left  ·   ${power_rate}W / ${capacity}Wh"
 fi
@@ -1,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Set the branch for Omarchy's git repository.
-# omarchy:args=<master|rc|dev>
+# Set the branch for Omarchy's git repository.

 if (($# == 0)); then
  echo "Usage: omarchy-branch-set [master|rc|dev]"
@@ -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,10 @@
 #!/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
+# Adjust brightness on the most likely display device.
+# Usage: omarchy-brightness-display <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
-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,37 +14,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 '%')
-
-# Apply non-uniform step size: 1% steps if at or below 5%, otherwise set an
-# absolute target percentage to avoid raw backlight rounding causing uneven OSD steps.
-if [[ $step == "+5%" ]]; then
-  if (( current < 5 )); then
-    (( target = current + 1 ))
-  else
-    (( target = current + 5 ))
-  fi
-
-  (( target > 100 )) && target=100
-  step="$target%"
-elif [[ $step == "5%-" ]]; then
-  if (( current <= 5 )); then
-    (( target = current - 1 ))
-  else
-    (( target = current - 5 ))
-  fi
-
-  (( target < 1 )) && target=1
-  step="$target%"
-fi
-
 # Set the actual brightness of the display device.
 brightnessctl -d "$device" set "$step" >/dev/null

@@ -1,34 +1,12 @@
 #!/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%
+# Adjust the brightness on Apple Studio Displays and Apple XDR Displays using asdcontrol.

 if (( $# == 0 )); then
-  echo "Adjust Apple Display brightness by passing +5%, 5%-, or 100%"
+  echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
 else
-  step="$1"
-  if [[ $step =~ ^([0-9]+)%-$ ]]; then
-    step="-${BASH_REMATCH[1]}%"
-  fi
-
-  devices=()
-  for path in /dev/usb/hiddev* /dev/hiddev*; do
-    [[ -e $path ]] && devices+=("$path")
-  done
-
-  if (( ${#devices[@]} == 0 )); then
-    echo "No Apple Display HID device found"
-    exit 1
-  fi
-
-  device="$(sudo asdcontrol --detect "${devices[@]}" | grep -E '^/dev/(usb/)?hiddev' | cut -d: -f1 | head -n1)"
-  if [[ -z $device ]]; then
-    echo "No Apple Display HID device found"
-    exit 1
-  fi
-
-  sudo asdcontrol "$device" -- "$step" >/dev/null
+  device="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  sudo asdcontrol "$device" -- "$1" >/dev/null
  value="$(sudo asdcontrol "$device" | awk -F= '/BRIGHTNESS=/{print $2+0}')"
  omarchy-swayosd-brightness "$(( value * 100 / 60000 ))"
 fi
@@ -1,7 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Adjust keyboard backlight brightness using available steps.
-# omarchy:args=<up|down|cycle|off|restore>
+# Adjust keyboard backlight brightness using available steps.
+# Usage: omarchy-brightness-keyboard <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)"
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Set the mic-mute indicator LED on laptops that expose a platform::micmute LED node.
-# omarchy:args=<on|off>
-
-if [[ -e /sys/class/leds/platform::micmute/brightness ]]; then
-  case "$1" in
-    on)  value=1 ;;
-    off) value=0 ;;
-    *)   echo "Usage: $(basename "$0") <on|off>" >&2; exit 1 ;;
-  esac
-
-  brightnessctl --device="platform::micmute" set "$value" >/dev/null 2>&1 || true
-fi
@@ -1,295 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Start or stop screen recording
-# omarchy:group=capture
-# omarchy:args=[--with-desktop-audio] [--with-microphone-audio] [--with-webcam] [--webcam-device=<device>] [--resolution=<size>] [--stop-recording]
-# omarchy:examples=omarchy screenrecord | omarchy capture screenrecord --with-desktop-audio
-# omarchy:aliases=omarchy screenrecord
-#
-# Env: OMARCHY_SCREENRECORD_USE_PORTAL=true skips the built-in slurp picker and
-# uses gpu-screen-recorder's xdg-desktop-portal capture backend instead. The
-# portal backend was originally added (PR #3401) for HDR-aware capture, support
-# for monitors driven by external GPUs, and window capture — enable it if any
-# of those matter to you. Off by default because the portal path can fail EGL
-# DMA-BUF modifier import on some configurations, leaving recording unable to
-# start.
-#
-# Env: OMARCHY_SCREENRECORD_DEBUG=true appends gpu-screen-recorder's stderr (and
-# the picker target it was launched with) to /tmp/omarchy-screenrecord.log so
-# users can attach a log when reporting capture failures.
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
-
-if [[ ! -d $OUTPUT_DIR ]]; then
-  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-DESKTOP_AUDIO="false"
-MICROPHONE_AUDIO="false"
-WEBCAM="false"
-WEBCAM_DEVICE=""
-RESOLUTION=""
-STOP_RECORDING="false"
-RECORDING_FILE="/tmp/omarchy-screenrecord-filename"
-LOG_FILE=$([[ ${OMARCHY_SCREENRECORD_DEBUG:-false} == "true" ]] && echo "/tmp/omarchy-screenrecord.log" || echo "/dev/null")
-
-for arg in "$@"; do
-  case "$arg" in
-  --with-desktop-audio) DESKTOP_AUDIO="true" ;;
-  --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
-  --with-webcam) WEBCAM="true" ;;
-  --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
-  --resolution=*) RESOLUTION="${arg#*=}" ;;
-  --stop-recording) STOP_RECORDING="true" ;;
-  esac
-done
-
-start_webcam_overlay() {
-  cleanup_webcam
-
-  # Auto-detect first available webcam if none specified
-  if [[ -z $WEBCAM_DEVICE ]]; then
-    WEBCAM_DEVICE=$(v4l2-ctl --list-devices 2>/dev/null | grep -m1 "^[[:space:]]*/dev/video" | tr -d '\t')
-    if [[ -z $WEBCAM_DEVICE ]]; then
-      notify-send "No webcam devices found" -u critical -t 3000
-      return 1
-    fi
-  fi
-
-  # Get monitor scale
-  local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
-
-  # Target width (base 360px, scaled to monitor)
-  local target_width=$(awk "BEGIN {printf \"%.0f\", 360 * $scale}")
-
-  # Try preferred 16:9 resolutions in order, use first available
-  local preferred_resolutions=("640x360" "1280x720" "1920x1080")
-  local video_size_arg=""
-  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
-
-  for resolution in "${preferred_resolutions[@]}"; do
-    if echo "$available_formats" | grep -q "$resolution"; then
-      video_size_arg="-video_size $resolution"
-      break
-    fi
-  done
-
-  ffplay -f v4l2 $video_size_arg -framerate 30 "$WEBCAM_DEVICE" \
-    -vf "crop=iw/2:ih,scale=${target_width}:-1" \
-    -window_title "WebcamOverlay" \
-    -noborder \
-    -fflags nobuffer -flags low_delay \
-    -probesize 32 -analyzeduration 0 \
-    -loglevel quiet &
-  sleep 1
-}
-
-cleanup_webcam() {
-  pkill -f "WebcamOverlay" 2>/dev/null
-}
-
-default_resolution() {
-  local width height
-  read -r width height < <(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.width) \(.height)"')
-  if ((width > 3840 || height > 2160)); then
-    echo "3840x2160"
-  else
-    echo "0x0"
-  fi
-}
-
-# Monitor + window rectangles on the focused workspace, in slurp's "X,Y WxH" format.
-# Mirrors omarchy-capture-screenshot so the picker UX is identical.
-get_rectangles() {
-  local active_workspace=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .activeWorkspace.id')
-  hyprctl monitors -j | jq -r --arg ws "$active_workspace" '
-    .[] | select(.activeWorkspace.id == ($ws | tonumber)) |
-    "\(.x),\(.y) \(.width / .scale | floor)x\(.height / .scale | floor)"'
-  hyprctl clients -j | jq -r --arg ws "$active_workspace" '
-    .[] | select(.workspace.id == ($ws | tonumber)) |
-    "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
-}
-
-# Echoes "monitor:NAME" when the selection matches an entire monitor, otherwise
-# "region:WxH+X+Y" with physical-pixel coordinates ready for gpu-screen-recorder.
-# Returns non-zero if the user cancelled the picker.
-select_capture_target() {
-  local rects=$(get_rectangles)
-  hyprpicker -r -z >/dev/null 2>&1 &
-  local picker_pid=$!
-  sleep .1
-  local selection=$(echo "$rects" | slurp 2>/dev/null)
-  kill $picker_pid 2>/dev/null
-
-  # X and Y can be negative (Hyprland monitor positions in multi-display layouts);
-  # widths and heights are always positive.
-  [[ $selection =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || return 1
-  local sx=${BASH_REMATCH[1]} sy=${BASH_REMATCH[2]}
-  local sw=${BASH_REMATCH[3]} sh=${BASH_REMATCH[4]}
-
-  # A bare click (area < 20px²) snaps to whichever rectangle the click landed
-  # inside, so users don't end up with accidental 2px recordings.
-  if ((sw * sh < 20)); then
-    while IFS= read -r rect; do
-      [[ $rect =~ ^(-?[0-9]+),(-?[0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]] || continue
-      local rx=${BASH_REMATCH[1]} ry=${BASH_REMATCH[2]}
-      local rw=${BASH_REMATCH[3]} rh=${BASH_REMATCH[4]}
-      if ((sx >= rx && sx < rx + rw && sy >= ry && sy < ry + rh)); then
-        sx=$rx sy=$ry sw=$rw sh=$rh
-        break
-      fi
-    done <<<"$rects"
-  fi
-
-  # When the selection exactly matches a monitor, prefer -w <monitor> over a
-  # region capture — same kms backend, but no scaling math and full native res.
-  local monitor=$(hyprctl monitors -j | jq -r --argjson x "$sx" --argjson y "$sy" --argjson w "$sw" --argjson h "$sh" '
-    .[] | select(.x == $x and .y == $y and (.width / .scale | floor) == $w and (.height / .scale | floor) == $h) | .name' | head -1)
-
-  if [[ -n $monitor ]]; then
-    echo "monitor:$monitor"
-    return
-  fi
-
-  # gpu-screen-recorder wants region geometry in the compositor's logical
-  # coordinate space — same space slurp returns — so pass the values through
-  # untouched. (gsr scales to physical pixels itself based on the monitor.)
-  echo "region:${sw}x${sh}+${sx}+${sy}"
-}
-
-start_screenrecording() {
-  local capture_args=()
-  local target
-
-  # Opt-in path for HDR, external-GPU monitors, and window capture (all things
-  # the portal backend supports and the kms backend doesn't). Default flow uses
-  # slurp + the kms backend, which avoids the EGL DMA-BUF modifier import
-  # failures the portal path can hit on some configurations.
-  if [[ ${OMARCHY_SCREENRECORD_USE_PORTAL:-false} == "true" ]]; then
-    target="portal"
-    capture_args=(-w portal -s "${RESOLUTION:-$(default_resolution)}")
-  else
-    target=$(select_capture_target) || return 1
-
-    case $target in
-    monitor:*)
-      capture_args=(-w "${target#monitor:}" -s "${RESOLUTION:-$(default_resolution)}")
-      ;;
-    region:*)
-      capture_args=(-w "${target#region:}")
-      [[ -n $RESOLUTION ]] && capture_args+=(-s "$RESOLUTION")
-      ;;
-    esac
-  fi
-
-  [[ $WEBCAM == "true" ]] && start_webcam_overlay
-
-  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  local audio_devices=""
-  local audio_args=()
-
-  [[ $DESKTOP_AUDIO == "true" ]] && audio_devices+="default_output"
-
-  if [[ $MICROPHONE_AUDIO == "true" ]]; then
-    # Merge audio tracks into one - separate tracks only play one at a time in most players
-    [[ -n $audio_devices ]] && audio_devices+="|"
-    audio_devices+="default_input"
-  fi
-
-  [[ -n $audio_devices ]] && audio_args+=(-a "$audio_devices" -ac aac)
-
-  echo "===== $(date '+%F %T') args: $* target: $target =====" >>"$LOG_FILE"
-  gpu-screen-recorder "${capture_args[@]}" -k auto -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" 2>>"$LOG_FILE" &
-  local pid=$!
-
-  while kill -0 $pid 2>/dev/null && [[ ! -f $filename ]]; do
-    sleep 0.2
-  done
-
-  if kill -0 $pid 2>/dev/null; then
-    echo "$filename" >"$RECORDING_FILE"
-    toggle_screenrecording_indicator
-  fi
-}
-
-stop_screenrecording() {
-  pkill -SIGINT -f "^gpu-screen-recorder" # SIGINT required to save video properly
-
-  # Wait a maximum of 5 seconds to finish before hard killing
-  local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && ((count < 50)); do
-    sleep 0.1
-    count=$((count + 1))
-  done
-
-  toggle_screenrecording_indicator
-  cleanup_webcam
-
-  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    pkill -9 -f "^gpu-screen-recorder"
-    notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
-  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
-    ffmpeg -y -i "$filename" -ss 00:00:00.1 -vframes 1 -q:v 2 "$preview" -loglevel quiet 2>/dev/null
-
-    (
-      ACTION=$(notify-send "Screen recording saved" "Open with Super + Alt + , (or click this)" -t 10000 -i "${preview:-$filename}" -A "default=open")
-      [[ $ACTION == "default" ]] && mpv "$filename"
-      rm -f "$preview"
-    ) &
-  fi
-
-  rm -f "$RECORDING_FILE"
-}
-
-toggle_screenrecording_indicator() {
-  pkill -RTMIN+8 waybar
-}
-
-screenrecording_active() {
-  pgrep -f "^gpu-screen-recorder" >/dev/null
-}
-
-finalize_recording() {
-  local latest
-  latest=$(cat "$RECORDING_FILE" 2>/dev/null)
-  [[ -f $latest ]] || return
-
-  # Re-encode only when the first GOP contains discardable warmup packets — stream copy can't
-  # trim those (it rewinds to the keyframe). Clean recordings stay on the fast stream-copy path.
-  local video_codec=(-c:v copy)
-  if ffprobe -v error -select_streams v:0 -read_intervals %+0.2 -show_entries packet=flags -of csv=p=0 "$latest" 2>/dev/null | grep -q D; then
-    video_codec=(-c:v libx264 -preset veryfast -crf 20)
-  fi
-
-  # Trim the first frame, and normalize audio to -14 LUFS if present, in a single pass
-  local args=(-y -ss 0.1 -i "$latest" "${video_codec[@]}")
-  if ffprobe -v error -select_streams a -show_entries stream=codec_type -of csv=p=0 "$latest" 2>/dev/null | grep -q audio; then
-    # Hard-mute the first 400ms to drop the PipeWire capture-open pop (a near-clipping
-    # transient around 130-200ms that a gentle fade-in can't attenuate enough), then a
-    # 50ms fade avoids a click at the boundary before loudnorm normalizes the rest.
-    args+=(-af "volume=enable='lt(t,0.4)':volume=0,afade=t=in:st=0.4:d=0.05,loudnorm=I=-14:TP=-1.5:LRA=11")
-  fi
-
-  local processed="${latest%.mp4}-processed.mp4"
-  if ffmpeg "${args[@]}" "$processed" -loglevel quiet 2>/dev/null; then
-    mv "$processed" "$latest"
-  else
-    rm -f "$processed"
-  fi
-}
-
-if screenrecording_active; then
-  stop_screenrecording
-elif [[ $STOP_RECORDING == "true" ]]; then
-  exit 1
-else
-  start_screenrecording || cleanup_webcam
-fi
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Extract text from a screenshot region with OCR
-# omarchy:group=capture
-# omarchy:examples=omarchy capture ocr
-
-# Keep hyprpicker alive until after grim captures so the screenshot sees the
-# frozen overlay rather than live content shifting during teardown.
-cleanup_freeze() {
-  [[ -n $PID ]] && kill $PID 2>/dev/null
-}
-trap cleanup_freeze EXIT
-
-hyprpicker -r -z >/dev/null 2>&1 &
-PID=$!
-sleep .1
-SELECTION=$(slurp 2>/dev/null)
-
-[[ -z $SELECTION ]] && exit 0
-
-TEXT=$(grim -g "$SELECTION" - | tesseract stdin stdout --oem 1 --psm 6 -l "${OMARCHY_OCR_LANGS:-eng}" --dpi 300 -c preserve_interword_spaces=1 2>/dev/null) || exit 1
-
-[[ -z $TEXT ]] && exit 1
-
-printf "%s" "$TEXT" | wl-copy
-notify-send "󰴑    Copied text from selection to clipboard"
@@ -1,8 +1,17 @@
 #!/bin/bash

-# omarchy:summary=Set the Omarchy channel, which dictates what git branch and package repository is used.
-# omarchy:args=<stable|rc|edge|dev>
-# omarchy:requires-sudo=true
+# Set the Omarchy channel, which dictates what git branch and package repository is used.
+#
+# Stable uses the master branch, which only sees updates on official releases, and
+# the stable package repository, which typically lags the edge by a month to ensure
+# better compatibility.
+#
+# Edge tracks the latest package repository, but still relies on the master branch,
+# so new packages which require config changes may cause conflicts or errors.
+#
+# Dev tracks the active development dev branch, which may include partial or broken updates,
+# as well as the latest package repository. This should only be used by Omarchy developers
+# and people with a lot of experience managing Linux systems.

 if (($# == 0)); then
  echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
@@ -1,12 +1,16 @@
 #!/bin/bash

-# omarchy:summary=Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
+# Switch between audio outputs while preserving the mute status. By default mapped to Super + Mute.
+
+focused_monitor=$(omarchy-hyprland-monitor-focused)

 sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
 sinks_count=$(echo "$sinks" | jq '. | length')

 if (( sinks_count == 0 )); then
-  omarchy-swayosd-client --custom-message "No audio devices found"
+  swayosd-client \
+    --monitor "$focused_monitor" \
+    --custom-message "No audio devices found"
  exit 1
 fi

@@ -53,10 +57,10 @@ fi
 next_sink_volume_icon="sink-volume-${icon_state}-symbolic"

 if [[ $next_sink_name != $current_sink_name ]]; then
-  next_sink_wpid=$(echo "$next_sink" | jq -r '.properties."object.id"')
-  wpctl set-default "$next_sink_wpid"
+  pactl set-default-sink "$next_sink_name"
 fi

-omarchy-swayosd-client \
+swayosd-client \
+  --monitor "$focused_monitor" \
  --custom-message "$next_sink_description" \
  --custom-icon "$next_sink_volume_icon"
@@ -1,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Finish the installation of Omarchy with items that can only be done after logging in.
-# omarchy:requires-sudo=true
+# Finish the installation of Omarchy with items that can only be done after logging in.

 set -e

@@ -11,16 +10,11 @@ if [[ -f $FIRST_RUN_MODE ]]; then
  rm -f "$FIRST_RUN_MODE"

  bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
-  bash "$OMARCHY_PATH/install/first-run/recover-internal-monitor.sh"
  bash "$OMARCHY_PATH/install/first-run/cleanup-reboot-sudoers.sh"
  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"
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Toggle microphone mute. Dell XPS systems get special handling for the hardware LED.
+
+if omarchy-hw-match "XPS"; then
+  omarchy-cmd-mic-mute-xps
+else
+  swayosd-client --monitor "$(omarchy-hyprland-monitor-focused)" --input-volume mute-toggle
+fi
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# Toggle microphone mute on Dell XPS systems. Uses wpctl for reliable toggling
+# and syncs the ALSA capture switch so the hardware mic mute LED follows state.
+
+wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle >/dev/null
+
+if pactl get-source-mute @DEFAULT_SOURCE@ | rg -q 'yes'; then
+  alsa_value='off,off'
+  osd_message='Microphone muted'
+  osd_icon='microphone-sensitivity-muted-symbolic'
+else
+  alsa_value='on,on'
+  osd_message='Microphone on'
+  osd_icon='audio-input-microphone-symbolic'
+fi
+
+if [[ -e /sys/class/leds/platform::micmute/brightness ]]; then
+  default_source=$(pactl get-default-source)
+  alsa_card=$(pactl -f json list sources | jq -r --arg source "$default_source" '
+    .[] | select(.name == $source) |
+    .properties["alsa.card"] // .properties["api.alsa.card"] // .properties["api.alsa.pcm.card"] // empty
+  ' | head -1)
+
+  if [[ -n $alsa_card ]]; then
+    cards=("$alsa_card")
+  else
+    mapfile -t cards < <(compgen -G '/proc/asound/card*' | rg -o 'card[0-9]+' | sed 's/card//' | sort -u)
+  fi
+
+  for card in "${cards[@]}"; do
+    while IFS= read -r control; do
+      if [[ $control != *"Jack Microphone"* ]]; then
+        amixer -c "$card" cset "$control" "$alsa_value" >/dev/null 2>&1 || true
+        break 2
+      fi
+    done < <(amixer -c "$card" controls 2>/dev/null | rg -o "name='[^']*Microphone Capture Switch'")
+  done
+fi
+
+swayosd-client \
+  --monitor "$(omarchy-hyprland-monitor-focused)" \
+  --custom-message "$osd_message" \
+  --custom-icon "$osd_icon"
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Check whether any required commands are missing
+# Returns true if any of the commands passed in as arguments are missing on the system.

 for cmd in "$@"; do
  if ! command -v "$cmd" &>/dev/null; then
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Check whether all required commands are available
+# Returns true if all the commands passed in as arguments exit on the system.

 for cmd in "$@"; do
  command -v "$cmd" &>/dev/null || exit 1
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+# Start and stop a screenrecording, which will be saved to ~/Videos by default.
+# Alternative location can be set via OMARCHY_SCREENRECORD_DIR or XDG_VIDEOS_DIR ENVs.
+# Resolution is capped to 4K for monitors above 4K, native otherwise.
+# Override via --resolution= (e.g. --resolution=1920x1080, --resolution=0x0 for native).
+
+[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
+OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
+
+if [[ ! -d $OUTPUT_DIR ]]; then
+  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
+  exit 1
+fi
+
+DESKTOP_AUDIO="false"
+MICROPHONE_AUDIO="false"
+WEBCAM="false"
+WEBCAM_DEVICE=""
+RESOLUTION=""
+STOP_RECORDING="false"
+RECORDING_FILE="/tmp/omarchy-screenrecord-filename"
+
+for arg in "$@"; do
+  case "$arg" in
+  --with-desktop-audio) DESKTOP_AUDIO="true" ;;
+  --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
+  --with-webcam) WEBCAM="true" ;;
+  --webcam-device=*) WEBCAM_DEVICE="${arg#*=}" ;;
+  --resolution=*) RESOLUTION="${arg#*=}" ;;
+  --stop-recording) STOP_RECORDING="true" ;;
+  esac
+done
+
+start_webcam_overlay() {
+  cleanup_webcam
+
+  # Auto-detect first available webcam if none specified
+  if [[ -z $WEBCAM_DEVICE ]]; then
+    WEBCAM_DEVICE=$(v4l2-ctl --list-devices 2>/dev/null | grep -m1 "^[[:space:]]*/dev/video" | tr -d '\t')
+    if [[ -z $WEBCAM_DEVICE ]]; then
+      notify-send "No webcam devices found" -u critical -t 3000
+      return 1
+    fi
+  fi
+
+  # Get monitor scale
+  local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
+
+  # Target width (base 360px, scaled to monitor)
+  local target_width=$(awk "BEGIN {printf \"%.0f\", 360 * $scale}")
+
+  # Try preferred 16:9 resolutions in order, use first available
+  local preferred_resolutions=("640x360" "1280x720" "1920x1080")
+  local video_size_arg=""
+  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
+
+  for resolution in "${preferred_resolutions[@]}"; do
+    if echo "$available_formats" | grep -q "$resolution"; then
+      video_size_arg="-video_size $resolution"
+      break
+    fi
+  done
+
+  ffplay -f v4l2 $video_size_arg -framerate 30 "$WEBCAM_DEVICE" \
+    -vf "crop=iw/2:ih,scale=${target_width}:-1" \
+    -window_title "WebcamOverlay" \
+    -noborder \
+    -fflags nobuffer -flags low_delay \
+    -probesize 32 -analyzeduration 0 \
+    -loglevel quiet &
+  sleep 1
+}
+
+cleanup_webcam() {
+  pkill -f "WebcamOverlay" 2>/dev/null
+}
+
+default_resolution() {
+  local width height
+  read -r width height < <(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.width) \(.height)"')
+  if ((width > 3840 || height > 2160)); then
+    echo "3840x2160"
+  else
+    echo "0x0"
+  fi
+}
+
+start_screenrecording() {
+  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local audio_devices=""
+  local audio_args=()
+
+  [[ $DESKTOP_AUDIO == "true" ]] && audio_devices+="default_output"
+
+  if [[ $MICROPHONE_AUDIO == "true" ]]; then
+    # Merge audio tracks into one - separate tracks only play one at a time in most players
+    [[ -n $audio_devices ]] && audio_devices+="|"
+    audio_devices+="default_input"
+  fi
+
+  [[ -n $audio_devices ]] && audio_args+=(-a "$audio_devices" -ac aac)
+
+  local resolution="${RESOLUTION:-$(default_resolution)}"
+
+  gpu-screen-recorder -w portal -k auto -s "$resolution" -f 60 -fm cfr -fallback-cpu-encoding yes -o "$filename" "${audio_args[@]}" &
+  local pid=$!
+
+  # Wait for recording to actually start (file appears after portal selection)
+  while kill -0 $pid 2>/dev/null && [[ ! -f $filename ]]; do
+    sleep 0.2
+  done
+
+  if kill -0 $pid 2>/dev/null; then
+    echo "$filename" >"$RECORDING_FILE"
+    toggle_screenrecording_indicator
+  fi
+}
+
+stop_screenrecording() {
+  pkill -SIGINT -f "^gpu-screen-recorder" # SIGINT required to save video properly
+
+  # Wait a maximum of 5 seconds to finish before hard killing
+  local count=0
+  while pgrep -f "^gpu-screen-recorder" >/dev/null && ((count < 50)); do
+    sleep 0.1
+    count=$((count + 1))
+  done
+
+  toggle_screenrecording_indicator
+  cleanup_webcam
+
+  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
+    pkill -9 -f "^gpu-screen-recorder"
+    notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
+  else
+    trim_first_frame
+    local filename=$(cat "$RECORDING_FILE" 2>/dev/null)
+    local preview="${filename%.mp4}-preview.png"
+
+    # Generate a preview thumbnail from the first frame
+    ffmpeg -y -i "$filename" -ss 00:00:00.1 -vframes 1 -q:v 2 "$preview" -loglevel quiet 2>/dev/null
+
+    (
+      ACTION=$(notify-send "Screen recording saved" "Open with Super + Alt + , (or click this)" -t 10000 -i "${preview:-$filename}" -A "default=open")
+      [[ $ACTION == "default" ]] && mpv "$filename"
+      rm -f "$preview"
+    ) &
+  fi
+
+  rm -f "$RECORDING_FILE"
+}
+
+toggle_screenrecording_indicator() {
+  pkill -RTMIN+8 waybar
+}
+
+screenrecording_active() {
+  pgrep -f "^gpu-screen-recorder" >/dev/null
+}
+
+trim_first_frame() {
+  local latest
+  latest=$(cat "$RECORDING_FILE" 2>/dev/null)
+
+  if [[ -n $latest && -f $latest ]]; then
+    local trimmed="${latest%.mp4}-trimmed.mp4"
+    if ffmpeg -y -ss 0.1 -i "$latest" -c copy "$trimmed" -loglevel quiet 2>/dev/null; then
+      mv "$trimmed" "$latest"
+    else
+      rm -f "$trimmed"
+    fi
+  fi
+}
+
+if screenrecording_active; then
+  stop_screenrecording
+elif [[ $STOP_RECORDING == "true" ]]; then
+  exit 1
+else
+  [[ $WEBCAM == "true" ]] && start_webcam_overlay
+
+  start_screenrecording || cleanup_webcam
+fi
@@ -1,13 +1,13 @@
 #!/bin/bash

-# omarchy:summary=Run the Omarchy screensaver using random effects from TTE.
+# Run the Omarchy screensaver using random effects from TTE.

 screensaver_in_focus() {
  hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
 }

 exit_screensaver() {
-  hyprctl 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,14 +18,15 @@ 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)

 while true; do
  tte -i ~/.config/omarchy/branding/screensaver.txt \
    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
-    --random-effect --no-eol --no-restore-cursor &
+    --random-effect --exclude-effects dev_worm \
+    --no-eol --no-restore-cursor &

  while pgrep -t "${tty#/dev/}" -x tte >/dev/null; do
    if read -n1 -t 1 || ! screensaver_in_focus; then
@@ -1,10 +1,8 @@
 #!/bin/bash

-# omarchy:summary=Take a screenshot
-# omarchy:group=capture
-# omarchy:args=[smart|region|windows|fullscreen] [slurp|copy|save] [--editor=<name>]
-# omarchy:examples=omarchy screenshot | omarchy capture screenshot region
-# omarchy:aliases=omarchy screenshot
+# Take a screenshot of the whole screen, a specific window, or a user-drawn region.
+# Saves to ~/Pictures by default, but that can be changed via OMARCHY_SCREENSHOT_DIR or XDG_PICTURES_DIR ENVs.
+# Editor defaults to Satty but can be changed via --editor=<name> or OMARCHY_SCREENSHOT_EDITOR env

 [[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
 OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
@@ -65,13 +63,6 @@ get_rectangles() {
  hyprctl clients -j | jq -r --arg ws "$active_workspace" '.[] | select(.workspace.id == ($ws | tonumber)) | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
 }

-# Keep hyprpicker alive until after grim captures so the screenshot sees the
-# frozen overlay rather than live content shifting during teardown.
-cleanup_freeze() {
-  [[ -n $PID ]] && kill $PID 2>/dev/null
-}
-trap cleanup_freeze EXIT
-
 # Select based on mode
 case "$MODE" in
 region)
@@ -79,12 +70,14 @@ region)
  PID=$!
  sleep .1
  SELECTION=$(slurp 2>/dev/null)
+  kill $PID 2>/dev/null
  ;;
 windows)
  hyprpicker -r -z >/dev/null 2>&1 &
  PID=$!
  sleep .1
  SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
+  kill $PID 2>/dev/null
  ;;
 fullscreen)
  SELECTION=$(hyprctl monitors -j | jq -r "${JQ_MONITOR_GEO} .[] | select(.focused == true) | format_geo")
@@ -95,6 +88,7 @@ smart | *)
  PID=$!
  sleep .1
  SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
+  kill $PID 2>/dev/null

  # If the selection area is L * W < 20, we'll assume you were trying to select whichever
  # window or output it was inside of to prevent accidental 2px snapshots
@@ -126,22 +120,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
@@ -1,13 +1,9 @@
 #!/bin/bash

-# omarchy:summary=Share clipboard, files, or folders with LocalSend
-# omarchy:group=share
-# omarchy:name=
-# omarchy:args=<clipboard|file|folder> [path...]
-# omarchy:examples=omarchy share clipboard | omarchy share file ~/Downloads/example.txt
+# Share clipboard, file, or folder using LocalSend. Bound to Super + Ctrl + S by default.

 if (($# == 0)); then
-  echo "Usage: omarchy-menu-share [clipboard|file|folder]"
+  echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
  exit 1
 fi

@@ -1,8 +1,9 @@
 #!/bin/bash

-# omarchy:summary=Print the current working directory of the active terminal window
-# omarchy:hidden=true
+# Returns the current working directory of the active terminal window,
+# so a new terminal window can be started in the same directory.

+# Go from current active terminal to its child shell process and run cwd there
 terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)

@@ -1,7 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Add or remove an EFI boot entry for the Omarchy UKI, allowing the system to boot directly
-# omarchy:requires-sudo=true
+# Add an EFI boot entry for the Omarchy UKI, allowing the system to boot directly
+# without a bootloader like Limine. Requires UEFI firmware and a built UKI.

 if [[ ! -d /sys/firmware/efi ]]; then
  echo "Error: System is not booted in UEFI mode" >&2
@@ -23,36 +23,23 @@ if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
  exit 1
 fi

-existing_entry=$(efibootmgr | grep -E "^Boot[0-9A-Fa-f]+\*? Omarchy([[:space:]]|$)" | head -1)
+uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)

-if [[ -n $existing_entry ]]; then
-  boot_num=$(echo "$existing_entry" | sed -n 's/^Boot\([0-9A-Fa-f]\+\).*/\1/p')
-
-  if gum confirm "Disable direct boot (remove Omarchy EFI entry)?"; then
-    echo "Removing EFI boot entry $boot_num"
-    sudo efibootmgr --bootnum "$boot_num" --delete-bootnum >/dev/null
-  fi
-
-  exit 0
-else
-  uki_file=$(find /boot/EFI/Linux/ -name "omarchy*.efi" -printf "%f\n" 2>/dev/null | head -1)
-
-  if [[ -z $uki_file ]]; then
-    echo "Error: No Omarchy UKI found in /boot/EFI/Linux/" >&2
-    exit 1
-  fi
-
-  boot_source=$(findmnt -n -o SOURCE /boot)
-  disk=$(echo "$boot_source" | sed 's/p\?[0-9]*$//')
-  part=$(echo "$boot_source" | grep -o 'p\?[0-9]*$' | sed 's/^p//')
-
-  if gum confirm "Setup direct boot (so snapshot booting must be done via bios)?"; then
-    echo "Creating EFI boot entry for $uki_file"
-
-    sudo efibootmgr --create \
-      --disk "$disk" \
-      --part "$part" \
-      --label "Omarchy" \
-      --loader "\\EFI\\Linux\\$uki_file"
-  fi
+if [[ -z $uki_file ]]; then
+  echo "Error: No Omarchy UKI found in /boot/EFI/Linux/" >&2
+  exit 1
+fi
+
+boot_source=$(findmnt -n -o SOURCE /boot)
+disk=$(echo "$boot_source" | sed 's/p\?[0-9]*$//')
+part=$(echo "$boot_source" | grep -o 'p\?[0-9]*$' | sed 's/^p//')
+
+if gum confirm "Setup direct boot (so snapshot booting must be done via bios)?"; then
+  echo "Creating EFI boot entry for $uki_file"
+
+  sudo efibootmgr --create \
+    --disk "$disk" \
+    --part "$part" \
+    --label "Omarchy" \
+    --loader "\\EFI\\Linux\\$uki_file"
 fi
@@ -1,9 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Print debugging information
-# omarchy:args=[--no-sudo] [--print]
-# omarchy:examples=omarchy debug --print --no-sudo
-# omarchy:requires-sudo=true
+# Return exhaustive debugging information about the system to help diagnose problems.

 NO_SUDO=false
 PRINT_ONLY=false
@@ -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"
@@ -1,6 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Creates a new Omarchy migration named after the unix timestamp of the last commit.
+# Creates a new Omarchy migration named after the unix timestamp of the last commit.
+# Only intended for Omarchy developers.

 cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Measure Omarchy CLI response times
-# omarchy:args=[--repeat=<count>]
-# omarchy:examples=omarchy dev benchmark | omarchy dev benchmark --repeat=10
-
-set -euo pipefail
-
-OMARCHY_BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
-CLI="$OMARCHY_BIN_DIR/omarchy"
-REPEAT=5
-
-show_help() {
-  cat <<'EOF'
-Usage:
-  omarchy dev benchmark [--repeat=<count>]
-
-Measure response times for common Omarchy CLI surfaces.
-
-Options:
-  --repeat=<count>  Number of times to run each case (default: 5)
-EOF
-}
-
-now_us() {
-  local now="${EPOCHREALTIME/./}"
-  printf '%s' "$now"
-}
-
-format_ms() {
-  local us="$1"
-  printf '%d.%03d' "$(( us / 1000 ))" "$(( us % 1000 ))"
-}
-
-run_case() {
-  local label="$1"
-  shift
-  local total_us=0
-  local min_us=0
-  local max_us=0
-  local elapsed_us=0
-  local start_us=0
-  local end_us=0
-  local status=0
-
-  for (( i = 1; i <= REPEAT; i++ )); do
-    start_us=$(now_us)
-    if "$@" >/dev/null; then
-      status=0
-    else
-      status=$?
-    fi
-    end_us=$(now_us)
-
-    if (( status != 0 )); then
-      printf '%-34s failed (exit %d)\n' "$label" "$status"
-      return "$status"
-    fi
-
-    elapsed_us=$(( end_us - start_us ))
-    total_us=$(( total_us + elapsed_us ))
-
-    if (( i == 1 || elapsed_us < min_us )); then
-      min_us=$elapsed_us
-    fi
-
-    if (( elapsed_us > max_us )); then
-      max_us=$elapsed_us
-    fi
-  done
-
-  printf '%-34s avg %8s ms  min %8s ms  max %8s ms\n' \
-    "$label" \
-    "$(format_ms "$(( total_us / REPEAT ))")" \
-    "$(format_ms "$min_us")" \
-    "$(format_ms "$max_us")"
-}
-
-while (( $# > 0 )); do
-  case "$1" in
-  --repeat=*)
-    REPEAT="${1#*=}"
-    ;;
-  --help | -h)
-    show_help
-    exit 0
-    ;;
-  *)
-    echo "Unknown option: $1" >&2
-    show_help >&2
-    exit 2
-    ;;
-  esac
-  shift
-done
-
-if [[ ! $REPEAT =~ ^[0-9]+$ ]] || (( REPEAT < 1 )); then
-  echo "--repeat must be a positive integer" >&2
-  exit 2
-fi
-
-printf 'Omarchy CLI benchmark (%d runs each)\n\n' "$REPEAT"
-run_case "omarchy" "$CLI"
-run_case "omarchy --help" "$CLI" --help
-run_case "omarchy commands" "$CLI" commands
-run_case "omarchy commands --json" "$CLI" commands --json
-run_case "omarchy commands --all --json" "$CLI" commands --all --json
-run_case "omarchy theme set --help" "$CLI" theme set --help
-run_case "omarchy screenshot --help" "$CLI" screenshot --help
-run_case "omarchy restart --help" "$CLI" restart --help
-run_case "omarchy theme current" "$CLI" theme current
@@ -1,228 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Measure Quickshell Omarchy menu response times
-# omarchy:args=[--repeat=<count>] [--no-ui]
-# omarchy:examples=omarchy dev benchmark menu | omarchy dev benchmark menu --repeat=10
-
-set -euo pipefail
-
-OMARCHY_BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
-OMARCHY_PATH=${OMARCHY_PATH:-$(cd -- "$OMARCHY_BIN_DIR/.." && pwd)}
-REPEAT=5
-NO_UI=false
-
-show_help() {
-  cat <<'EOF'
-Usage:
-  omarchy dev benchmark menu [--repeat=<count>] [--no-ui]
-
-Measure the Omarchy menu startup path:
- static JSONC menu parsing
- Quickshell socket startup
- cold open/close roundtrip (unless --no-ui)
- warm open/close roundtrip against the resident Quickshell process
-
-Options:
-  --repeat=<count>  Number of UI open/close runs to measure (default: 5)
-  --no-ui           Skip cases that briefly open the menu
-EOF
-}
-
-now_us() {
-  local now="${EPOCHREALTIME/./}"
-  printf '%s' "$now"
-}
-
-format_ms() {
-  local us="$1"
-  printf '%d.%03d' "$(( us / 1000 ))" "$(( us % 1000 ))"
-}
-
-measure_once() {
-  local start_us end_us
-  start_us=$(now_us)
-  "$@" >/dev/null
-  end_us=$(now_us)
-  printf '%s' "$(( end_us - start_us ))"
-}
-
-run_case() {
-  local label="$1"
-  shift
-  local total_us=0
-  local min_us=0
-  local max_us=0
-  local elapsed_us=0
-
-  for (( i = 1; i <= REPEAT; i++ )); do
-    elapsed_us=$(measure_once "$@")
-    total_us=$(( total_us + elapsed_us ))
-
-    if (( i == 1 || elapsed_us < min_us )); then
-      min_us=$elapsed_us
-    fi
-
-    if (( elapsed_us > max_us )); then
-      max_us=$elapsed_us
-    fi
-  done
-
-  printf '%-34s avg %8s ms  min %8s ms  max %8s ms\n' \
-    "$label" \
-    "$(format_ms "$(( total_us / REPEAT ))")" \
-    "$(format_ms "$min_us")" \
-    "$(format_ms "$max_us")"
-}
-
-socket_path() {
-  printf '%s/omarchy-menu.sock' "${XDG_RUNTIME_DIR:-/run/user/$UID}"
-}
-
-menu_qml() {
-  printf '%s/default/quickshell/menu.qml' "$OMARCHY_PATH"
-}
-
-kill_menu_shell() {
-  quickshell kill -p "$(menu_qml)" >/dev/null 2>&1 || true
-
-  for (( i = 0; i < 200; i++ )); do
-    if ! pgrep -f "[q]uickshell .*$(menu_qml)" >/dev/null 2>&1; then
-      break
-    fi
-    sleep 0.01
-  done
-
-  rm -f "$(socket_path)" "${XDG_RUNTIME_DIR:-/run/user/$UID}/omarchy-menu.state" "${XDG_RUNTIME_DIR:-/run/user/$UID}/omarchy-menu.lock"
-}
-
-build_menu_json() {
-  env OMARCHY_PATH="$OMARCHY_PATH" PATH="$OMARCHY_BIN_DIR:$PATH" \
-    "$OMARCHY_BIN_DIR/omarchy-menu" --json
-}
-
-start_quickshell_socket() {
-  local menu_file
-  local selection_file
-  local done_file
-
-  kill_menu_shell
-  menu_file=$(mktemp)
-  selection_file=$(mktemp)
-  done_file=$(mktemp)
-  printf '{"items":[]}' >"$menu_file"
-  rm -f "$done_file"
-
-  env \
-    OMARCHY_PATH="$OMARCHY_PATH" \
-    OMARCHY_MENU_JSON_FILE="$menu_file" \
-    OMARCHY_MENU_INITIAL_MENU="root" \
-    OMARCHY_MENU_SELECTION_FILE="$selection_file" \
-    OMARCHY_MENU_DONE_FILE="$done_file" \
-    quickshell -n -d -p "$(menu_qml)" >/dev/null
-
-  for (( i = 0; i < 200; i++ )); do
-    [[ -S $(socket_path) ]] && break
-    sleep 0.01
-  done
-
-  [[ -S $(socket_path) ]]
-  kill_menu_shell
-  rm -f "$menu_file" "$selection_file" "$done_file"
-}
-
-menu_layer_visible() {
-  hyprctl layers -j 2>/dev/null | jq -e '.. | objects | select(.namespace? == "omarchy-menu")' >/dev/null
-}
-
-open_close_menu() {
-  local pid
-
-  env OMARCHY_PATH="$OMARCHY_PATH" PATH="$OMARCHY_BIN_DIR:$PATH" \
-    "$OMARCHY_BIN_DIR/omarchy-menu" >/dev/null &
-  pid=$!
-
-  for (( i = 0; i < 300; i++ )); do
-    if menu_layer_visible && [[ -S $(socket_path) ]]; then
-      break
-    fi
-    sleep 0.01
-  done
-
-  if [[ ! -S $(socket_path) ]]; then
-    kill "$pid" 2>/dev/null || true
-    kill_menu_shell
-    return 1
-  fi
-
-  printf 'close\n' | socat -u - "UNIX-CONNECT:$(socket_path)" >/dev/null 2>&1 || true
-
-  for (( i = 0; i < 500; i++ )); do
-    if ! kill -0 "$pid" 2>/dev/null; then
-      break
-    fi
-    sleep 0.01
-  done
-
-  if kill -0 "$pid" 2>/dev/null; then
-    kill "$pid" 2>/dev/null || true
-    kill_menu_shell
-    return 1
-  fi
-
-  wait "$pid" || true
-}
-
-cold_open_close_menu() {
-  kill_menu_shell
-  open_close_menu
-  kill_menu_shell
-}
-
-warm_open_close_menu() {
-  open_close_menu
-}
-
-while (( $# > 0 )); do
-  case "$1" in
-  --repeat=*) REPEAT="${1#*=}" ;;
-  --no-ui) NO_UI=true ;;
-  --help | -h)
-    show_help
-    exit 0
-    ;;
-  *)
-    echo "Unknown option: $1" >&2
-    show_help >&2
-    exit 2
-    ;;
-  esac
-  shift
-done
-
-if [[ ! $REPEAT =~ ^[0-9]+$ ]] || (( REPEAT < 1 )); then
-  echo "--repeat must be a positive integer" >&2
-  exit 2
-fi
-
-cleanup() {
-  kill_menu_shell
-}
-trap cleanup EXIT
-
-run_label="runs"
-(( REPEAT == 1 )) && run_label="run"
-printf 'Omarchy menu benchmark (%d %s each)\n\n' "$REPEAT" "$run_label"
-
-run_case "menu JSON build" build_menu_json
-
-if [[ $NO_UI != true ]]; then
-  if omarchy-cmd-present quickshell socat hyprctl jq && [[ -n ${WAYLAND_DISPLAY:-} ]]; then
-    printf '%-34s %s ms\n' "quickshell socket startup" "$(format_ms "$(measure_once start_quickshell_socket)")"
-    run_case "cold open/close" cold_open_close_menu
-    kill_menu_shell
-    open_close_menu >/dev/null
-    run_case "warm open/close" warm_open_close_menu
-  else
-    printf 'Skipping UI cases: quickshell/socat/hyprctl/jq/Wayland unavailable\n'
-  fi
-fi
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Measure theme switcher cache and selector prep times
-# omarchy:args=[--repeat=<count>] [--keep-cache]
-# omarchy:examples=omarchy dev benchmark theme switcher | omarchy dev benchmark theme-switcher --repeat=10
-# omarchy:aliases=omarchy dev benchmark theme-switcher
-
-set -euo pipefail
-
-OMARCHY_BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
-OMARCHY_PATH=${OMARCHY_PATH:-$(cd -- "$OMARCHY_BIN_DIR/.." && pwd)}
-REPEAT=5
-KEEP_CACHE=false
-
-show_help() {
-  cat <<'EOF'
-Usage:
-  omarchy dev benchmark theme switcher [--repeat=<count>] [--keep-cache]
-
-Measure the non-interactive parts of the theme switcher:
- theme preview index build (omarchy-theme-switcher before UI handoff)
- lazy selector row prep used by the interactive theme switcher
- full thumbnail cache warmup cost (omarchy-menu-images --cache-only)
-
-Options:
-  --repeat=<count>  Number of warm runs to measure for each case (default: 5)
-  --keep-cache      Keep the temporary benchmark cache and print its path
-EOF
-}
-
-now_us() {
-  local now="${EPOCHREALTIME/./}"
-  printf '%s' "$now"
-}
-
-format_ms() {
-  local us="$1"
-  printf '%d.%03d' "$(( us / 1000 ))" "$(( us % 1000 ))"
-}
-
-measure_once() {
-  local start_us end_us
-  start_us=$(now_us)
-  "$@" >/dev/null
-  end_us=$(now_us)
-  printf '%s' "$(( end_us - start_us ))"
-}
-
-run_case() {
-  local label="$1"
-  shift
-  local total_us=0
-  local min_us=0
-  local max_us=0
-  local elapsed_us=0
-
-  for (( i = 1; i <= REPEAT; i++ )); do
-    elapsed_us=$(measure_once "$@")
-    total_us=$(( total_us + elapsed_us ))
-
-    if (( i == 1 || elapsed_us < min_us )); then
-      min_us=$elapsed_us
-    fi
-
-    if (( elapsed_us > max_us )); then
-      max_us=$elapsed_us
-    fi
-  done
-
-  printf '%-34s avg %8s ms  min %8s ms  max %8s ms\n' \
-    "$label" \
-    "$(format_ms "$(( total_us / REPEAT ))")" \
-    "$(format_ms "$min_us")" \
-    "$(format_ms "$max_us")"
-}
-
-while (( $# > 0 )); do
-  case "$1" in
-  --repeat=*)
-    REPEAT="${1#*=}"
-    ;;
-  --keep-cache)
-    KEEP_CACHE=true
-    ;;
-  --help | -h)
-    show_help
-    exit 0
-    ;;
-  *)
-    echo "Unknown option: $1" >&2
-    show_help >&2
-    exit 2
-    ;;
-  esac
-  shift
-done
-
-if [[ ! $REPEAT =~ ^[0-9]+$ ]] || (( REPEAT < 1 )); then
-  echo "--repeat must be a positive integer" >&2
-  exit 2
-fi
-
-benchmark_cache=$(mktemp -d)
-thumbnail_cache=$(mktemp -d)
-stub_bin=$(mktemp -d)
-
-cleanup() {
-  rm -rf "$stub_bin"
-
-  if [[ $KEEP_CACHE == "true" ]]; then
-    printf 'Benchmark cache: %s\n' "$benchmark_cache"
-    printf 'Thumbnail cache: %s\n' "$thumbnail_cache"
-  else
-    rm -rf "$benchmark_cache" "$thumbnail_cache"
-  fi
-}
-trap cleanup EXIT
-
-cat >"$stub_bin/omarchy-menu-images" <<'EOF'
-#!/bin/bash
-exit 0
-EOF
-chmod +x "$stub_bin/omarchy-menu-images"
-
-benchmark_env=(
-  env
-  "OMARCHY_PATH=$OMARCHY_PATH"
-  "XDG_CACHE_HOME=$benchmark_cache"
-  "PATH=$stub_bin:$OMARCHY_BIN_DIR:$PATH"
-)
-
-thumbnail_env=(
-  env
-  "OMARCHY_PATH=$OMARCHY_PATH"
-  "XDG_CACHE_HOME=$thumbnail_cache"
-  "PATH=$stub_bin:$OMARCHY_BIN_DIR:$PATH"
-)
-
-preview_dir="$benchmark_cache/omarchy/theme-selector/previews"
-thumbnail_preview_dir="$thumbnail_cache/omarchy/theme-selector/previews"
-
-build_theme_index() {
-  "${benchmark_env[@]}" "$OMARCHY_BIN_DIR/omarchy-theme-switcher"
-}
-
-prepare_selector_lazy() {
-  "${benchmark_env[@]}" "$OMARCHY_BIN_DIR/omarchy-menu-images" --prepare-only --lazy-thumbnails --show-labels --filterable "$preview_dir"
-}
-
-prepare_image_cache() {
-  "${thumbnail_env[@]}" "$OMARCHY_BIN_DIR/omarchy-menu-images" --cache-only "$thumbnail_preview_dir"
-}
-
-printf 'Theme switcher benchmark (%d warm runs each)\n\n' "$REPEAT"
-printf '%-34s %s ms\n' "theme index cold" "$(format_ms "$(measure_once build_theme_index)")"
-run_case "theme index warm" build_theme_index
-printf '%-34s %s ms\n' "selector prep cold (lazy)" "$(format_ms "$(measure_once prepare_selector_lazy)")"
-run_case "selector prep warm (lazy)" prepare_selector_lazy
-"${thumbnail_env[@]}" "$OMARCHY_BIN_DIR/omarchy-theme-switcher" >/dev/null
-printf '%-34s %s ms\n' "thumbnail cache cold" "$(format_ms "$(measure_once prepare_image_cache)")"
-run_case "thumbnail cache warm" prepare_image_cache
-
-printf '\nTheme previews: %d\n' "$(find -L "$preview_dir" -maxdepth 1 -type f 2>/dev/null | wc -l)"
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Show Omarchy bin metadata fields and defaults
-# omarchy:args=[--json]
-
-set -euo pipefail
-
-show_json() {
-  jq -n '{
-    ok: true,
-    defaults: {
-      group: "first filename segment after omarchy-",
-      name: "remaining filename segments with dashes converted to spaces",
-      route: "omarchy <group> <name>",
-      binary: "filename",
-      requires_sudo: false
-    },
-    fields: [
-      {name: "summary", required: true, type: "string", note: "One-line human and agent-facing description."},
-      {name: "group", required: false, type: "string", note: "Only set when the route group should differ from the filename-derived group."},
-      {name: "name", required: false, type: "string", note: "Only set when the route name should differ from the filename-derived name. May be empty for root commands."},
-      {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."}
-    ]
-  }'
-}
-
-show_help() {
-  cat <<'EOF'
-Omarchy bin metadata
-
-Metadata lives in the top comment block of each executable bin/omarchy-* file.
-Keep it slim: define only fields that are required or override defaults.
-
-Required:
-  # omarchy:summary=<one-line description>
-
-Inferred defaults:
-  group         first filename segment after omarchy-
-  name          remaining filename segments, with dashes converted to spaces
-  route         omarchy <group> <name>
-  binary        filename
-  requires-sudo false
-  hidden        false
-
-Optional fields:
-  # omarchy:group=<group>                  route override only
-  # omarchy:name=<name>                    route override only; may be empty
-  # omarchy:args=<args>                    only if the command accepts args
-  # 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
-  usage       derived from route + args
-  false flags or empty args
-
-Examples:
-  # omarchy:summary=Restart Walker and related user services
-
-  # omarchy:summary=Take a screenshot
-  # omarchy:group=capture
-  # omarchy:args=[smart|region|windows|fullscreen] [slurp|copy] [--editor=<name>]
-  # omarchy:examples=omarchy screenshot | omarchy capture screenshot region
-  # omarchy:aliases=omarchy screenshot
-EOF
-}
-
-case "${1:-}" in
--json)
-  show_json
-  ;;
--help | -h)
-  show_help
-  ;;
-"")
-  show_help
-  ;;
-*)
-  echo "Unknown option: $1" >&2
-  show_help >&2
-  exit 2
-  ;;
-esac
@@ -1,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Print drive information such as size, model, and mount details
-# omarchy:args=<drive>
+# Returns drive information about a given volumne, like /dev/nvme0, which is used by omarchy-drive-select.

 if (($# == 0)); then
  echo "Usage: omarchy-drive-info [/dev/drive]"
@@ -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.
+# 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)')
@@ -1,12 +1,11 @@
 #!/bin/bash

-# omarchy:summary=Set a new encryption password for a drive selected.
-# omarchy:requires-sudo=true
+# Set a new encryption password for a drive selected.

 encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)

 if [[ -n $encrypted_drives ]]; then
-  if (( $(wc -l <<<"$encrypted_drives") == 1 )); then
+  if (( $(wc -l <<<encrypted_drives) == 1 )); then
    drive_to_change="$encrypted_drives"
  else
    drive_to_change="$(omarchy-drive-select "$encrypted_drives")"
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Show current monospace font
-# omarchy:examples=omarchy font current
+# Returns the name of the current monospace font being used by extracting it from the Waybar stylesheet.
+# This can be changed using omarchy-font-set.

 grep -oP 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1
@@ -1,6 +1,5 @@
 #!/bin/bash

-# omarchy:summary=List available monospace fonts
-# omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"
+# Returns a list of all the monospace fonts available on the system that can be set using omarchy-font-set.

 fc-list :spacing=100 -f "%{family[0]}\n" | grep -v -i -E 'emoji|signwriting|omarchy' | sort -u
@@ -1,8 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Set the system monospace font
-# omarchy:args=<font-name>
-# omarchy:examples=omarchy font list | omarchy font set "CaskaydiaMono Nerd Font"
+# Set the system-wide monospace font that should be used by the terminal, hyprlock, waybar, swayosd, etc.
+# The font name must be one of the ones returned by omarchy-font-list.

 font_name="$1"

@@ -22,10 +21,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 +36,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,94 @@
+#!/usr/bin/env python3
+
+"""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,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Check if hibernation is supported
-
+# Check if hibernation is supported
 if [[ ! -f /sys/power/image_size ]]; then
  exit 1
 fi
@@ -1,7 +1,7 @@
 #!/bin/bash

-# omarchy:summary=Remove hibernation setup including swap and boot resume settings
-# omarchy:requires-sudo=true
+# Removes hibernation setup: disables swap, removes swapfile, removes fstab entry,
+# removes resume hook, and removes suspend-then-hibernate configuration.

 MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"

@@ -44,6 +44,11 @@ if grep -Fq "$SWAP_FILE" /etc/fstab; then
  sudo sed -i '/^# Btrfs swapfile for system hibernation$/d' /etc/fstab
 fi

+# Remove suspend-then-hibernate configuration
+echo "Removing suspend-then-hibernate configuration"
+sudo rm -f /etc/systemd/logind.conf.d/lid.conf
+sudo rm -f /etc/systemd/sleep.conf.d/hibernate.conf
+
 # Remove mkinitcpio resume hook
 echo "Removing resume hook"
 sudo rm "$MKINITCPIO_CONF"
@@ -1,27 +1,14 @@
 #!/bin/bash

-# omarchy:summary=Set up hibernation with swap and boot resume configuration
-# omarchy:requires-sudo=true
-# omarchy:args=[--force] [--no-rebuild]
-
-FORCE=false
-NO_REBUILD=false
-for arg in "$@"; do
-  case "$arg" in
-    --force) FORCE=true ;;
-    --no-rebuild) NO_REBUILD=true ;;
-  esac
-done
+# Creates a swap file in the btrfs subvolume, adds the swap file to /etc/fstab,
+# adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.

 if [[ ! -f /sys/power/image_size ]]; then
  echo -e "Hibernation is not supported on your system" >&2
  exit 0
 fi

-# When --no-rebuild is set, the caller is responsible for the UKI rebuild
-# (e.g. running before limine-mkinitcpio-hook is installed during initial
-# install), so we only require limine-mkinitcpio when we'd invoke it ourselves.
-if ! $NO_REBUILD && ! command -v limine-mkinitcpio &>/dev/null; then
+if ! command -v limine-mkinitcpio &>/dev/null; then
  echo "Skipping hibernation setup (requires Limine bootloader)"
  exit 0
 fi
@@ -39,14 +26,15 @@ if [[ -f $MKINITCPIO_CONF ]] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF";
      echo "Fixing empty resume_offset ($RESUME_OFFSET)"
      sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" "$RESUME_DROP_IN"
      sudo sed -i "s/resume_offset=\"$/resume_offset=$RESUME_OFFSET\"/" /etc/default/limine
-      $NO_REBUILD || sudo limine-mkinitcpio
+      sudo limine-mkinitcpio
+      sudo limine-update
    fi
  fi
  echo "Hibernation is already set up"
  exit 0
 fi

-if ! $FORCE; then
+if [[ $1 != "--force" ]]; then
  MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
  if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
    exit 0
@@ -117,16 +105,13 @@ if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
  fi
 fi

-if ! $NO_REBUILD; then
-  # limine-mkinitcpio rebuilds initramfs/UKI for all kernels and updates the
-  # /boot/limine.conf entries via limine-entry-tool. The limine bootloader
-  # binary on the ESP doesn't change here, so we don't need limine-update
-  # (which would also re-deploy the binary and rebuild a second time).
-  echo "Regenerating initramfs..."
-  sudo limine-mkinitcpio
-  echo
-fi
+# Regenerate initramfs and boot entry
+echo "Regenerating initramfs..."
+sudo limine-mkinitcpio
+sudo limine-update

-if ! $FORCE && ! $NO_REBUILD && gum confirm "Reboot to enable hibernation?"; then
+echo
+
+if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
  omarchy-system-reboot
 fi
@@ -1,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Run a named hook from ~/.config/omarchy/hooks/<name> and ~/.config/omarchy/hooks/<name>.d/.
-# omarchy:args=[name] [args...]
+# Run a named hook, like post-update (available in ~/.config/omarchy/hooks/post-update).

 set -e

@@ -12,17 +11,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 ExpertBook B9406 series laptops on Intel Panther Lake.
-
-omarchy-hw-match "B9406" && omarchy-hw-intel-ptl
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Detect whether the computer is an Asus ROG machine.
+# Detect whether the computer is an Asus ROG machine.

 [[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "ASUSTeK COMPUTER INC." ]] &&
   grep -q "ROG" /sys/class/dmi/id/product_family 2>/dev/null
@@ -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 ]]
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Match Dell XPS systems with LG OLED panel on Intel Panther Lake (Xe3) GPU.
+# Match Dell XPS systems with LG OLED panel on Intel Panther Lake (Xe3) GPU.

 omarchy-hw-match "XPS" \
  && omarchy-hw-intel-ptl \
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Returns true when an external monitor is physically connected.
-
-for status in /sys/class/drm/card*-*/status; do
-  [[ "$status" == *-eDP-*/status ]] && continue
-  [[ "$(<"$status")" == "connected" ]] && exit 0
-done
-exit 1
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Detect whether the computer is a Framework Laptop 16.
+# Detect whether the computer is a Framework Laptop 16.

 [[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "Framework" ]] &&
  omarchy-hw-match "Laptop 16"
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect whether the system has an active hybrid GPU configuration
-
-if command -v supergfxctl &>/dev/null; then
-  supergfxctl -s 2>/dev/null | grep -qw Hybrid
-else
-  (($(lspci | grep -cE 'VGA|3D|Display') >= 2))
-fi
@@ -1,5 +1,5 @@
 #!/bin/bash

-# omarchy:summary=Detect whether the computer has an Intel CPU.
+# Detect whether the computer has an Intel CPU.

 [[ $(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ') == "GenuineIntel" ]]
@@ -1,5 +1,5 @@
 #!/bin/bash

-# omarchy:summary=Detect whether the computer has an Intel Panther Lake GPU.
+# Detect whether the computer has an Intel Panther Lake GPU.

 lspci | grep -iE 'vga|3d|display' | grep -qi 'panther lake'
@@ -1,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Match against the computer's DMI product name or product family (case-insensitive).
-# omarchy:args=<pattern>
+# Match against the computer's DMI product name (case-insensitive).
+# Usage: omarchy-hw-match "XPS"

-grep -qi "$1" /sys/class/dmi/id/product_name 2>/dev/null ||
-grep -qi "$1" /sys/class/dmi/id/product_family 2>/dev/null
+grep -qi "$1" /sys/class/dmi/id/product_name 2>/dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect whether the computer has an NVIDIA GPU with GSP firmware (Turing or newer).
-
-# GTX 16xx, RTX 20xx-50xx, RTX Pro, Quadro RTX, datacenter A/H/T/L series.
-lspci | grep -i 'nvidia' | grep -qE "GTX 16[0-9]{2}|RTX [2-5][0-9]{3}|RTX PRO [0-9]{4}|Quadro RTX|RTX A[0-9]{4}|A[1-9][0-9]{2}|H[1-9][0-9]{2}|T4|L[0-9]+"
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Detect whether the computer has an NVIDIA GPU without GSP firmware (Maxwell/Pascal/Volta).
-
-# GTX 9xx/10xx, GT 10xx, Quadro P/M/GV, MX series, Titan X/Xp/V, Tesla V100.
-lspci | grep -i 'nvidia' | grep -qE "GTX (9[0-9]{2}|10[0-9]{2})|GT 10[0-9]{2}|Quadro [PM][0-9]{3,4}|Quadro GV100|MX *[0-9]+|Titan (X|Xp|V)|Tesla V100"
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# 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"
-
-if [[ -f $TOGGLE ]] && ! omarchy-hw-external-monitors; then
-  rm -f "$TOGGLE"
-fi
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Detect whether the computer is a Microsoft Surface device.
+# Detect whether the computer is a Microsoft Surface device.

 [[ $(cat /sys/class/dmi/id/sys_vendor 2>/dev/null) == "Microsoft Corporation" ]] &&
  omarchy-hw-match "Surface"
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Print the detected Hyprland touchpad or trackpad device name
-
-device=$(hyprctl devices -j | jq -r '[.mice[] | .name | select(test("touchpad|trackpad"; "i"))] | first // empty')
-[[ -n $device ]] && echo "$device"
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Print the detected Hyprland touchscreen or tablet device name
-
-device=$(hyprctl devices -j | jq -r '[.touch[]?.name, .tablets[]?.name] | first // empty')
-[[ -n $device ]] && echo "$device"
@@ -1,6 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Detect whether Vulkan is available.
+# Detect whether Vulkan is available.

 [[ -d /usr/share/vulkan/icd.d ]] &&
  find /usr/share/vulkan/icd.d -maxdepth 1 -name "*.json" -print -quit | grep -q .
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Toggles transparency for the currently focused window.
+
+hyprctl dispatch setprop "address:$(hyprctl activewindow -j | jq -r '.address')" opaque toggle
@@ -1,5 +1,5 @@
 #!/bin/bash

-# omarchy:summary=Print the name of the currently focused Hyprland monitor.
+# Print the name of the currently focused Hyprland monitor.

 hyprctl monitors -j | jq -r '.[] | select(.focused == true).name'
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# 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
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Enable, disable, toggle, or recover the internal laptop display
-# omarchy:args=<on|off|toggle|recover>
-
-TOGGLE="internal-monitor-disable"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
-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"
-  fi
-}
-
-off() {
-  if ! omarchy-hw-external-monitors; then
-    omarchy-notification-send -g 󰍹 "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"
-    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
-  fi
-}
-
-case "$1" in
-  on) on ;;
-  off) off ;;
-  toggle) toggle ;;
-  recover) recover ;;
-  *)
-    echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
-    exit 1
-    ;;
-esac
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Enable, disable, toggle, or recover mirroring the internal display to an external monitor
-# omarchy:args=<on|off|toggle|recover>
-
-TOGGLE="internal-monitor-mirror"
-TOGGLE_FLAG="$HOME/.local/state/omarchy/toggles/hypr/$TOGGLE.lua"
-DISABLE_TOGGLE="internal-monitor-disable"
-
-# Get names dynamically
-INTERNAL=$(hyprctl monitors -j | jq -r '.[] | select(.name | contains("eDP")).name' | head -n 1)
-# 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"
-    exit 1
-  fi
-
-  if [[ -z $INTERNAL ]]; then
-    omarchy-notification-send -g 󰍹 "No laptop monitor found to mirror"
-    exit 1
-  fi
-
-  omarchy-hyprland-toggle $DISABLE_TOGGLE off
-
-  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)"
-    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
-  fi
-}
-
-recover() {
-  if ! omarchy-hw-external-monitors && omarchy-hyprland-toggle-enabled $TOGGLE; then
-    omarchy-hyprland-toggle $TOGGLE off
-  fi
-}
-
-case "$1" in
-  on) on ;;
-  off) off ;;
-  toggle) toggle ;;
-  recover) recover ;;
-  *)
-    echo "Usage: $(basename "$0") {on|off|toggle|recover}" >&2
-    exit 1
-    ;;
-esac
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Toggle the internal laptop display on/off.
+# Useful when connected to an external monitor and you want to close the lid
+# or just use the external display only.
+
+INTERNAL=$(hyprctl monitors all -j | jq -r '.[] | select(.name | startswith("eDP")) | .name')
+
+if [[ -z $INTERNAL ]]; then
+  notify-send -u low "󰍹    No internal display found"
+  exit 1
+fi
+
+DISABLED=$(hyprctl monitors all -j | jq -r --arg m "$INTERNAL" '.[] | select(.name == $m) | .disabled')
+
+if [[ $DISABLED == "true" ]]; then
+  hyprctl keyword monitor "$INTERNAL,preferred,auto,auto"
+  hyprctl dispatch movecursor 0 0
+  notify-send -u low "󰍹    Internal display on"
+else
+  ACTIVE_COUNT=$(hyprctl monitors -j | jq 'length')
+  if [[ $ACTIVE_COUNT -le 1 ]]; then
+    notify-send -u low "󰍹    Can't disable the only active display"
+    exit 1
+  fi
+
+  hyprctl keyword monitor "$INTERNAL,disable"
+  notify-send -u low "󰍹    Internal display off"
+fi
@@ -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,7 +1,6 @@
 #!/bin/bash

-# omarchy:summary=Cycle focused Hyprland monitor scaling through 1x, 1.25x, 1.6x, 2x, 3x, and 4x
-
+# Get the active monitor (the one with the cursor)
 MONITOR_INFO=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true)')
 ACTIVE_MONITOR=$(echo "$MONITOR_INFO" | jq -r '.name')
 CURRENT_SCALE=$(echo "$MONITOR_INFO" | jq -r '.scale')
@@ -9,46 +8,15 @@ 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.6 → 2 → 3 → 1
+CURRENT_INT=$(awk -v s="$CURRENT_SCALE" 'BEGIN { printf "%.0f", s * 10 }')

-# 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)
-CURRENT_IDX=$(awk -v s="$CURRENT_SCALE" -v list="${SCALES[*]}" 'BEGIN {
-  n = split(list, arr, " ")
-  best = 0; best_diff = 1e9
-  for (i = 1; i <= n; i++) {
-    d = s - arr[i]; if (d < 0) d = -d
-    if (d < best_diff) { best_diff = d; best = i - 1 }
-  }
-  print best
-}')
-
-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
-
-# 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"
-fi
+case "$CURRENT_INT" in
+10) NEW_SCALE=1.6 ;;
+16) NEW_SCALE=2 ;;
+20) NEW_SCALE=3 ;;
+*) NEW_SCALE=1 ;;
+esac

+hyprctl keyword monitor "$ACTIVE_MONITOR,${WIDTH}x${HEIGHT}@${REFRESH_RATE},auto,$NEW_SCALE"
 notify-send -u low "󰍹    Display scaling set to ${NEW_SCALE}x"
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Watch Hyprland monitor events and recover monitor toggles when a monitor is removed
-
-SOCKET="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
-
-socat -U - "UNIX-CONNECT:$SOCKET" | while read -r event; do
-  case "$event" in
-    monitorremoved\>\>*|monitorremovedv2\>\>*)
-      omarchy-hyprland-monitor-internal recover
-      omarchy-hyprland-monitor-internal-mirror recover
-      ;;
-  esac
-done
@@ -1,77 +0,0 @@
-#!/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]
-
-ENABLED_NOTIFICATION=""
-DISABLED_NOTIFICATION=""
-
-while (($# > 0)); 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
-      ;;
-    *) break ;;
-  esac
-done
-
-if (($# < 1)); then
-  echo "Usage: omarchy-hyprland-toggle [--enabled-notification <text>] [--disabled-notification <text>] <flag-name> [on|off|toggle]" >&2
-  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
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Check if a Hyprland toggle is currently disabled (missing).
-# omarchy:args=<flag-name>
-
-[[ ! -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# omarchy:summary=Check if a Hyprland toggle is currently enabled.
-# omarchy:args=<flag-name>
-
-[[ -f "$HOME/.local/state/omarchy/toggles/hypr/$1.lua" ]]
@@ -1,12 +1,9 @@
 #!/bin/bash

-# omarchy:summary=Close all open windows
-
+# Close all open windows
 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
@@ -1,5 +1,15 @@
 #!/bin/bash

-# omarchy:summary=Toggles the window gaps globally between no gaps and the default.
+# Toggles the window gaps globally between no gaps and the default 10/5/2.

-omarchy-hyprland-toggle window-no-gaps
+gaps=$(hyprctl getoption general:gaps_out -j | jq -r '.custom' | awk '{print $1}')
+
+if [[ $gaps == "0" ]]; then
+  hyprctl keyword general:gaps_out 10
+  hyprctl keyword general:gaps_in 5
+  hyprctl keyword general:border_size 2
+else
+  hyprctl keyword general:gaps_out 0
+  hyprctl keyword general:gaps_in 0
+  hyprctl keyword general:border_size 0
+fi
@@ -1,7 +1,19 @@
 #!/bin/bash

-# omarchy:summary=Toggle to pop-out a tile to stay fixed on a display basis.
-# omarchy:args=[width height x y]
+# Toggle to pop-out a tile to stay fixed on a display basis.
+
+# Usage:
+# omarchy-hyprland-window-pop [width height [x y]]
+#
+# Arguments:
+#   width   Optional. Width of the floating window. Default: 1300
+#   height  Optional. Height of the floating window. Default: 900
+#   x       Optional. X position of the window. Must provide both X and Y to take effect.
+#   y       Optional. Y position of the window. Must provide both X and Y to take effect.
+#
+# Behavior:
+#   - If the window is already pinned, it will be unpinned and removed from the pop layer.
+#   - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.

 width=${1:-1300}
 height=${2:-900}
@@ -11,30 +23,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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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