Merge pull request #5192 from basecamp/rc

Omarchy 3.5.0

AGENTS.md

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

applications/Alacritty.desktop

@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+TryExec=alacritty
+Exec=alacritty
+Icon=Alacritty
+Terminal=false
+Categories=System;TerminalEmulator;
+Name=Alacritty
+GenericName=Terminal
+Comment=A fast, cross-platform, OpenGL terminal emulator
+StartupNotify=true
+StartupWMClass=Alacritty
+Actions=New;
+X-TerminalArgExec=-e
+X-TerminalArgAppId=--class=
+X-TerminalArgTitle=--title=
+X-TerminalArgDir=--working-directory=
+
+[Desktop Action New]
+Name=New Terminal
+Exec=alacritty

applications/hidden/limine-snapper-restore.desktop

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

applications/hidden/wiremix.desktop

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

bin/omarchy-battery-capacity

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 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))
+
+echo "$battery_info" | awk '/energy-full:/ {
+    printf "%d", $2
+    exit
+}'

bin/omarchy-battery-monitor

@@ -9,10 +9,11 @@ BATTERY_STATE=$(upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{pr
 
 send_notification() {
   notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
+  omarchy-hook battery-low "$1"
 }
 
-if [[ -n "$BATTERY_LEVEL" && "$BATTERY_LEVEL" =~ ^[0-9]+$ ]]; then
-  if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then
+if [[ -n $BATTERY_LEVEL && $BATTERY_LEVEL =~ ^[0-9]+$ ]]; then
+  if [[ $BATTERY_STATE == "discharging" ]] && (( BATTERY_LEVEL <= BATTERY_THRESHOLD )); then
     if [[ ! -f $NOTIFICATION_FLAG ]]; then
       send_notification $BATTERY_LEVEL
       touch $NOTIFICATION_FLAG

bin/omarchy-battery-present

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

bin/omarchy-battery-remaining

@@ -3,10 +3,7 @@
 # Returns the battery percentage remaining as an integer.
 # Used by the battery monitor and the Ctrl + Shift + Super + B hotkey.
 
-upower -i $(upower -e | grep BAT) \
-| awk -F: '/percentage/ {
-    gsub(/[%[:space:]]/, "", $2);
-    val=$2;
-    printf("%d\n", (val+0.5))
+upower -i $(upower -e | grep BAT) | awk '/percentage/ { 
+    print int($2)
     exit
-  }'
+}'

bin/omarchy-battery-remaining-time

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Returns the battery time remaining (to empty or full) in a compact format.
+
+battery_info=$(upower -i $(upower -e | grep BAT))
+
+echo "$battery_info" | awk '/time to (empty|full)/ {
+    value = $4
+    unit = $5
+    if (unit ~ /^minute/) {
+        printf "%dm", int(value)
+    } else {
+        hours = int(value)
+        minutes = int((value - hours) * 60)
+        if (minutes > 0) {
+            printf "%dh %dm", hours, minutes
+        } else {
+            printf "%dh", hours
+        }
+    }
+    exit
+}'

bin/omarchy-battery-status

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# 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))
+
+percentage=$(echo "$battery_info" | awk '/percentage/ {
+    print int($2)
+    exit
+}')
+
+power_rate=$(echo "$battery_info" | awk '/energy-rate/ {
+    rounded = sprintf("%.1f", $2)
+    sub(/\.0$/, "", rounded)
+    print rounded
+    exit
+}')
+
+state=$(echo "$battery_info" | awk '/state/ { print $2; exit }')
+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"
+else
+    echo "󰁹    Battery ${percentage}%  ·  ${time_remaining} left  ·   ${power_rate}W / ${capacity}Wh"
+fi

bin/omarchy-branch-set

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

bin/omarchy-brightness-display

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

bin/omarchy-brightness-display-apple

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

bin/omarchy-brightness-keyboard

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Adjust keyboard backlight brightness using available steps.
+# Usage: omarchy-brightness-keyboard <up|down|cycle>
+
+direction="${1:-up}"
+
+# Find keyboard backlight device (look for *kbd_backlight* pattern in leds class).
+device=""
+for candidate in /sys/class/leds/*kbd_backlight*; do
+  if [[ -e $candidate ]]; then
+    device="$(basename "$candidate")"
+    break
+  fi
+done
+
+if [[ -z $device ]]; then
+  echo "No keyboard backlight device found" >&2
+  exit 1
+fi
+
+# Get current and max brightness to determine step size.
+max_brightness="$(brightnessctl -d "$device" max)"
+current_brightness="$(brightnessctl -d "$device" get)"
+
+# Calculate step as 10% of max brightness. Keyboards with many levels (e.g. 512)
+# need larger steps; keyboards with few levels (e.g. 3) fall back to step=1.
+step=$(( max_brightness / 10 ))
+(( step < 1 )) && step=1
+
+if [[ $direction == "cycle" ]]; then
+  new_brightness=$(( current_brightness + step ))
+  (( new_brightness > max_brightness )) && new_brightness=0
+elif [[ $direction == "up" ]]; then
+  new_brightness=$(( current_brightness + step ))
+  (( new_brightness > max_brightness )) && new_brightness=$max_brightness
+else
+  new_brightness=$(( current_brightness - step ))
+  (( new_brightness < 0 )) && new_brightness=0
+fi
+
+# Set the new brightness.
+brightnessctl -d "$device" set "$new_brightness" >/dev/null
+
+# Use SwayOSD to display the new brightness setting.
+percent=$((new_brightness * 100 / max_brightness))
+omarchy-swayosd-kbd-brightness "$percent"

bin/omarchy-channel-set

@@ -14,14 +14,15 @@
 # and people with a lot of experience managing Linux systems.
 
 if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [stable|edge|dev]"
+  echo "Usage: omarchy-channel-set [stable|rc|edge|dev]"
   exit 1
 else
   channel="$1"
 fi
 
 case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" && sudo pacman -Suu --noconfirm ;;
+"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
+"rc") omarchy-branch-set "rc" && omarchy-refresh-pacman "rc" ;;
 "edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
 "dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
 *) echo "Unknown channel: $channel"; exit 1; ;;

bin/omarchy-cmd-apple-display-brightness

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

bin/omarchy-cmd-audio-switch

@@ -7,7 +7,7 @@ focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).n
 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" -eq 0 ]; then
+if (( sinks_count == 0 )); then
   swayosd-client \
     --monitor "$focused_monitor" \
     --custom-message "No audio devices found"
@@ -17,7 +17,7 @@ fi
 current_sink_name=$(pactl get-default-sink)
 current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
 
-if [ "$current_sink_index" != "null" ]; then
+if [[ $current_sink_index != "null" ]]; then
   next_sink_index=$(((current_sink_index + 1) % sinks_count))
 else
   next_sink_index=0
@@ -27,20 +27,28 @@ next_sink=$(echo "$sinks" | jq -r ".[$next_sink_index]")
 next_sink_name=$(echo "$next_sink" | jq -r '.name')
 
 next_sink_description=$(echo "$next_sink" | jq -r '.description')
-if [ "$next_sink_description" = "(null)" ] || [ "$next_sink_description" = "null" ] || [ -z "$next_sink_description" ]; then
-  sink_id=$(echo "$next_sink" | jq -r '.properties."object.id"')
-  next_sink_description=$(wpctl status | grep -E "\s+\*?\s+${sink_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
+if [[ $next_sink_description == "(null)" ]] || [[ $next_sink_description == "null" ]] || [[ -z $next_sink_description ]]; then
+  # For Bluetooth devices, the friendly name is on the Device entry (device.id), not the Sink entry (object.id)
+  device_id=$(echo "$next_sink" | jq -r '.properties."device.id"')
+  if [[ $device_id != "null" ]] && [[ -n $device_id ]]; then
+    next_sink_description=$(wpctl status | grep -E "^\s*│?\s+${device_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
+  fi
+  # Fall back to object.id lookup if device.id didn't yield a result
+  if [[ -z $next_sink_description ]]; then
+    sink_id=$(echo "$next_sink" | jq -r '.properties."object.id"')
+    next_sink_description=$(wpctl status | grep -E "\s+\*?\s+${sink_id}\." | sed -E 's/^.*[0-9]+\.\s+//' | sed -E 's/\s+\[.*$//')
+  fi
 fi
 
 next_sink_volume=$(echo "$next_sink" | jq -r \
   '.volume | to_entries[0].value.value_percent | sub("%"; "")')
 next_sink_is_muted=$(echo "$next_sink" | jq -r '.mute')
 
-if [ "$next_sink_is_muted" = "true" ] || [ "$next_sink_volume" -eq 0 ]; then
+if [[ $next_sink_is_muted = "true" ]] || (( next_sink_volume == 0 )); then
   icon_state="muted"
-elif [ "$next_sink_volume" -le 33 ]; then
+elif (( next_sink_volume <= 33 )); then
   icon_state="low"
-elif [ "$next_sink_volume" -le 66 ]; then
+elif (( next_sink_volume <= 66 )); then
   icon_state="medium"
 else
   icon_state="high"
@@ -48,7 +56,7 @@ fi
 
 next_sink_volume_icon="sink-volume-${icon_state}-symbolic"
 
-if [ "$next_sink_name" != "$current_sink_name" ]; then
+if [[ $next_sink_name != $current_sink_name ]]; then
   pactl set-default-sink "$next_sink_name"
 fi
 

bin/omarchy-cmd-first-run

@@ -6,7 +6,7 @@ set -e
 
 FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
 
-if [[ -f "$FIRST_RUN_MODE" ]]; then
+if [[ -f $FIRST_RUN_MODE ]]; then
   rm -f "$FIRST_RUN_MODE"
 
   bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"

bin/omarchy-cmd-screenrecord

@@ -2,11 +2,13 @@
 
 # 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
+if [[ ! -d $OUTPUT_DIR ]]; then
   notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
   exit 1
 fi
@@ -14,24 +16,34 @@ 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" ;;
-    --stop-recording) STOP_RECORDING="true"
+  --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
 
-cleanup_webcam() {
-  pkill -f "WebcamOverlay" 2>/dev/null
-}
-
 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')
 
@@ -41,7 +53,7 @@ start_webcam_overlay() {
   # Try preferred 16:9 resolutions in order, use first available
   local preferred_resolutions=("640x360" "1280x720" "1920x1080")
   local video_size_arg=""
-  local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
+  local available_formats=$(v4l2-ctl --list-formats-ext -d "$WEBCAM_DEVICE" 2>/dev/null)
 
   for resolution in "${preferred_resolutions[@]}"; do
     if echo "$available_formats" | grep -q "$resolution"; then
@@ -50,8 +62,8 @@ start_webcam_overlay() {
     fi
   done
 
-  ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
-    -vf "scale=${target_width}:-1" \
+  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 \
@@ -60,44 +72,83 @@ start_webcam_overlay() {
   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=""
+  local audio_args=()
 
-  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
+  [[ $DESKTOP_AUDIO == "true" ]] && audio_devices+="default_output"
 
-  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
+  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+="|"
+    [[ -n $audio_devices ]] && audio_devices+="|"
     audio_devices+="default_input"
   fi
 
-  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
+  [[ -n $audio_devices ]] && audio_args+=(-a "$audio_devices" -ac aac)
 
-  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
-  toggle_screenrecording_indicator
+  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
+  pkill -SIGINT -f "^gpu-screen-recorder" # SIGINT required to save video properly
 
   # Wait a maximum of 5 seconds to finish before hard killing
   local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
+  while pgrep -f "^gpu-screen-recorder" >/dev/null && ((count < 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"
-    cleanup_webcam
     notify-send "Screen recording error" "Recording process had to be force-killed. Video may be corrupted." -u critical -t 5000
   else
-    cleanup_webcam
-    notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
+    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
-  toggle_screenrecording_indicator
+
+  rm -f "$RECORDING_FILE"
 }
 
 toggle_screenrecording_indicator() {
@@ -105,19 +156,29 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  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
-  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
-    cleanup_webcam
-  else
-    stop_screenrecording
-  fi
-elif [[ "$STOP_RECORDING" == "false" ]]; then
-  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+  stop_screenrecording
+elif [[ $STOP_RECORDING == "true" ]]; then
+  exit 1
+else
+  [[ $WEBCAM == "true" ]] && start_webcam_overlay
 
   start_screenrecording || cleanup_webcam
-else
-  exit 1
 fi

bin/omarchy-cmd-screenshot

@@ -2,85 +2,132 @@
 
 # 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}}"
 
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
+if [[ ! -d $OUTPUT_DIR ]]; then
+  mkdir -p "$OUTPUT_DIR"
+  notify-send "Created screenshot directory: $OUTPUT_DIR" -u normal -t 2000
 fi
 
 pkill slurp && exit 0
 
+SCREENSHOT_EDITOR="${OMARCHY_SCREENSHOT_EDITOR:-satty}"
+
+# Parse --editor flag from any position
+ARGS=()
+for arg in "$@"; do
+  if [[ $arg == --editor=* ]]; then
+    SCREENSHOT_EDITOR="${arg#--editor=}"
+  else
+    ARGS+=("$arg")
+  fi
+done
+set -- "${ARGS[@]}"
+
+open_editor() {
+  local filepath="$1"
+  if [[ $SCREENSHOT_EDITOR == "satty" ]]; then
+    satty --filename "$filepath" \
+      --output-filename "$filepath" \
+      --actions-on-enter save-to-clipboard \
+      --save-after-copy \
+      --copy-command 'wl-copy'
+  else
+    $SCREENSHOT_EDITOR "$filepath"
+  fi
+}
+
 MODE="${1:-smart}"
 PROCESSING="${2:-slurp}"
 
+# accounting for portrait/transformed displays
+JQ_MONITOR_GEO='
+  def format_geo:
+    .x as $x | .y as $y |
+    (.width / .scale | floor) as $w |
+    (.height / .scale | floor) as $h |
+    .transform as $t |
+    if $t == 1 or $t == 3 then
+      "\($x),\($y) \($h)x\($w)"
+    else
+      "\($x),\($y) \($w)x\($h)"
+    end;
+'
+
 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 monitors -j | jq -r --arg ws "$active_workspace" "${JQ_MONITOR_GEO} .[] | select(.activeWorkspace.id == (\$ws | tonumber)) | format_geo"
   hyprctl clients -j | jq -r --arg ws "$active_workspace" '.[] | select(.workspace.id == ($ws | tonumber)) | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
 }
 
 # Select based on mode
 case "$MODE" in
-  region)
-    wayfreeze & PID=$!
-    sleep .1
-    SELECTION=$(slurp 2>/dev/null)
-    kill $PID 2>/dev/null
-    ;;
-  windows)
-    wayfreeze & PID=$!
-    sleep .1
-    SELECTION=$(get_rectangles | slurp -r 2>/dev/null)
-    kill $PID 2>/dev/null
-    ;;
-  fullscreen)
-    SELECTION=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"')
-    ;;
-  smart|*)
-    RECTS=$(get_rectangles)
-    wayfreeze & PID=$!
-    sleep .1
-    SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
-    kill $PID 2>/dev/null
+region)
+  hyprpicker -r -z >/dev/null 2>&1 &
+  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")
+  ;;
+smart | *)
+  RECTS=$(get_rectangles)
+  hyprpicker -r -z >/dev/null 2>&1 &
+  PID=$!
+  sleep .1
+  SELECTION=$(echo "$RECTS" | slurp 2>/dev/null)
+  kill $PID 2>/dev/null
 
-    # If the selction area is L * W < 20, we'll assume you were trying to select whichever
-    # window or output it was inside of to prevent accidental 2px snapshots
-    if [[ "$SELECTION" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
-      if (( ${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20 )); then
-        click_x="${BASH_REMATCH[1]}"
-        click_y="${BASH_REMATCH[2]}"
+  # If the selection area is L * W < 20, we'll assume you were trying to select whichever
+  # window or output it was inside of to prevent accidental 2px snapshots
+  if [[ $SELECTION =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+)$ ]]; then
+    if ((${BASH_REMATCH[3]} * ${BASH_REMATCH[4]} < 20)); then
+      click_x="${BASH_REMATCH[1]}"
+      click_y="${BASH_REMATCH[2]}"
 
-        while IFS= read -r rect; do
-          if [[ "$rect" =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+) ]]; then
-            rect_x="${BASH_REMATCH[1]}"
-            rect_y="${BASH_REMATCH[2]}"
-            rect_width="${BASH_REMATCH[3]}"
-            rect_height="${BASH_REMATCH[4]}"
+      while IFS= read -r rect; do
+        if [[ $rect =~ ^([0-9]+),([0-9]+)[[:space:]]([0-9]+)x([0-9]+) ]]; then
+          rect_x="${BASH_REMATCH[1]}"
+          rect_y="${BASH_REMATCH[2]}"
+          rect_width="${BASH_REMATCH[3]}"
+          rect_height="${BASH_REMATCH[4]}"
 
-            if (( click_x >= rect_x && click_x < rect_x+rect_width && click_y >= rect_y && click_y < rect_y+rect_height )); then
-              SELECTION="${rect_x},${rect_y} ${rect_width}x${rect_height}"
-              break
-            fi
+          if ((click_x >= rect_x && click_x < rect_x + rect_width && click_y >= rect_y && click_y < rect_y + rect_height)); then
+            SELECTION="${rect_x},${rect_y} ${rect_width}x${rect_height}"
+            break
           fi
-        done <<< "$RECTS"
-      fi
+        fi
+      done <<<"$RECTS"
     fi
-    ;;
+  fi
+  ;;
 esac
 
-[ -z "$SELECTION" ] && exit 0
+[[ -z $SELECTION ]] && exit 0
+
+FILENAME="screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png"
+FILEPATH="$OUTPUT_DIR/$FILENAME"
 
 if [[ $PROCESSING == "slurp" ]]; then
-grim -g "$SELECTION" - |
-  satty --filename - \
-    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'
+  grim -g "$SELECTION" "$FILEPATH" || exit 1
+  wl-copy <"$FILEPATH"
+
+  (
+    ACTION=$(notify-send "Screenshot saved to clipboard and file" "Edit with Super + Alt + , (or click this)" -t 10000 -i "$FILEPATH" -A "default=edit")
+    [[ $ACTION == "default" ]] && open_editor "$FILEPATH"
+  ) &
 else
   grim -g "$SELECTION" - | wl-copy
 fi

bin/omarchy-cmd-share

@@ -25,7 +25,7 @@ else
       # Pick one or more files from home directory
       FILES=$(find "$HOME" -type f 2>/dev/null | fzf --multi)
     fi
-    [ -z "$FILES" ] && exit 0
+    [[ -z $FILES ]] && exit 0
   fi
 fi
 

bin/omarchy-config-direct-boot

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# 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
+  exit 1
+fi
+
+if ! efibootmgr &>/dev/null; then
+  echo "Error: efibootmgr is not available or not functional" >&2
+  exit 1
+fi
+
+if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "American Megatrends"; then
+  echo "Error: American Megatrends firmware may not safely support custom EFI entries" >&2
+  exit 1
+fi
+
+if cat /sys/class/dmi/id/bios_vendor 2>/dev/null | grep -qi "Apple"; then
+  echo "Error: Apple firmware uses its own boot manager" >&2
+  exit 1
+fi
+
+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

bin/omarchy-debug

@@ -5,7 +5,7 @@
 NO_SUDO=false
 PRINT_ONLY=false
 
-while [[ $# -gt 0 ]]; do
+while (( $# > 0 )); do
   case "$1" in
     --no-sudo)
       NO_SUDO=true
@@ -25,7 +25,7 @@ done
 
 LOG_FILE="/tmp/omarchy-debug.log"
 
-if [ "$NO_SUDO" = true ]; then
+if [[ $NO_SUDO = "true" ]]; then
   DMESG_OUTPUT="(skipped - --no-sudo flag used)"
 else
   DMESG_OUTPUT="$(sudo dmesg)"
@@ -47,7 +47,7 @@ DMESG
 $DMESG_OUTPUT
 
 =========================================
-JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
+JOURNALCTL (CURRENT BOOT, WARNINGS+ERRORS)
 =========================================
 $(journalctl -b -p 4..1)
 
@@ -57,7 +57,7 @@ INSTALLED PACKAGES
 $({ expac -S '%n %v (%r)' $(pacman -Qqe) 2>/dev/null; comm -13 <(pacman -Sql | sort) <(pacman -Qqe | sort) | xargs -r expac -Q '%n %v (AUR)'; } | sort)
 EOF
 
-if [ "$PRINT_ONLY" = true ]; then
+if [[ $PRINT_ONLY = "true" ]]; then
   cat "$LOG_FILE"
   exit 0
 fi
@@ -73,7 +73,7 @@ case "$ACTION" in
   "Upload log")
     echo "Uploading debug log to 0x0.st..."
     URL=$(curl -sF "file=@$LOG_FILE" -Fexpires=24 https://0x0.st)
-    if [ $? -eq 0 ] && [ -n "$URL" ]; then
+    if (( $? == 0 )) && [[ -n $URL ]]; then
       echo "✓ Log uploaded successfully!"
       echo "Share this URL:"
       echo ""

bin/omarchy-dev-add-migration

@@ -7,7 +7,7 @@ cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
 
-if [[ "$1" != "--no-edit" ]]; then
+if [[ $1 != "--no-edit" ]]; then
   nvim $migration_file
 fi
 

bin/omarchy-drive-info

@@ -11,7 +11,7 @@ fi
 
 # Find the root drive in case we are looking at partitions
 root_drive=$(lsblk -no PKNAME "$drive" 2>/dev/null | tail -n1)
-if [[ -n "$root_drive" ]]; then
+if [[ -n $root_drive ]]; then
   root_drive="/dev/$root_drive"
 else
   root_drive="$drive"
@@ -19,11 +19,31 @@ fi
 
 # Get basic disk information
 size=$(lsblk -dno SIZE "$drive" 2>/dev/null)
-model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null)
+vendor=$(lsblk -dno VENDOR "$root_drive" 2>/dev/null | sed 's/ *$//')
+model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null | sed 's/ *$//')
+
+# Combine vendor and model, avoiding duplication
+label=""
+if [[ -n $vendor && -n $model ]]; then
+  if [[ $model == *$vendor* ]]; then
+    label="$model"
+  else
+    label="$vendor $model"
+  fi
+elif [[ -n $model ]]; then
+  label="$model"
+elif [[ -n $vendor ]]; then
+  label="$vendor"
+fi
 
 # Format display string
 display="$drive"
-[[ -n "$size" ]] && display="$display ($size)"
-[[ -n "$model" ]] && display="$display - $model"
+[[ -n $size ]] && display="$display ($size)"
+[[ -n $label ]] && display="$display - $label"
+
+# Append compact partition summary
+part_summary=$(lsblk -nro TYPE,NAME,FSTYPE,MOUNTPOINT "$root_drive" 2>/dev/null | \
+  awk '$1=="part" { printf "%s%s%s", s, ($3==""?"unknown":$3), ($4==""?"":"("$4")"); s=", " }')
+[[ -n $part_summary ]] && display+=" [$part_summary]"
 
 echo "$display"

bin/omarchy-drive-select

@@ -10,7 +10,7 @@ fi
 
 drives_with_info=""
 while IFS= read -r drive; do
-  [[ -n "$drive" ]] || continue
+  [[ -n $drive ]] || continue
   drives_with_info+="$(omarchy-drive-info "$drive")"$'\n'
 done <<<"$drives"
 

bin/omarchy-drive-set-password

@@ -5,7 +5,7 @@
 encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
 
 if [[ -n $encrypted_drives ]]; then
-  if [[ $(wc -l <<<"$encrypted_drives") -eq 1 ]]; then
+  if (( $(wc -l <<<encrypted_drives) == 1 )); then
     drive_to_change="$encrypted_drives"
   else
     drive_to_change="$(omarchy-drive-select "$encrypted_drives")"

bin/omarchy-font-set

@@ -5,7 +5,7 @@
 
 font_name="$1"
 
-if [[ -n "$font_name" ]]; then
+if [[ -n $font_name ]]; then
   if fc-list | grep -iq "$font_name"; then
     if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
       sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
@@ -33,7 +33,7 @@ if [[ -n "$font_name" ]]; then
     omarchy-restart-swayosd
 
     if pgrep -x ghostty; then
-      notify-send "    You must restart Ghostty to see font change"
+      notify-send -u low "    You must restart Ghostty to see font change"
     fi
 
     omarchy-hook font-set "$font_name"

bin/omarchy-haptic-touchpad

@@ -0,0 +1,95 @@
+#!/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"
+PRODUCT = "D01A"
+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 and f"0000{PRODUCT}" 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 PRODUCT in name and "TOUCHPAD" in name:
+                event = path.split("/")[-3]
+                return os.path.join("/dev/input", event)
+        except OSError:
+            continue
+    return None
+
+
+def main():
+    hidraw = find_hidraw()
+    if not hidraw:
+        print("No Synaptics haptic touchpad hidraw device found", file=sys.stderr)
+        sys.exit(1)
+
+    event = find_touchpad_event()
+    if not event:
+        print("No Synaptics haptic touchpad input device found", file=sys.stderr)
+        sys.exit(1)
+
+    print(f"Haptic touchpad: hidraw={hidraw} input={event} intensity={INTENSITY}", flush=True)
+
+    haptic_report = struct.pack("BB", REPORT_ID, INTENSITY)
+    ioctl_req = HIDIOCSFEATURE(len(haptic_report))
+
+    hidraw_fd = os.open(hidraw, os.O_RDWR)
+    event_fd = os.open(event, os.O_RDONLY)
+
+    try:
+        while True:
+            data = os.read(event_fd, EVENT_SIZE)
+            if len(data) < EVENT_SIZE:
+                continue
+            _, _, ev_type, code, value = struct.unpack(EVENT_FORMAT, data)
+            if ev_type == EV_KEY and code in (BTN_LEFT, BTN_RIGHT, BTN_MIDDLE) and value == 1:
+                try:
+                    fcntl.ioctl(hidraw_fd, ioctl_req, haptic_report)
+                except OSError:
+                    pass
+    except KeyboardInterrupt:
+        pass
+    finally:
+        os.close(event_fd)
+        os.close(hidraw_fd)
+
+
+if __name__ == "__main__":
+    main()

bin/omarchy-hibernation-available

@@ -11,7 +11,7 @@ SWAPSIZE=$(( 1024 * ${SWAPSIZE_KB:-0} ))
 
 HIBERNATION_IMAGE_SIZE=$(cat /sys/power/image_size)
 
-if [[ "$SWAPSIZE" -gt "$HIBERNATION_IMAGE_SIZE" ]] && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
+if (( SWAPSIZE > HIBERNATION_IMAGE_SIZE )) && [[ -f /etc/mkinitcpio.conf.d/omarchy_resume.conf ]]; then
   exit 0
 else
   exit 1

bin/omarchy-hibernation-remove

@@ -6,7 +6,7 @@
 MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
 
 # Check if hibernation is configured
-if [ ! -f "$MKINITCPIO_CONF" ] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
+if [[ ! -f $MKINITCPIO_CONF ]] || ! grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
   echo "Hibernation is not set up"
   exit 0
 fi
@@ -25,7 +25,7 @@ if swapon --show | grep -q "$SWAP_FILE"; then
 fi
 
 # Remove swapfile
-if [ -f "$SWAP_FILE" ]; then
+if [[ -f $SWAP_FILE ]]; then
   echo "Removing swapfile"
   sudo rm "$SWAP_FILE"
 fi

bin/omarchy-hibernation-setup

@@ -4,22 +4,28 @@
 # adds a resume hook to mkinitcpio, and configures suspend-then-hibernate.
 
 if [[ ! -f /sys/power/image_size ]]; then
-  echo -e "\033[31mError: Hibernation is not supported on your system\033[0m" >&2
-  exit 1
+  echo -e "Hibernation is not supported on your system" >&2
+  exit 0
 fi
 
+if ! command -v limine-mkinitcpio &>/dev/null; then
+  echo "Skipping hibernation setup (requires Limine bootloader)"
+  exit 0
+fi
 
 MKINITCPIO_CONF="/etc/mkinitcpio.conf.d/omarchy_resume.conf"
 
 # Check if hibernation is already configured
-if [ -f "$MKINITCPIO_CONF" ] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
+if [[ -f $MKINITCPIO_CONF ]] && grep -q "^HOOKS+=(resume)$" "$MKINITCPIO_CONF"; then
   echo "Hibernation is already set up"
   exit 0
 fi
 
-MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
-if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
-  exit 0
+if [[ $1 != "--force" ]]; then
+  MEM_TOTAL_HUMAN=$(free --human | awk '/Mem/ {print $2}')
+  if ! gum confirm "Use $MEM_TOTAL_HUMAN on boot drive to make hibernation available?"; then
+    exit 0
+  fi
 fi
 
 SWAP_SUBVOLUME="/swap"
@@ -57,14 +63,40 @@ sudo mkdir -p /etc/mkinitcpio.conf.d
 echo "Adding resume hook to $MKINITCPIO_CONF"
 echo "HOOKS+=(resume)" | sudo tee "$MKINITCPIO_CONF" >/dev/null
 
-# Configure suspend-then-hibernate
-echo "Configuring suspend-then-hibernate"
-sudo mkdir -p /etc/systemd/logind.conf.d /etc/systemd/sleep.conf.d
-sudo cp "$OMARCHY_PATH/default/systemd/lid.conf" /etc/systemd/logind.conf.d/
-sudo cp "$OMARCHY_PATH/default/systemd/hibernate.conf" /etc/systemd/sleep.conf.d/
+# Ensure keyboard backlight doesn't prevent sleep
+sudo cp -p "$OMARCHY_PATH/default/systemd/system-sleep/keyboard-backlight" /usr/lib/systemd/system-sleep/
 
-# Regenerate initramfs
+# Add resume= kernel parameters so the initramfs resume hook knows where to find the
+# hibernation image. Without these, resume happens late (after GPU drivers load) and fails.
+RESUME_DROP_IN="/etc/limine-entry-tool.d/resume.conf"
+if [[ ! -f $RESUME_DROP_IN ]]; then
+  echo "Adding resume kernel parameters"
+  sudo swapon -p 0 "$SWAP_FILE" 2>/dev/null
+  RESUME_DEVICE=$(findmnt -no SOURCE -T "$SWAP_FILE" | sed 's/\[.*\]//')
+  RESUME_OFFSET=$(sudo btrfs inspect-internal map-swapfile -r "$SWAP_FILE")
+  sudo mkdir -p /etc/limine-entry-tool.d
+  echo "KERNEL_CMDLINE[default]+=\" resume=$RESUME_DEVICE resume_offset=$RESUME_OFFSET\"" | sudo tee "$RESUME_DROP_IN" >/dev/null
+  sudo tee -a /etc/default/limine < "$RESUME_DROP_IN" >/dev/null
+fi
+
+# Use ACPI alarm for RTC wakeup on s2idle systems (needed for suspend-then-hibernate)
+if grep -q "\[s2idle\]" /sys/power/mem_sleep 2>/dev/null; then
+  LIMINE_DROP_IN="/etc/limine-entry-tool.d/rtc-alarm.conf"
+  if [[ ! -f $LIMINE_DROP_IN ]]; then
+    echo "Enabling ACPI RTC alarm for s2idle suspend"
+    sudo mkdir -p /etc/limine-entry-tool.d
+    echo 'KERNEL_CMDLINE[default]+=" rtc_cmos.use_acpi_alarm=1"' | sudo tee "$LIMINE_DROP_IN" >/dev/null
+    sudo tee -a /etc/default/limine < "$LIMINE_DROP_IN" >/dev/null
+  fi
+fi
+
+# Regenerate initramfs and boot entry
 echo "Regenerating initramfs..."
 sudo limine-mkinitcpio
+sudo limine-update
 
-echo "Hibernation enabled"
+echo
+
+if [[ $1 != "--force" ]] && gum confirm "Reboot to enable hibernation?"; then
+  omarchy-system-reboot
+fi

bin/omarchy-hook

@@ -4,7 +4,7 @@
 
 set -e
 
-if [[ $# -lt 1 ]]; then
+if (( $# < 1 )); then
   echo "Usage: omarchy-hook [name] [args...]"
   exit 1
 fi

bin/omarchy-hw-asus-rog

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

bin/omarchy-hw-framework16

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# 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"

bin/omarchy-hw-intel

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Detect whether the computer has an Intel CPU.
+
+[[ $(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ') == "GenuineIntel" ]]

bin/omarchy-hw-intel-ptl

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Detect whether the computer has an Intel Panther Lake GPU.
+
+lspci | grep -iE 'vga|3d|display' | grep -qi 'panther lake'

bin/omarchy-hw-match

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# 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

bin/omarchy-hw-surface

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# 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"

bin/omarchy-hw-vulkan

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# 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 .

bin/omarchy-hyprland-active-window-transparency-toggle

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

bin/omarchy-hyprland-monitor-scaling-cycle

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# 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')
+WIDTH=$(echo "$MONITOR_INFO" | jq -r '.width')
+HEIGHT=$(echo "$MONITOR_INFO" | jq -r '.height')
+REFRESH_RATE=$(echo "$MONITOR_INFO" | jq -r '.refreshRate')
+
+# Cycle through scales: 1 → 1.6 → 2 → 3 → 1
+CURRENT_INT=$(awk -v s="$CURRENT_SCALE" 'BEGIN { printf "%.0f", s * 10 }')
+
+case "$CURRENT_INT" in
+10) NEW_SCALE=1.6 ;;
+16) NEW_SCALE=2 ;;
+20) NEW_SCALE=3 ;;
+*) NEW_SCALE=1 ;;
+esac
+
+hyprctl keyword misc:disable_scale_notification true
+hyprctl keyword monitor "$ACTIVE_MONITOR,${WIDTH}x${HEIGHT}@${REFRESH_RATE},auto,$NEW_SCALE"
+hyprctl keyword misc:disable_scale_notification false
+notify-send -u low "󰍹    Display scaling set to ${NEW_SCALE}x"

bin/omarchy-hyprland-window-gaps-toggle

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Toggles the window gaps globally between no gaps and the default 10/5/2.
+
+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

bin/omarchy-hyprland-window-single-square-aspect-toggle

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Check current single_window_aspect_ratio setting
+CURRENT_VALUE=$(hyprctl getoption "layout:single_window_aspect_ratio" 2>/dev/null | head -1)
+
+# Parse vec2 output: "vec2: [1, 1]" or "vec2: [0, 0]"
+if [[ $CURRENT_VALUE == *"[1, 1]"* ]]; then
+  hyprctl keyword layout:single_window_aspect_ratio "0 0"
+  notify-send -u low "    Disable single-window square aspect ratio"
+else
+  hyprctl keyword layout:single_window_aspect_ratio "1 1"
+  notify-send -u low "    Enable single-window square aspect"
+fi

bin/omarchy-hyprland-workspace-layout-toggle

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Toggle the layout on the current active workspace between dwindle and scrolling
+
+ACTIVE_WORKSPACE=$(hyprctl activeworkspace -j | jq -r '.id')
+CURRENT_LAYOUT=$(hyprctl activeworkspace -j | jq -r '.tiledLayout')
+
+case "$CURRENT_LAYOUT" in
+  dwindle) NEW_LAYOUT=scrolling ;;
+  *) NEW_LAYOUT=dwindle ;;
+esac
+
+hyprctl keyword workspace $ACTIVE_WORKSPACE, layout:$NEW_LAYOUT
+notify-send -u low "󱂬    Workspace layout set to $NEW_LAYOUT"

bin/omarchy-hyprland-workspace-toggle-gaps

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Toggles the window gaps on the active workspace between no gaps and the default 10/5/2.
-
-workspace_id=$(hyprctl activeworkspace -j | jq -r .id)
-gaps=$(hyprctl workspacerules -j | jq -r ".[] | select(.workspaceString==\"$workspace_id\") | .gapsOut[0] // 0")
-
-if [[ $gaps == "0" ]]; then
-  hyprctl keyword "workspace $workspace_id, gapsout:10, gapsin:5, bordersize:2"
-else \
-  hyprctl keyword "workspace $workspace_id, gapsout:0, gapsin:0, bordersize:0"
-fi

bin/omarchy-install-dev-env

@@ -2,16 +2,16 @@
 
 # Install one of the supported development environments. Usually called via Install > Development > * in the Omarchy Menu.
 
-if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
+if [[ -z $1 ]]; then
+  echo "Usage: omarchy-install-dev-env <ruby|node|bun|deno|go|laravel|symfony|php|python|elixir|phoenix|rust|java|zig|ocaml|dotnet|clojure|scala>" >&2
   exit 1
 fi
 
 install_php() {
-  sudo pacman -S php composer php-sqlite xdebug --noconfirm
+  omarchy-pkg-add php composer php-sqlite xdebug
 
   # Install Path for Composer
-  if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
+  if [[ :$PATH: != *:$HOME/.config/composer/vendor/bin:* ]]; then
     echo 'export PATH="$HOME/.config/composer/vendor/bin:$PATH"' >>"$HOME/.bashrc"
     source "$HOME/.bashrc"
     echo "Added Composer global bin directory to PATH."
@@ -50,9 +50,10 @@ case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
   omarchy-pkg-add libyaml
-  mise use --global ruby@latest
+  mise settings add ruby.compile false
   mise settings add idiomatic_version_file_enable_tools ruby
-  echo "gem: --no-document" > ~/.gemrc
+  mise use --global ruby@latest
+  echo "gem: --no-document" >~/.gemrc
   mise x ruby -- gem install rails --no-document
   echo -e "\nYou can now run: rails new myproject"
   ;;
@@ -141,4 +142,10 @@ clojure)
   omarchy-pkg-add rlwrap
   mise use --global clojure@latest
   ;;
+scala)
+  echo -e "Installing Scala...\n"
+  mise use --global java@latest
+  mise use --global scala@latest
+  mise use --global scala-cli@latest
+  ;;
 esac

bin/omarchy-install-docker-dbs

@@ -5,13 +5,13 @@
 
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB" "MSSQL")
 
-if [[ "$#" -eq 0 ]]; then
+if (( $# == 0 )); then
   choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu
 else
   choices="$@"
 fi
 
-if [[ -n "$choices" ]]; then
+if [[ -n $choices ]]; then
   for db in $choices; do
     case $db in
     MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;

bin/omarchy-install-geforce-now

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

bin/omarchy-install-nordvpn

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Install the NordVPN service with optional GUI.
+
+echo "Installing NordVPN..."
+omarchy-pkg-aur-add nordvpn-bin
+
+echo "Enabling NordVPN daemon..."
+sudo systemctl enable --now nordvpnd
+
+echo "Adding user to nordvpn group..."
+sudo usermod -aG nordvpn "$USER"
+
+echo -e "\nNordVPN installed! After reboot, run 'nordvpn login' to authenticate."
+
+echo
+gum confirm "Reboot now to make NordVPN usable?" && omarchy-system-reboot

bin/omarchy-install-once

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Install the ONCE service, enable its background service, and launch the TUI.
+
+echo "Installing ONCE..."
+omarchy-pkg-add once-bin
+
+echo "Enabling ONCE background service..."
+sudo systemctl enable --now once-background.service
+
+echo -e "\nLaunching ONCE..."
+once

bin/omarchy-install-tailscale

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

bin/omarchy-install-terminal

@@ -25,33 +25,11 @@ if omarchy-pkg-add $package; then
   # Copy custom desktop entry for alacritty with X-TerminalArg* keys
   if [[ $package == "alacritty" ]]; then
     mkdir -p ~/.local/share/applications
-    cat > ~/.local/share/applications/Alacritty.desktop << EOF
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
-EOF
+    cp $OMARCHY_PATH/applications/Alacritty.desktop ~/.local/share/applications/
   fi
 
   # Update xdg-terminals.list to prioritize the proper terminal
-  cat > ~/.config/xdg-terminals.list << EOF
+  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

bin/omarchy-install-xbox-controllers

@@ -5,8 +5,8 @@
 set -e
 
 # Install xpadneo to ensure controllers work out of the box
-sudo pacman -S --noconfirm --needed linux-headers
-yay -S --noconfirm xpadneo-dkms
+omarchy-pkg-add linux-headers
+omarchy-pkg-aur-add xpadneo-dkms
 
 # Prevent xpad/xpadneo driver conflict
 echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null

bin/omarchy-launch-browser

@@ -6,7 +6,7 @@
 default_browser=$(xdg-settings get default-web-browser)
 browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
 
-if [[ $browser_exec =~ (firefox|zen|librewolf|mullvad) ]]; then
+if $browser_exec --help | grep -q MOZ_LOG; then
   private_flag="--private-window"
 elif [[ $browser_exec =~ edge ]]; then
   private_flag="--inprivate"

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

@@ -4,4 +4,4 @@
 # Used by actions such as Update System.
 
 cmd="$*"
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if [ \$? -ne 130 ]; then omarchy-show-done; fi"
+exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.terminal --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; if (( \$? != 130 )); then omarchy-show-done; fi"

bin/omarchy-launch-screensaver

@@ -46,7 +46,7 @@ for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
       -e omarchy-cmd-screensaver
     ;;
   *)
-    notify-send "✋  Screensaver only runs in Alacritty, Ghostty, or Kitty"
+    notify-send -u low "✋  Screensaver only runs in Alacritty, Ghostty, or Kitty"
     ;;
   esac
 done

bin/omarchy-launch-walker

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

bin/omarchy-menu

@@ -10,15 +10,22 @@ BACK_TO_EXIT=false
 back_to() {
   local parent_menu="$1"
 
-  if [[ "$BACK_TO_EXIT" == "true" ]]; then
+  if [[ $BACK_TO_EXIT == "true" ]]; then
     exit 0
-  elif [[ -n "$parent_menu" ]]; then
+  elif [[ -n $parent_menu ]]; then
     "$parent_menu"
   else
     show_main_menu
   fi
 }
 
+toggle_existing_menu() {
+  if pgrep -f "walker.*--dmenu" >/dev/null; then
+    walker --close >/dev/null 2>&1
+    exit 0
+  fi
+}
+
 menu() {
   local prompt="$1"
   local options="$2"
@@ -27,10 +34,10 @@ menu() {
 
   read -r -a args <<<"$extra"
 
-  if [[ -n "$preselect" ]]; then
+  if [[ -n $preselect ]]; then
     local index
     index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
-    if [[ -n "$index" ]]; then
+    if [[ -n $index ]]; then
       args+=("-c" "$index")
     fi
   fi
@@ -47,20 +54,20 @@ present_terminal() {
 }
 
 open_in_editor() {
-  notify-send "Editing config file" "$1"
+  notify-send -u low "Editing config file" "$1"
   omarchy-launch-editor "$1"
 }
 
 install() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2"
 }
 
 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && setsid gtk-launch $3"
 }
 
 install_font() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+  present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && sleep 2 && omarchy-font-set '$3'"
 }
 
 install_terminal() {
@@ -68,11 +75,11 @@ install_terminal() {
 }
 
 aur_install() {
-  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
+  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2"
 }
 
 aur_install_and_launch() {
-  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2 && setsid gtk-launch $3"
 }
 
 show_learn_menu() {
@@ -88,38 +95,65 @@ show_learn_menu() {
 }
 
 show_trigger_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle\n  Hardware") in
   *Capture*) show_capture_menu ;;
   *Share*) show_share_menu ;;
   *Toggle*) show_toggle_menu ;;
+  *Hardware*) show_hardware_menu ;;
   *) show_main_menu ;;
   esac
 }
 
 show_capture_menu() {
   case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
+  *Screenshot*) omarchy-cmd-screenshot ;;
   *Screenrecord*) show_screenrecord_menu ;;
   *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) show_trigger_menu ;;
+  *) back_to show_trigger_menu ;;
   esac
 }
 
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Snap with Editing\n  Straight to Clipboard") in
-  *Editing*) omarchy-cmd-screenshot smart ;;
-  *Clipboard*) omarchy-cmd-screenshot smart clipboard ;;
-  *) show_capture_menu ;;
-  esac
+get_webcam_list() {
+  v4l2-ctl --list-devices 2>/dev/null | while IFS= read -r line; do
+    if [[ $line != $'\t'* && -n $line ]]; then
+      local name="$line"
+      IFS= read -r device || break
+      device=$(echo "$device" | tr -d '\t' | head -1)
+      [[ -n $device ]] && echo "$device  $name"
+    fi
+  done
+}
+
+show_webcam_select_menu() {
+  local devices=$(get_webcam_list)
+  local count=$(echo "$devices" | grep -c . 2>/dev/null || echo 0)
+
+  if [[ -z $devices ]] || ((count == 0)); then
+    notify-send "No webcam devices found" -u critical -t 3000
+    return 1
+  fi
+
+  if ((count == 1)); then
+    echo "$devices" | awk '{print $1}'
+  else
+    menu "Select Webcam" "$devices" | awk '{print $1}'
+  fi
 }
 
 show_screenrecord_menu() {
   omarchy-cmd-screenrecord --stop-recording && exit 0
 
-  case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
+  case $(menu "Screenrecord" "  With no audio\n  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
+  *"With no audio") omarchy-cmd-screenrecord ;;
   *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
   *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
-  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
+  *"With desktop + microphone audio + webcam")
+    local device=$(show_webcam_select_menu) || {
+      back_to show_capture_menu
+      return
+    }
+    omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam --webcam-device="$device"
+    ;;
   *) back_to show_capture_menu ;;
   esac
 }
@@ -134,11 +168,23 @@ show_share_menu() {
 }
 
 show_toggle_menu() {
-  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
+  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar\n󱂬  Workspace Layout\n  Window Gaps\n  1-Window Ratio\n󰍹  Display Scaling") in
+
   *Screensaver*) omarchy-toggle-screensaver ;;
   *Nightlight*) omarchy-toggle-nightlight ;;
   *Idle*) omarchy-toggle-idle ;;
   *Bar*) omarchy-toggle-waybar ;;
+  *Layout*) omarchy-hyprland-workspace-layout-toggle ;;
+  *Ratio*) omarchy-hyprland-window-single-square-aspect-toggle ;;
+  *Gaps*) omarchy-hyprland-window-gaps-toggle ;;
+  *Scaling*) omarchy-hyprland-monitor-scaling-cycle ;;
+  *) back_to show_trigger_menu ;;
+  esac
+}
+
+show_hardware_menu() {
+  case $(menu "Toggle" "  Hybrid GPU") in
+  *"Hybrid GPU"*) present_terminal omarchy-toggle-hybrid-gpu ;;
   *) show_trigger_menu ;;
   esac
 }
@@ -147,7 +193,7 @@ show_style_menu() {
   case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  Hyprland\n󱄄  Screensaver\n  About") in
   *Theme*) show_theme_menu ;;
   *Font*) show_font_menu ;;
-  *Background*) omarchy-theme-bg-next ;;
+  *Background*) show_background_menu ;;
   *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
   *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
   *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
@@ -159,9 +205,13 @@ show_theme_menu() {
   omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
 }
 
+show_background_menu() {
+  omarchy-launch-walker -m menus:omarchyBackgroundSelector --width 800 --minheight 400
+}
+
 show_font_menu() {
   theme=$(menu "Font" "$(omarchy-font-list)" "--width 350" "$(omarchy-font-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+  if [[ $theme == "CNCLD" || -z $theme ]]; then
     back_to show_style_menu
   else
     omarchy-font-set "$theme"
@@ -170,8 +220,9 @@ show_font_menu() {
 
 show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n  System Sleep\n󰍹  Monitors"
-  [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
-  [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
+  [[ -f ~/.config/hypr/bindings.conf ]] && options="$options\n  Keybindings"
+  options="$options\n  Key Remapping"
+  [[ -f ~/.config/hypr/input.conf ]] && options="$options\n  Input"
   options="$options\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
@@ -183,6 +234,7 @@ show_setup_menu() {
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
   *Input*) open_in_editor ~/.config/hypr/input.conf ;;
+  *Key\ Remapping*) omarchy-setup-makima && open_in_editor "$HOME/.config/makima/AT Translated Set 2 keyboard.toml" && omarchy-restart-makima ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
   *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
@@ -193,7 +245,7 @@ show_setup_menu() {
 show_setup_power_menu() {
   profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
 
-  if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
+  if [[ $profile == "CNCLD" || -z $profile ]]; then
     back_to show_setup_menu
   else
     powerprofilesctl set "$profile"
@@ -226,10 +278,10 @@ show_setup_config_menu() {
 show_setup_system_menu() {
   local options=""
 
-  if [ -f ~/.local/state/omarchy/toggles/suspend-on ]; then
-    options="$options󰒲  Disable Suspend"
-  else
+  if [[ -f ~/.local/state/omarchy/toggles/suspend-off ]]; then
     options="$options󰒲  Enable Suspend"
+  else
+    options="$options󰒲  Disable Suspend"
   fi
 
   if omarchy-hibernation-available; then
@@ -265,9 +317,11 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󱇱  NordVPN [AUR]\n󰏖  ONCE\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
+  *NordVPN*) present_terminal omarchy-install-nordvpn ;;
+  *ONCE*) present_terminal omarchy-install-once ;;
   *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
   *) show_install_menu ;;
@@ -278,7 +332,7 @@ show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
+  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
@@ -302,14 +356,9 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "  Dictation\n󱚤  Claude Code\n󱚤  Copilot CLI\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  case $(menu "Install" "  Dictation\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
   *Dictation*) present_terminal omarchy-voxtype-install ;;
-  *Claude*) install "Claude Code" "claude-code" ;;
-  *Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
-  *Cursor*) install "Cursor CLI" "cursor-cli" ;;
-  *Gemini*) install "Gemini" "gemini-cli" ;;
-  *OpenAI*) install "OpenAI Codex" "openai-codex" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Studio*) install "LM Studio" "lmstudio-bin" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
   *) show_install_menu ;;
@@ -317,8 +366,9 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
+  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
@@ -336,7 +386,8 @@ show_install_style_menu() {
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
+  case $(menu "Install" "  Cascadia Mono\n  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono\n  Iosevka" "--width 350") in
+  *Cascadia*) install_font "Cascadia Mono" "ttf-cascadia-mono-nerd" "CaskaydiaMono Nerd Font" ;;
   *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
   *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
   *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
@@ -347,7 +398,7 @@ show_install_font_menu() {
 }
 
 show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure\n  Scala") in
   *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
   *Docker*) present_terminal omarchy-install-docker-dbs ;;
   *JavaScript*) show_install_javascript_menu ;;
@@ -361,6 +412,7 @@ show_install_development_menu() {
   *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
   *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
   *Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
+  *Scala*) present_terminal "omarchy-install-dev-env scala" ;;
   *) show_install_menu ;;
   esac
 }
@@ -392,11 +444,12 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n  Dictation\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰵮  Development\n󰏓  Preinstalls\n  Dictation\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
   *Package*) terminal omarchy-pkg-remove ;;
   *Web*) present_terminal omarchy-webapp-remove ;;
   *TUI*) present_terminal omarchy-tui-remove ;;
   *Development*) show_remove_development_menu ;;
+  *Preinstalls*) present_terminal omarchy-remove-preinstalls ;;
   *Dictation*) present_terminal omarchy-voxtype-remove ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
   *Windows*) present_terminal "omarchy-windows-vm remove" ;;
@@ -407,7 +460,7 @@ show_remove_menu() {
 }
 
 show_remove_development_menu() {
-  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
+  case $(menu "Remove" "󰫏  Ruby on Rails\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure\n  Scala") in
   *Rails*) present_terminal "omarchy-remove-dev-env ruby" ;;
   *JavaScript*) show_remove_javascript_menu ;;
   *Go*) present_terminal "omarchy-remove-dev-env go" ;;
@@ -420,12 +473,13 @@ show_remove_development_menu() {
   *NET*) present_terminal "omarchy-remove-dev-env dotnet" ;;
   *OCaml*) present_terminal "omarchy-remove-dev-env ocaml" ;;
   *Clojure*) present_terminal "omarchy-remove-dev-env clojure" ;;
+  *Scala*) present_terminal "omarchy-remove-dev-env scala" ;;
   *) show_remove_menu ;;
   esac
 }
 
 show_remove_javascript_menu() {
-  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
+  case $(menu "Remove" "  Node.js\n  Bun\n  Deno") in
   *Node*) present_terminal "omarchy-remove-dev-env node" ;;
   *Bun*) present_terminal "omarchy-remove-dev-env bun" ;;
   *Deno*) present_terminal "omarchy-remove-dev-env deno" ;;
@@ -434,7 +488,7 @@ show_remove_javascript_menu() {
 }
 
 show_remove_php_menu() {
-  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
+  case $(menu "Remove" "  PHP\n  Laravel\n  Symfony") in
   *PHP*) present_terminal "omarchy-remove-dev-env php" ;;
   *Laravel*) present_terminal "omarchy-remove-dev-env laravel" ;;
   *Symfony*) present_terminal "omarchy-remove-dev-env symfony" ;;
@@ -443,7 +497,7 @@ show_remove_php_menu() {
 }
 
 show_remove_elixir_menu() {
-  case $(menu "Remove" "  Elixir\n  Phoenix") in
+  case $(menu "Remove" "  Elixir\n  Phoenix") in
   *Elixir*) present_terminal "omarchy-remove-dev-env elixir" ;;
   *Phoenix*) present_terminal "omarchy-remove-dev-env phoenix" ;;
   *) show_remove_development_menu ;;
@@ -451,7 +505,7 @@ show_remove_elixir_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
+  case $(menu "Update" "  Omarchy\n󰔫  Channel\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Channel*) show_update_channel_menu ;;
   *Config*) show_update_config_menu ;;
@@ -467,8 +521,9 @@ show_update_menu() {
 }
 
 show_update_channel_menu() {
-  case $(menu "Update channel" "🟢 Stable\n🟡 Edge\n🔴 Dev") in
+  case $(menu "Update channel" "🟢 Stable\n🟡 RC\n🟠 Edge\n🔴 Dev") in
   *Stable*) present_terminal "omarchy-channel-set stable" ;;
+  *RC*) present_terminal "omarchy-channel-set rc" ;;
   *Edge*) present_terminal "omarchy-channel-set edge" ;;
   *Dev*) present_terminal "omarchy-channel-set dev" ;;
   *) show_update_menu ;;
@@ -486,13 +541,14 @@ show_update_process_menu() {
 }
 
 show_update_config_menu() {
-  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
+  case $(menu "Use default config" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n󱣴  Plymouth\n  Swayosd\n  Tmux\n󰌧  Walker\n󰍜  Waybar") in
   *Hyprland*) present_terminal omarchy-refresh-hyprland ;;
   *Hypridle*) present_terminal omarchy-refresh-hypridle ;;
   *Hyprlock*) present_terminal omarchy-refresh-hyprlock ;;
   *Hyprsunset*) present_terminal omarchy-refresh-hyprsunset ;;
   *Plymouth*) present_terminal omarchy-refresh-plymouth ;;
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
+  *Tmux*) present_terminal omarchy-refresh-tmux ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
   *) show_update_menu ;;
@@ -516,19 +572,24 @@ show_update_password_menu() {
   esac
 }
 
+show_about() {
+  omarchy-launch-about
+}
+
 show_system_menu() {
-  local options="  Lock\n󱄄  Screensaver"
-  [ -f ~/.local/state/omarchy/toggles/suspend-on ] && options="$options\n󰒲  Suspend"
+  local options="󱄄  Screensaver\n  Lock"
+  [[ ! -f ~/.local/state/omarchy/toggles/suspend-off ]] && options="$options\n󰒲  Suspend"
   omarchy-hibernation-available && options="$options\n󰤁  Hibernate"
-  options="$options\n󰜉  Restart\n󰐥  Shutdown"
+  options="$options\n󰍃  Logout\n󰜉  Restart\n󰐥  Shutdown"
 
   case $(menu "System" "$options") in
-  *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
+  *Lock*) omarchy-lock-screen ;;
   *Suspend*) systemctl suspend ;;
   *Hibernate*) systemctl hibernate ;;
-  *Restart*) omarchy-cmd-reboot ;;
-  *Shutdown*) omarchy-cmd-shutdown ;;
+  *Logout*) omarchy-system-logout ;;
+  *Restart*) omarchy-system-reboot ;;
+  *Shutdown*) omarchy-system-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }
@@ -542,17 +603,19 @@ go_to_menu() {
   *apps*) walker -p "Launch…" ;;
   *learn*) show_learn_menu ;;
   *trigger*) show_trigger_menu ;;
+  *toggle*) show_toggle_menu ;;
   *share*) show_share_menu ;;
+  *background*) show_background_menu ;;
+  *capture*) show_capture_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
-  *screenshot*) show_screenshot_menu ;;
   *screenrecord*) show_screenrecord_menu ;;
   *setup*) show_setup_menu ;;
   *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
-  *about*) omarchy-launch-about ;;
+  *about*) show_about ;;
   *system*) show_system_menu ;;
   esac
 }
@@ -561,7 +624,9 @@ go_to_menu() {
 USER_EXTENSIONS="$HOME/.config/omarchy/extensions/menu.sh"
 [[ -f $USER_EXTENSIONS ]] && source "$USER_EXTENSIONS"
 
-if [[ -n "$1" ]]; then
+toggle_existing_menu
+
+if [[ -n $1 ]]; then
   BACK_TO_EXIT=true
   go_to_menu "$1"
 else

bin/omarchy-menu-keybindings

@@ -12,7 +12,7 @@ build_keymap_cache() {
   }
 
   while IFS=, read -r code sym; do
-    [[ -z "$code" || -z "$sym" ]] && continue
+    [[ -z $code || -z $sym ]] && continue
     KEYCODE_SYM_MAP["$code"]="$sym"
   done < <(
     awk '
@@ -42,13 +42,13 @@ lookup_keycode_cached() {
 
 parse_keycodes() {
   local start end elapsed
-  [[ "${DEBUG:-0}" == "1" ]] && start=$(date +%s.%N)
+  [[ ${DEBUG:-0} == "1" ]] && start=$(date +%s.%N)
   while IFS= read -r line; do
-    if [[ "$line" =~ code:([0-9]+) ]]; then
+    if [[ $line =~ code:([0-9]+) ]]; then
       code="${BASH_REMATCH[1]}"
       symbol=$(lookup_keycode_cached "$code" "$XKB_KEYMAP_CACHE")
       echo "${line/code:${code}/$symbol}"
-    elif [[ "$line" =~ mouse:([0-9]+) ]]; then
+    elif [[ $line =~ mouse:([0-9]+) ]]; then
       code="${BASH_REMATCH[1]}"
 
       case "$code" in
@@ -64,7 +64,7 @@ parse_keycodes() {
     fi
   done
 
-  if [[ "$DEBUG" == "1" ]]; then
+  if [[ $DEBUG == "1" ]]; then
     end=$(date +%s.%N)
     # fall back to awk if bc is missing
     if command -v bc >/dev/null 2>&1; then
@@ -168,44 +168,47 @@ prioritize_entries() {
     line = $0
     prio = 50
     if (match(line, /Terminal/)) prio = 0
-    if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/)) prio = 1
-    if (match(line, /File manager/))  prio = 2
-    if (match(line, /Launch apps/))  prio = 3
-    if (match(line, /Omarchy menu/))  prio = 4
-    if (match(line, /System menu/))  prio = 5
-    if (match(line, /Theme menu/))  prio = 6
-    if (match(line, /Full screen/))  prio = 7
-    if (match(line, /Full width/))  prio = 8
-    if (match(line, /Close window/))  prio = 9
-    if (match(line, /Close all windows/))  prio = 10
-    if (match(line, /Lock system/))  prio = 11
-    if (match(line, /Toggle window floating/))  prio = 12
-    if (match(line, /Toggle window split/))  prio = 13
-    if (match(line, /Pop window/))  prio = 14
-    if (match(line, /Universal/))  prio = 15
-    if (match(line, /Clipboard/))  prio = 16
-    if (match(line, /Audio controls/))  prio = 17
-    if (match(line, /Bluetooth controls/))  prio = 18
-    if (match(line, /Wifi controls/))  prio = 19
-    if (match(line, /Emoji picker/))  prio = 20
-    if (match(line, /Color picker/))  prio = 21
-    if (match(line, /Screenshot/))  prio = 22
-    if (match(line, /Screenrecording/))  prio = 23
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 24
-    if (match(line, /Move window to workspace/))  prio = 25
-    if (match(line, /Move window silently to workspace/))  prio = 26
-    if (match(line, /Swap window/))  prio = 27
-    if (match(line, /Move window focus/))  prio = 28
-    if (match(line, /Move window$/))  prio = 29
-    if (match(line, /Resize window/))  prio = 30
-    if (match(line, /Expand window/))  prio = 31
-    if (match(line, /Shrink window/))  prio = 32
-    if (match(line, /scratchpad/))  prio = 33
-    if (match(line, /notification/))  prio = 34
-    if (match(line, /Toggle window transparency/))  prio = 35
-    if (match(line, /Toggle workspace gaps/))  prio = 36
-    if (match(line, /Toggle nightlight/))  prio = 37
-    if (match(line, /Toggle locking/))  prio = 38
+    if (match(line, /Tmux/)) prio = 1
+    if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/) && !match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 2
+    if (match(line, /File manager/) && !match(line, /File manager \(cwd\)/))  prio = 3
+    if (match(line, /Launch apps/))  prio = 4
+    if (match(line, /Omarchy menu/))  prio = 5
+    if (match(line, /System menu/))  prio = 6
+    if (match(line, /Theme menu/))  prio = 7
+    if (match(line, /Full screen/))  prio = 8
+    if (match(line, /Full width/))  prio = 9
+    if (match(line, /Close window/))  prio = 10
+    if (match(line, /Close all windows/))  prio = 11
+    if (match(line, /Lock system/))  prio = 12
+    if (match(line, /Toggle window floating/))  prio = 13
+    if (match(line, /Toggle window split/))  prio = 14
+    if (match(line, /Pop window/))  prio = 15
+    if (match(line, /Universal/))  prio = 16
+    if (match(line, /Clipboard/))  prio = 17
+    if (match(line, /Audio controls/))  prio = 18
+    if (match(line, /Bluetooth controls/))  prio = 19
+    if (match(line, /Wifi controls/))  prio = 20
+    if (match(line, /Emoji picker/))  prio = 21
+    if (match(line, /Color picker/))  prio = 22
+    if (match(line, /Screenshot/))  prio = 23
+    if (match(line, /Screenrecording/))  prio = 24
+    if (match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 25
+    if (match(line, /File manager \(cwd\)/))  prio = 26
+    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 27
+    if (match(line, /Move window to workspace/))  prio = 28
+    if (match(line, /Move window silently to workspace/))  prio = 29
+    if (match(line, /Swap window/))  prio = 30
+    if (match(line, /Move window focus/))  prio = 31
+    if (match(line, /Move window$/))  prio = 32
+    if (match(line, /Resize window/))  prio = 33
+    if (match(line, /Expand window/))  prio = 34
+    if (match(line, /Shrink window/))  prio = 35
+    if (match(line, /scratchpad/))  prio = 36
+    if (match(line, /notification/))  prio = 37
+    if (match(line, /Toggle window transparency/))  prio = 38
+    if (match(line, /Toggle workspace gaps/))  prio = 39
+    if (match(line, /Toggle nightlight/))  prio = 40
+    if (match(line, /Toggle locking/))  prio = 41
     if (match(line, /group/))  prio = 94
     if (match(line, /Scroll active workspace/))  prio = 95
     if (match(line, /Cycle to/))  prio = 96
@@ -233,7 +236,7 @@ output_keybindings() {
     prioritize_entries
 }
 
-if [[ "$1" == "--print" || "$1" == "-p" ]]; then
+if [[ $1 == "--print" || $1 == "-p" ]]; then
   output_keybindings
 else
   monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
@@ -242,4 +245,3 @@ else
   output_keybindings |
     walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
 fi
-

bin/omarchy-migrate

@@ -13,7 +13,7 @@ mkdir -p "$STATE_DIR/skipped"
 for file in ~/.local/share/omarchy/migrations/*.sh; do
   filename=$(basename "$file")
 
-  if [[ ! -f "$STATE_DIR/$filename" && ! -f "$STATE_DIR/skipped/$filename" ]]; then
+  if [[ ! -f $STATE_DIR/$filename && ! -f $STATE_DIR/skipped/$filename ]]; then
     echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
 
     if bash $file; then

bin/omarchy-npx-install

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Install an npx wrapper for a given npm package.
+# Usage: omarchy-npx-install <package> [command-name]
+#
+# If command-name is omitted, it defaults to the package name.
+# Example: omarchy-npx-install opencode-ai opencode
+
+if [[ -z $1 ]]; then
+  echo "Usage: omarchy-npx-install <package> [command-name]"
+  exit 1
+fi
+
+package=$1
+command=${2:-$1}
+
+mkdir -p "$HOME/.local/bin"
+
+cat > "$HOME/.local/bin/$command" <<EOF
+#!/bin/bash
+exec npx --yes $package "\$@"
+EOF
+
+chmod +x "$HOME/.local/bin/$command"

bin/omarchy-pkg-aur-install

@@ -18,9 +18,11 @@ fzf_args=(
 
 pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
 
-if [[ -n "$pkg_names" ]]; then
-  # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
+if [[ -n $pkg_names ]]; then
+  # Add aur/ prefix to each package name and convert to space-separated for yay
+  source omarchy-sudo-keepalive
+
+  echo "$pkg_names" | sed 's/^/aur\//' | tr '\n' ' ' | xargs yay -S --noconfirm
   sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-install

@@ -16,8 +16,10 @@ fzf_args=(
 
 pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
 
-if [[ -n "$pkg_names" ]]; then
-  # Convert newline-separated selections to space-separated for yay
+if [[ -n $pkg_names ]]; then
+  source omarchy-sudo-keepalive
+
+  # Convert newline-separated selections to space-separated for pacman
   echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
   omarchy-show-done
 fi

bin/omarchy-pkg-remove

@@ -16,7 +16,7 @@ fzf_args=(
 
 pkg_names=$(yay -Qqe | fzf "${fzf_args[@]}")
 
-if [[ -n "$pkg_names" ]]; then
+if [[ -n $pkg_names ]]; then
   # Convert newline-separated selections to space-separated for yay
   echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Rns --noconfirm
   omarchy-show-done

bin/omarchy-refresh-chromium

@@ -6,7 +6,7 @@ CONFIG_FILE="$HOME/.config/chromium-flags.conf"
 INSTALL_GOOGLE_ACCOUNTS=false
 
 # Check if google accounts were installed
-if [[ -f "$CONFIG_FILE" ]] && \
+if [[ -f $CONFIG_FILE ]] && \
   grep -q -- "--oauth2-client-id" "$CONFIG_FILE" && \
   grep -q -- "--oauth2-client-secret" "$CONFIG_FILE"; then
   INSTALL_GOOGLE_ACCOUNTS=true
@@ -16,6 +16,6 @@ fi
 omarchy-refresh-config chromium-flags.conf
 
 # Re-install Google accounts if previously configured
-if [[ "$INSTALL_GOOGLE_ACCOUNTS" == true ]]; then
+if [[ $INSTALL_GOOGLE_ACCOUNTS == "true" ]]; then
   omarchy-install-chromium-google-account
 fi

bin/omarchy-refresh-config

@@ -5,7 +5,7 @@
 
 config_file=$1
 
-if [[ -z "$config_file" ]]; then
+if [[ -z $config_file ]]; then
   cat <<USAGE
   Usage: $0 [config_file]
 
@@ -22,7 +22,7 @@ user_config_file="${HOME}/.config/$config_file"
 default_config_file="${HOME}/.local/share/omarchy/config/$config_file"
 backup_config_file="$user_config_file.bak.$(date +%s)"
 
-if [[ -f "$user_config_file" ]]; then
+if [[ -f $user_config_file ]]; then
   # Create preliminary backup
   cp -f "$user_config_file" "$backup_config_file" 2>/dev/null
 

bin/omarchy-refresh-pacman

@@ -7,17 +7,18 @@
 sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
 sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
 
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-  echo "Setting channel to edge"
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-  echo "Setting channel to stable"
+channel="${1:-stable}"
+
+if [[ $channel != "stable" && $channel != "rc" && $channel != "edge" ]]; then
+  echo "Error: Invalid channel '$channel'. Must be one of: stable, rc, edge"
+  exit 1
 fi
 
+echo "Setting channel to $channel"
 echo
 
+sudo cp -f "$OMARCHY_PATH/default/pacman/pacman-$channel.conf" /etc/pacman.conf
+sudo cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-$channel" /etc/pacman.d/mirrorlist
+
 # Reset all package DBs and then update
-sudo pacman -Syyu --noconfirm
+sudo pacman -Syyuu --noconfirm

bin/omarchy-refresh-sddm

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Refresh the SDDM theme from default
+
+sudo rm -rf /usr/share/sddm/themes/omarchy
+sudo cp -r $OMARCHY_PATH/default/sddm/omarchy /usr/share/sddm/themes/omarchy

bin/omarchy-refresh-tmux

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

bin/omarchy-refresh-walker

@@ -5,9 +5,17 @@
 # Ensure walker is set to autostart
 mkdir -p ~/.config/autostart/
 cp $OMARCHY_PATH/default/walker/walker.desktop ~/.config/autostart/
+
+# And restarts if it crashes or is killed
+mkdir -p ~/.config/systemd/user/app-walker@autostart.service.d/
+cp $OMARCHY_PATH/default/walker/restart.conf ~/.config/systemd/user/app-walker@autostart.service.d/restart.conf
+
 systemctl --user daemon-reload
 
+# Refresh configs
 omarchy-refresh-config walker/config.toml
 omarchy-refresh-config elephant/calc.toml
 omarchy-refresh-config elephant/desktopapplications.toml
+
+# Restart service
 omarchy-restart-walker

bin/omarchy-reinstall

@@ -10,5 +10,5 @@ if gum confirm "Are you sure you want to reinstall and lose all config changes?"
   omarchy-reinstall-pkgs
   omarchy-reinstall-configs
 
-  gum confirm "System has been reinstalled. Reboot?" && omarchy-cmd-reboot
+  gum confirm "System has been reinstalled. Reboot?" && omarchy-system-reboot
 fi

bin/omarchy-reinstall-configs

@@ -3,7 +3,7 @@ set -e
 
 # Overwrite all user configs with the Omarchy defaults.
 
-if [ "$EUID" -eq 0 ]; then
+if (( EUID == 0 )); then
   echo "Error: This script should not be run as root"
   exit 1
 fi

bin/omarchy-reinstall-git

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

bin/omarchy-remove-dev-env

@@ -1,7 +1,10 @@
 #!/bin/bash
 
-if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure>" >&2
+# Remove a development environment that was previously installed via omarchy-install-dev-env.
+# Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure|scala>
+
+if [[ -z $1 ]]; then
+  echo "Usage: omarchy-remove-dev-env <ruby|node|bun|deno|go|php|laravel|symfony|python|elixir|phoenix|zig|rust|java|dotnet|ocaml|clojure|scala>" >&2
   exit 1
 fi
 
@@ -93,6 +96,13 @@ clojure)
   mise uninstall clojure --all
   mise rm -g clojure
   ;;
+scala)
+  echo -e "Removing Scala...\n"
+  mise uninstall scala --all
+  mise uninstall scala-cli --all
+  mise rm -g scala
+  mise rm -g scala-cli
+  ;;
 *)
   echo "Unknown environment: $1"
   exit 1

bin/omarchy-remove-preinstalls

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Remove preinstalled Omarchy applications (web apps, TUIs, and selected packages).
+# This removes all web apps, TUIs, plus specific desktop applications.
+
+if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI wrappers, and desktop applications?"; then
+  echo -e "Removing preinstalled Omarchy applications...\n"
+
+  omarchy-webapp-remove-all
+  omarchy-tui-remove-all
+
+  cp ~/.config/hypr/bindings.conf ~/.config/hypr/bindings.conf.bak
+  cp "$OMARCHY_PATH/default/hypr/plain-bindings.conf" ~/.config/hypr/bindings.conf
+  hyprctl reload
+
+  # Remove npx stubs
+  rm -f ~/.local/bin/codex ~/.local/bin/gemini ~/.local/bin/copilot \
+       ~/.local/bin/opencode ~/.local/bin/playwright-cli ~/.local/bin/pi
+
+  omarchy-pkg-drop \
+    aether \
+    typora \
+    spotify \
+    libreoffice-fresh \
+    1password-beta \
+    1password-cli \
+    xournalpp \
+    signal-desktop \
+    pinta \
+    obsidian \
+    obs-studio \
+    kdenlive \
+    lazydocker \
+    opencode \
+    claude-code
+fi

bin/omarchy-reset-sudo

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Resetting sudo lockout for user
-su -c "faillock --reset --user $USER"

bin/omarchy-restart-app

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

bin/omarchy-restart-bluetooth

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

bin/omarchy-restart-hypridle

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Restart the hypridle service (used for idle detection and auto-lock).
+
 omarchy-restart-app hypridle

bin/omarchy-restart-hyprsunset

@@ -1,3 +1,5 @@
 #!/bin/bash
 
+# Restart the hyprsunset service (used for blue light filtering/night light).
+
 omarchy-restart-app hyprsunset

bin/omarchy-restart-makima

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Restart makima - key remapping service for remapping Copilot key to Omarchy Menu
+
+sudo systemctl restart makima

bin/omarchy-restart-opencode

@@ -2,4 +2,6 @@
 
 # Reload opencode configuration (used by the Omarchy theme switching).
 
-killall -SIGUSR2 opencode
+if pgrep -x opencode >/dev/null; then
+  killall -SIGUSR2 opencode
+fi

bin/omarchy-restart-pipewire

@@ -1,4 +1,6 @@
 #!/bin/bash
 
+# Restart the PipeWire audio service to fix audio issues or apply new configuration.
+
 echo -e "Restarting pipewire audio service...\n"
 systemctl --user restart pipewire.service

bin/omarchy-restart-tmux

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Restart tmux if running with the latest configuration
+
+if pgrep -x tmux; then
+  tmux source-file ~/.config/tmux/tmux.conf
+fi

bin/omarchy-restart-trackpad

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Reload the intel_quicki2c driver to fix a dead trackpad.
+# The THC (Touch Host Controller) can fail to initialize interrupts
+# during boot or after suspend, leaving the trackpad registered but
+# not delivering events.
+
+sudo modprobe -r intel_quicki2c && sudo modprobe intel_quicki2c

bin/omarchy-restart-walker

@@ -12,7 +12,7 @@ restart_services() {
   fi
 }
 
-if [[ $EUID -eq 0 ]]; then
+if (( EUID == 0 )); then
   SCRIPT_OWNER=$(stat -c '%U' "$0")
   USER_UID=$(id -u "$SCRIPT_OWNER")
   systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \

bin/omarchy-restart-wifi

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

bin/omarchy-restart-xcompose

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-omarchy-restart-app fcitx5
+# Restart the XCompose input method service (fcitx5) to apply new compose key settings.
+
+omarchy-restart-app fcitx5 --disable notificationitem

bin/omarchy-setup-dns

@@ -1,7 +1,30 @@
 #!/bin/bash
 
+lock_dns_to_resolved() {
+  for file in /etc/systemd/network/*.network; do
+    [[ -f $file ]] || continue
+    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
+
+    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
+    fi
+
+    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
+      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
+    fi
+  done
+}
+
+unlock_dns_to_dhcp() {
+  for file in /etc/systemd/network/*.network; do
+    [[ -f $file ]] || continue
+    sudo sed -i '/^\[DHCPv4\]/{n;/^UseDNS=no$/d}' "$file"
+    sudo sed -i '/^\[IPv6AcceptRA\]/{n;/^UseDNS=no$/d}' "$file"
+  done
+}
+
 if [[ -z $1 ]]; then
-  dns=$(gum choose --height 5 --header "Select DNS provider" Cloudflare DHCP Custom)
+  dns=$(gum choose --height 6 --header "Select DNS provider" Cloudflare Google DHCP Custom)
 else
   dns=$1
 fi
@@ -14,24 +37,17 @@ DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com
 FallbackDNS=9.9.9.9 149.112.112.112
 DNSOverTLS=opportunistic
 EOF
-  
-  # Ensure network interfaces don't override our DNS settings
-  for file in /etc/systemd/network/*.network; do
-    [[ -f "$file" ]] || continue
-    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
-    
-    # Add UseDNS=no to DHCPv4 section if not present
-    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
-    fi
-    
-    # Add UseDNS=no to IPv6AcceptRA section if present
-    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
-    fi
-  done
-  
-  sudo systemctl restart systemd-networkd systemd-resolved
+  lock_dns_to_resolved
+  ;;
+
+Google)
+  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNS=8.8.8.8#dns.google 8.8.4.4#dns.google
+FallbackDNS=9.9.9.9 149.112.112.112
+DNSOverTLS=opportunistic
+EOF
+  lock_dns_to_resolved
   ;;
 
 DHCP)
@@ -39,21 +55,14 @@ DHCP)
 [Resolve]
 DNSOverTLS=no
 EOF
-  
-  # Allow network interfaces to use DHCP DNS
-  for file in /etc/systemd/network/*.network; do
-    [[ -f "$file" ]] || continue
-    sudo sed -i '/^UseDNS=no/d' "$file"
-  done
-  
-  sudo systemctl restart systemd-networkd systemd-resolved
+  unlock_dns_to_dhcp
   ;;
 
 Custom)
   echo "Enter your DNS servers (space-separated, e.g. '192.168.1.1 1.1.1.1'):"
   read -r dns_servers
 
-  if [[ -z "$dns_servers" ]]; then
+  if [[ -z $dns_servers ]]; then
     echo "Error: No DNS servers provided."
     exit 1
   fi
@@ -63,25 +72,8 @@ Custom)
 DNS=$dns_servers
 FallbackDNS=9.9.9.9 149.112.112.112
 EOF
-  
-  # Ensure network interfaces don't override our DNS settings
-  for file in /etc/systemd/network/*.network; do
-    [[ -f "$file" ]] || continue
-    if ! grep -q "^\[DHCPv4\]" "$file"; then continue; fi
-    
-    # Add UseDNS=no to DHCPv4 section if not present
-    if ! sed -n '/^\[DHCPv4\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[DHCPv4\]/a UseDNS=no' "$file"
-    fi
-    
-    # Add UseDNS=no to IPv6AcceptRA section if present
-    if grep -q "^\[IPv6AcceptRA\]" "$file" && ! sed -n '/^\[IPv6AcceptRA\]/,/^\[/p' "$file" | grep -q "^UseDNS="; then
-      sudo sed -i '/^\[IPv6AcceptRA\]/a UseDNS=no' "$file"
-    fi
-  done
-  
-  sudo systemctl restart systemd-networkd systemd-resolved
-
+  lock_dns_to_resolved
   ;;
 esac
 
+sudo systemctl restart systemd-networkd systemd-resolved

bin/omarchy-setup-fido2

@@ -21,7 +21,7 @@ print_info() {
 
 check_fido2_hardware() {
   tokens=$(fido2-token -L 2>/dev/null)
-  if [ -z "$tokens" ]; then
+  if [[ -z $tokens ]]; then
     print_error "\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well)."
     return 1
   fi
@@ -36,10 +36,10 @@ setup_pam_config() {
   fi
 
   # Configure polkit
-  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
+  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
     print_info "Configuring polkit for FIDO2 authentication..."
     sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
-  elif [ ! -f /etc/pam.d/polkit-1 ]; then
+  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
     print_info "Creating polkit configuration with FIDO2 authentication..."
     sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
 auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
@@ -60,20 +60,20 @@ remove_pam_config() {
   fi
 
   # Remove from polkit
-  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
+  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
     print_info "Removing FIDO2 authentication from polkit..."
     sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/polkit-1
   fi
 }
 
-if [[ "--remove" == "$1" ]]; then
+if [[ "--remove" == $1 ]]; then
   print_success "Removing FIDO2 device from authentication.\n"
 
   # Remove PAM configuration
   remove_pam_config
 
   # Remove FIDO2 configuration
-  if [ -d /etc/fido2 ]; then
+  if [[ -d /etc/fido2 ]]; then
     print_info "Removing FIDO2 configuration..."
     sudo rm -rf /etc/fido2
   fi
@@ -88,14 +88,14 @@ else
 
   # Install required packages
   print_info "Installing required packages..."
-  sudo pacman -S --noconfirm --needed libfido2 pam-u2f
+  omarchy-pkg-add libfido2 pam-u2f
 
   if ! check_fido2_hardware; then
     exit 1
   fi
 
   # Create the pamu2fcfg file
-  if [ ! -f /etc/fido2/fido2 ]; then
+  if [[ ! -f /etc/fido2/fido2 ]]; then
     sudo mkdir -p /etc/fido2
     print_success "\nLet's setup your device by confirming on the device now."
     print_info "Touch your FIDO2 key when it lights up...\n"

bin/omarchy-setup-fingerprint

@@ -24,7 +24,7 @@ check_fingerprint_hardware() {
   devices=$(fprintd-list "$USER" 2>/dev/null)
 
   # Exit if no devices found
-  if [[ -z "$devices" ]]; then
+  if [[ -z $devices ]]; then
     print_error "\nNo fingerprint sensor detected."
     return 1
   fi
@@ -39,10 +39,10 @@ setup_pam_config() {
   fi
 
   # Configure polkit
-  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+  if [[ -f /etc/pam.d/polkit-1 ]] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
     print_info "Configuring polkit for fingerprint authentication..."
     sudo sed -i '1i auth      sufficient pam_fprintd.so' /etc/pam.d/polkit-1
-  elif [ ! -f /etc/pam.d/polkit-1 ]; then
+  elif [[ ! -f /etc/pam.d/polkit-1 ]]; then
     print_info "Creating polkit configuration with fingerprint authentication..."
     sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
 auth      sufficient pam_fprintd.so
@@ -58,11 +58,13 @@ EOF
 add_hyprlock_fingerprint_icon() {
   print_info "Adding fingerprint icon to hyprlock placeholder text..."
   sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
+  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = true/' ~/.config/hypr/hyprlock.conf
 }
 
 remove_hyprlock_fingerprint_icon() {
   print_info "Removing fingerprint icon from hyprlock placeholder text..."
   sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
+  sed -i 's/fingerprint:enabled = .*/fingerprint:enabled = false/' ~/.config/hypr/hyprlock.conf
 }
 
 remove_pam_config() {
@@ -73,13 +75,13 @@ remove_pam_config() {
   fi
 
   # Remove from polkit
-  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+  if [[ -f /etc/pam.d/polkit-1 ]] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
     print_info "Removing fingerprint authentication from polkit..."
     sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/polkit-1
   fi
 }
 
-if [[ "--remove" == "$1" ]]; then
+if [[ "--remove" == $1 ]]; then
   print_success "Removing fingerprint scanner from authentication.\n"
 
   # Remove PAM configuration
@@ -98,7 +100,7 @@ else
 
   # Install required packages
   print_info "Installing required packages..."
-  sudo pacman -S --noconfirm --needed fprintd usbutils
+  omarchy-pkg-add fprintd usbutils
 
   if ! check_fingerprint_hardware; then
     exit 1

bin/omarchy-setup-makima

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Setup makima - key remapping service for remapping Copilot key to Omarchy Menu
+
+CONFIG_FILE="$HOME/.config/makima/AT Translated Set 2 keyboard.toml"
+
+if [[ ! -f $CONFIG_FILE ]]; then
+  omarchy-pkg-add makima-bin
+
+  mkdir -p "$HOME/.config/makima"
+  cp "$OMARCHY_PATH/default/makima/AT Translated Set 2 keyboard.toml" "$CONFIG_FILE"
+
+  sudo mkdir -p /etc/systemd/system/makima.service.d
+  sudo tee /etc/systemd/system/makima.service.d/override.conf >/dev/null <<EOF
+[Service]
+User=$USER
+Environment="MAKIMA_CONFIG=/home/$USER/.config/makima"
+EOF
+
+  sudo systemctl daemon-reload
+  sudo systemctl enable --now makima 2>/dev/null || true
+fi

bin/omarchy-show-done

@@ -1,4 +1,7 @@
 #!/bin/bash
 
+# Display a "Done!" message with a spinner and wait for user to press any key.
+# Used by various install scripts to indicate completion.
+
 echo
 gum spin --spinner "globe" --title "Done! Press any key to close..." -- bash -c 'read -n 1 -s'

bin/omarchy-show-logo

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Display the Omarchy logo in the terminal using green color.
+# Used by various presentation scripts to show branding.
+
 clear
 echo -e "\033[32m"
 cat <~/.local/share/omarchy/logo.txt

bin/omarchy-state

@@ -1,17 +1,21 @@
 #!/bin/bash
 
+# Manage persistent state files for Omarchy toggles and settings.
+# Usage: omarchy-state <set|clear> <state-name-or-pattern>
+# Used to track whether features like suspend, idle lock, etc are enabled or disabled.
+
 STATE_DIR="$HOME/.local/state/omarchy"
 mkdir -p "$STATE_DIR"
 
 COMMAND="$1"
 STATE_NAME="$2"
 
-if [[ -z "$COMMAND" ]]; then
+if [[ -z $COMMAND ]]; then
   echo "Usage: omarchy-state <set|clear> <state-name-or-pattern>"
   exit 1
 fi
 
-if [[ -z "$STATE_NAME" ]]; then
+if [[ -z $STATE_NAME ]]; then
   echo "Usage: omarchy-state $COMMAND <state-name>"
   exit 1
 fi

bin/omarchy-sudo-keepalive

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Prompt for sudo once and keep the credential alive in the background.
+# Source this script so the trap applies to the calling shell:
+#   source omarchy-sudo-keepalive
+
+sudo -v
+while true; do sudo -n true; sleep 60; done 2>/dev/null &
+SUDO_KEEPALIVE_PID=$!
+trap "kill $SUDO_KEEPALIVE_PID 2>/dev/null" EXIT

bin/omarchy-sudo-passwordless-toggle

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Toggle passwordless sudo for the current user.
+# First run: enables passwordless sudo for 15 minutes (after confirmation).
+# Second run: disables it early.
+
+NOPASSWD_FILE="/etc/sudoers.d/99-omarchy-nopasswd-${USER}"
+TIMER_NAME="omarchy-nopasswd-expire-${USER}"
+
+# Safety: if the file exists but the timer doesn't (e.g. after reboot), clean up
+if sudo test -f "$NOPASSWD_FILE" && ! systemctl is-active "${TIMER_NAME}.timer" &>/dev/null; then
+  sudo rm "$NOPASSWD_FILE"
+fi
+
+# Check for the file directly — sudo -n can stay cached or be granted by other rules
+if sudo test -f "$NOPASSWD_FILE"; then
+  sudo rm "$NOPASSWD_FILE"
+  sudo systemctl stop "${TIMER_NAME}.timer" 2>/dev/null
+  echo "Passwordless sudo has been DISABLED. Sudo will require a password again."
+else
+  echo ""
+  echo "⚠️  WARNING: This will allow ANY process running as your user to"
+  echo "execute ANY command as root WITHOUT a password for 15 minutes."
+  echo ""
+  echo "This is useful for AI agents that need to run sudo commands,"
+  echo "but it significantly weakens the security of your system."
+  echo "Anyone or anything with access to your user account gets full root."
+  echo ""
+  echo "Passwordless sudo will automatically disable after 15 minutes."
+  echo "Run this command again to disable it early."
+  echo ""
+
+  if gum confirm "Enable passwordless sudo for 15 minutes? This is a significant security risk!"; then
+    echo "${USER} ALL=(ALL) NOPASSWD: ALL" | sudo tee "$NOPASSWD_FILE" > /dev/null
+    sudo chmod 440 "$NOPASSWD_FILE"
+    sudo systemd-run --on-active=15m --timer-property=AccuracySec=1s --unit="$TIMER_NAME" \
+      rm "$NOPASSWD_FILE"
+    echo "Passwordless sudo has been ENABLED. It will automatically disable in 15 minutes."
+    echo "Note: if you restart before then, run omarchy-sudo-passwordless-toggle again to disable it."
+  else
+    echo "Aborted. No changes made."
+  fi
+fi

bin/omarchy-sudo-reset

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

bin/omarchy-swayosd-brightness

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Display brightness level using SwayOSD on the current monitor.
+# Usage: omarchy-swayosd-brightness <percent>
+
+percent="$1"
+
+progress="$(awk -v p="$percent" 'BEGIN{printf "%.2f", p/100}')"
+[[ $progress == "0.00" ]] && progress="0.01"
+
+swayosd-client \
+  --monitor "$(hyprctl monitors -j | jq -r '.[]|select(.focused==true).name')" \
+  --custom-icon display-brightness \
+  --custom-progress "$progress" \
+  --custom-progress-text "${percent}%"