Hotfix: Prevent error when no orphans exist

Omarchy v3.1.2

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,5 +19,6 @@ body:
     id: steps
     attributes:
       label: What's wrong?
+      description: Describe the issue, include steps to recreate it if possible, and attach the output of `omarchy-debug` if possible
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
 blank_issues_enabled: false
+contact_links:
+  - name: 🛟 Community Support
+    url: https://omarchy.org/discord
+    about: Need help? Join our Discord community for support with any issues. GitHub issues should be used for verified bugs, documentation, and enhancement proposals only.

.github/ISSUE_TEMPLATE/documentation.yml

@@ -11,5 +11,6 @@ body:
     id: steps
     attributes:
       label: What correction or addition do we need?
+      description: Please provide reference links and specifics of what should be updated
     validations:
       required: true

README.md

@@ -1,10 +1,9 @@
 # Omarchy
 
-Turn a fresh Arch installation into a fully-configured, beautiful, and modern web development system based on Hyprland by running a single command. That's the one-line pitch for Omarchy (like it was for Omakub). No need to write bespoke configs for every essential tool just to get started or to be up on all the latest command-line tools. Omarchy is an opinionated take on what Linux can be at its best.
+Omarchy is a beautiful, modern & opinionated Linux distribution by DHH.
 
 Read more at [omarchy.org](https://omarchy.org).
 
 ## License
 
 Omarchy is released under the [MIT License](https://opensource.org/licenses/MIT).
-

applications/hidden/electron36.desktop

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

applications/hidden/electron37.desktop

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

applications/hidden/fcitx5-wayland-launcher.desktop

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

applications/hidden/java-java-openjdk.desktop

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

applications/hidden/jconsole-java-openjdk.desktop

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

applications/hidden/jshell-java-openjdk.desktop

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

applications/nvim.desktop

@@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
+Exec=omarchy-launch-editor %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;

bin/omarchy-battery-monitor

@@ -4,33 +4,18 @@
 
 BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
-
-get_battery_percentage() {
-  upower -i "$(upower -e | grep 'BAT')" \
-  | awk -F: '/percentage/ {
-      gsub(/[%[:space:]]/, "", $2);
-      val=$2;
-      printf("%d\n", (val+0.5))
-      exit
-    }'
-}
-
-get_battery_state() {
-  upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}'
-}
+BATTERY_LEVEL=$(omarchy-battery-remaining)
+BATTERY_STATE=$(upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}')
 
 send_notification() {
   notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
 }
 
-BATTERY_LEVEL=$(get_battery_percentage)
-BATTERY_STATE=$(get_battery_state)
-
-if [[ "$BATTERY_STATE" == "discharging" && "$BATTERY_LEVEL" -le "$BATTERY_THRESHOLD" ]]; then
-  if [[ ! -f "$NOTIFICATION_FLAG" ]]; then
-    send_notification "$BATTERY_LEVEL"
-    touch "$NOTIFICATION_FLAG"
+if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then
+  if [[ ! -f $NOTIFICATION_FLAG ]]; then
+    send_notification $BATTERY_LEVEL
+    touch $NOTIFICATION_FLAG
   fi
 else
-  rm -f "$NOTIFICATION_FLAG"
+  rm -f $NOTIFICATION_FLAG
 fi

bin/omarchy-battery-remaining

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Returns the battery percentage remaining as an integer.
+
+upower -i $(upower -e | grep BAT) \
+| awk -F: '/percentage/ {
+    gsub(/[%[:space:]]/, "", $2);
+    val=$2;
+    printf("%d\n", (val+0.5))
+    exit
+  }'

bin/omarchy-cmd-apple-display-brightness

@@ -3,5 +3,12 @@
 if [[ $# -eq 0 ]]; then
   echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
 else
-  sudo asdcontrol $(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1) -- "$1"
+  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

@@ -2,7 +2,7 @@
 
 focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 
-sinks=$(pactl -f json list sinks | jq '[.[] | select([.ports[]? | .availability == "available"] | any)]')
+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
@@ -23,7 +23,13 @@ fi
 
 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+\[.*$//')
+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')

bin/omarchy-cmd-first-run

@@ -6,8 +6,14 @@ FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
 
 if [[ -f "$FIRST_RUN_MODE" ]]; then
   rm -f "$FIRST_RUN_MODE"
+
   bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
+  bash "$OMARCHY_PATH/install/first-run/cleanup-reboot-sudoers.sh"
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
+  bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
   sudo rm -f /etc/sudoers.d/first-run
+
+  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
+  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
 fi

bin/omarchy-cmd-screenrecord

@@ -8,31 +8,82 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-# Selects region or output
-SCOPE="$1"
+SCOPE=""
+AUDIO="false"
+WEBCAM="false"
 
-# Selects audio inclusion or not
-AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
+for arg in "$@"; do
+  case "$arg" in
+    --with-audio) AUDIO="true" ;;
+    --with-webcam) WEBCAM="true" ;;
+    output|region) SCOPE="$arg" ;;
+  esac
+done
+
+cleanup_webcam() {
+  pkill -f "WebcamOverlay" 2>/dev/null
+}
+
+start_webcam_overlay() {
+  cleanup_webcam
+
+  # Get monitor scale
+  local scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
+
+  # Target width (base 360px, scaled to monitor)
+  local target_width=$(awk "BEGIN {printf \"%.0f\", 360 * $scale}")
+
+  # Try preferred 16:9 resolutions in order, use first available
+  local preferred_resolutions=("640x360" "1280x720" "1920x1080")
+  local video_size_arg=""
+  local available_formats=$(v4l2-ctl --list-formats-ext -d /dev/video0 2>/dev/null)
+
+  for resolution in "${preferred_resolutions[@]}"; do
+    if echo "$available_formats" | grep -q "$resolution"; then
+      video_size_arg="-video_size $resolution"
+      break
+    fi
+  done
+
+  ffplay -f v4l2 $video_size_arg -framerate 30 /dev/video0 \
+    -vf "scale=${target_width}:-1" \
+    -window_title "WebcamOverlay" \
+    -noborder \
+    -fflags nobuffer -flags low_delay \
+    -probesize 32 -analyzeduration 0 \
+    -loglevel quiet &
+  sleep 1
+}
 
 start_screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local audio_args=""
 
-  if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-    wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
-  else
-    wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &
-  fi
+  # Merge audio tracks into one - separate tracks only play one at a time in most players
+  [[ "$AUDIO" == "true" ]] && audio_args="-a default_output|default_input"
 
+  gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
   toggle_screenrecording_indicator
 }
 
 stop_screenrecording() {
-  pkill -x wl-screenrec
-  pkill -x wf-recorder
+  pkill -SIGINT -f "gpu-screen-recorder"  # SIGINT required to save video properly
 
-  notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
+  # 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
+    sleep 0.1
+    count=$((count + 1))
+  done
 
-  sleep 0.2 # ensures the process is actually dead before we check
+  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
+  fi
   toggle_screenrecording_indicator
 }
 
@@ -41,14 +92,51 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null
+  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; then
-  stop_screenrecording
+  if pgrep -x slurp >/dev/null; then
+    pkill -x slurp 2>/dev/null
+  elif pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "gpu-screen-recorder" >/dev/null; then
+    cleanup_webcam
+  else
+    stop_screenrecording
+  fi
 elif [[ "$SCOPE" == "output" ]]; then
-  start_screenrecording
+  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+
+  if ! output=$(slurp -o -f "%o"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ -z "$output" ]]; then
+    notify-send "Error" "Could not detect monitor" -u critical
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  start_screenrecording "$output"
 else
-  region=$(slurp) || exit 1
-  start_screenrecording -g "$region"
+  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
+
+  scale=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .scale')
+
+  if ! region=$(slurp -f "%wx%h+%x+%y"); then
+    [[ "$WEBCAM" == "true" ]] && cleanup_webcam
+    exit 1
+  fi
+
+  if [[ "$region" =~ ^([0-9]+)x([0-9]+)\+([0-9]+)\+([0-9]+)$ ]]; then
+    w=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[1]} * $scale}")
+    h=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[2]} * $scale}")
+    x=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[3]} * $scale}")
+    y=$(awk "BEGIN {printf \"%.0f\", ${BASH_REMATCH[4]} * $scale}")
+    scaled_region="${w}x${h}+${x}+${y}"
+  else
+    scaled_region="$region"
+  fi
+
+  start_screenrecording region -region "$scaled_region"
 fi

bin/omarchy-cmd-screensaver

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-function exit_screensaver {
+screensaver_in_focus() {
+  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
+}
+
+exit_screensaver() {
   hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
   pkill -f "alacritty --class Screensaver" 2>/dev/null
@@ -9,7 +13,7 @@ function exit_screensaver {
 
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
-hyprctl keyword cursor:invisible true
+hyprctl keyword cursor:invisible true &>/dev/null
 
 while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
@@ -18,7 +22,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3; then
+    if read -n 1 -t 3 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

@@ -8,10 +8,76 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
+pkill slurp && exit 0
+
+MODE="${1:-smart}"
+PROCESSING="${2:-slurp}"
+
+get_rectangles() {
+  local active_workspace=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .activeWorkspace.id')
+  hyprctl monitors -j | jq -r --arg ws "$active_workspace" '.[] | select(.activeWorkspace.id == ($ws | tonumber)) | "\(.x),\(.y) \((.width / .scale) | floor)x\((.height / .scale) | floor)"'
+  hyprctl clients -j | jq -r --arg ws "$active_workspace" '.[] | select(.workspace.id == ($ws | tonumber)) | "\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"'
+}
+
+# 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
+
+    # 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]}"
+
+        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
+          fi
+        done <<< "$RECTS"
+      fi
+    fi
+    ;;
+esac
+
+[ -z "$SELECTION" ] && exit 0
+
+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'
+else
+  grim -g "$SELECTION" - | wl-copy
+fi

bin/omarchy-cmd-share

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-cmd-share [clipboard|file|folder]"
+  exit 1
+fi
+
+MODE="$1"
+shift
+
+if [[ $MODE == "clipboard" ]]; then
+  TEMP_FILE=$(mktemp --suffix=.txt)
+  wl-paste >"$TEMP_FILE"
+  FILES="$TEMP_FILE"
+else
+  if (($# > 0)); then
+    FILES="$*"
+  else
+    if [[ $MODE == "folder" ]]; then
+      # Pick a single folder from home directory
+      FILES=$(find "$HOME" -type d 2>/dev/null | fzf)
+    else
+      # Pick one or more files from home directory
+      FILES=$(find "$HOME" -type f 2>/dev/null | fzf --multi)
+    fi
+    [ -z "$FILES" ] && exit 0
+  fi
+fi
+
+# Run LocalSend in its own systemd service (detached from terminal)
+# Convert newline-separated files to space-separated arguments
+if [[ $MODE != "clipboard" ]] && echo "$FILES" | grep -q $'\n'; then
+  # Multiple files selected - convert newlines to array
+  readarray -t FILE_ARRAY <<<"$FILES"
+  systemd-run --user --quiet --collect localsend --headless send "${FILE_ARRAY[@]}"
+else
+  # Single file or clipboard mode
+  systemd-run --user --quiet --collect localsend --headless send "$FILES"
+fi
+
+# Note: Temporary file will remain until system cleanup for clipboard mode
+# This ensures the file content is available for the LocalSend GUI
+
+exit 0

bin/omarchy-cmd-terminal-cwd

@@ -2,10 +2,16 @@
 
 # Go from current active terminal to its child shell process and run cwd there
 terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
-shell_pid=$(pgrep -P "$terminal_pid" | head -n1)
+shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
 
 if [[ -n $shell_pid ]]; then
-  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null || echo "$HOME"
+  cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
+
+  if [[ -d $cwd ]]; then
+    echo "$cwd"
+  else
+    echo "$HOME"
+  fi
 else
   echo "$HOME"
 fi

bin/omarchy-cmd-tzupdate

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-sudo systemctl restart systemd-timesyncd
-sudo tzupdate
-new_timezone=$(timedatectl show -p Timezone --value)
-omarchy-restart-waybar
-notify-send "Time synced and timezone set to $new_timezone"

bin/omarchy-debug

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+LOG_FILE="/tmp/omarchy-debug.log"
+
+cat > "$LOG_FILE" <<EOF
+Date: $(date)
+Hostname: $(hostname)
+Omarchy Branch: $(git -C "$OMARCHY_PATH" branch --show-current 2>/dev/null || echo "unknown")
+
+=========================================
+SYSTEM INFORMATION
+=========================================
+$(inxi -Farz)
+
+=========================================
+DMESG
+=========================================
+$(sudo dmesg)
+
+=========================================
+JOURNALCTL (CURRENT BOOT, ERRORS ONLY)
+=========================================
+$(journalctl -b -p 4..1)
+
+=========================================
+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
+
+OPTIONS=("View log" "Save in current directory")
+if ping -c 1 8.8.8.8 >/dev/null 2>&1; then
+  OPTIONS=("Upload log" "${OPTIONS[@]}")
+fi
+
+ACTION=$(gum choose "${OPTIONS[@]}")
+
+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
+      echo "✓ Log uploaded successfully!"
+      echo "Share this URL:"
+      echo ""
+      echo "  $URL"
+      echo ""
+      echo "This link will expire in 24 hours."
+    else
+      echo "Error: Failed to upload log file"
+      exit 1
+    fi
+    ;;
+  "View log")
+    less "$LOG_FILE"
+    ;;
+  "Save in current directory")
+    cp "$LOG_FILE" "./omarchy-debug.log"
+    echo "✓ Log saved to $(pwd)/omarchy-debug.log"
+    ;;
+esac

bin/omarchy-font-current

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

bin/omarchy-font-set

@@ -4,7 +4,20 @@ font_name="$1"
 
 if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
   if fc-list | grep -iq "$font_name"; then
-    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+      sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    fi
+
+    if [[ -f ~/.config/kitty/kitty.conf ]]; then
+      sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
+      pkill -USR1 kitty
+    fi
+
+    if [[ -f ~/.config/ghostty/config ]]; then
+      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
+      pkill -SIGUSR2 ghostty
+    fi
+
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \
@@ -15,6 +28,8 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
     omarchy-restart-waybar
     omarchy-restart-swayosd
     omarchy-restart-walker
+
+    omarchy-hook font-set "$font_name"
   else
     echo "Font '$font_name' not found."
     exit 1

bin/omarchy-hook

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [[ $# -lt 1 ]]; then
+  echo "Usage: omarchy-hook [name] [args...]"
+  exit 1
+fi
+
+HOOK=$1
+HOOK_PATH="$HOME/.config/omarchy/hooks/$1"
+shift
+
+if [[ -f $HOOK_PATH ]]; then
+  bash "$HOOK_PATH" "$@"
+fi

bin/omarchy-hyprland-workspace-toggle-gaps

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+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, border:true"
+else \
+  hyprctl keyword "workspace $workspace_id, gapsout:0, gapsin:0, border:false"
+fi

bin/omarchy-install-chromium-google-account

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ -f ~/.config/chromium-flags.conf ]]; then
+  CONF=~/.config/chromium-flags.conf
+
+  grep -qxF -- "--oauth2-client-id=77185425430.apps.googleusercontent.com" "$CONF" ||
+    echo "--oauth2-client-id=77185425430.apps.googleusercontent.com" >>"$CONF"
+
+  grep -qxF -- "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" "$CONF" ||
+    echo "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" >>"$CONF"
+
+  echo "Now you can login to your Google Account in Chromium."
+fi

bin/omarchy-install-dev-env

@@ -47,6 +47,7 @@ install_node() {
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
+  omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
   mise x ruby -- gem install rails --no-document
@@ -119,6 +120,7 @@ java)
 zig)
   echo -e "Installing Zig...\n"
   mise use --global zig@latest
+  mise use -g zls@latest
   ;;
 ocaml)
   echo -e "Installing OCaml...\n"

bin/omarchy-install-docker-dbs

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
+options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB" "MSSQL")
 
 if [[ "$#" -eq 0 ]]; then
-  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu
 else
   choices="$@"
 fi
@@ -16,6 +16,7 @@ if [[ -n "$choices" ]]; then
     MariaDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mariadb11 -e MARIADB_ROOT_PASSWORD= -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true mariadb:11.8 ;;
     Redis) sudo docker run -d --restart unless-stopped -p "127.0.0.1:6379:6379" --name=redis redis:7 ;;
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;
+    MSSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:1433:1433" --name mssql -e MSSQL_PID=Developer -e ACCEPT_EULA=Y -e "MSSQL_SA_PASSWORD=@dmin123" mcr.microsoft.com/mssql/server:2022-CU12-ubuntu-22.04 ;;
     esac
   done
 else

bin/omarchy-install-dropbox

@@ -4,5 +4,5 @@ echo "Installing all dependencies..."
 omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
-uwsm app -- dropbox-cli start &>/dev/null &
+uwsm-app -- dropbox-cli start &>/dev/null &
 echo "See Dropbox icon behind   hover tray in top right and right-click for setup."

bin/omarchy-install-terminal

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
+  exit 1
+fi
+
+package="$1"
+
+# Install package
+if omarchy-pkg-add $package; then
+  # Set as default terminal
+  echo "Setting $package as new default terminal..."
+  sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
+
+  # Restart is needed for new default to take effect
+  echo
+  gum confirm "Restart to use new terminal?" && systemctl reboot --no-wall
+else
+  echo "Failed to install $package"
+fi

bin/omarchy-install-vscode

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "Installing VSCode..."
+omarchy-pkg-add visual-studio-code-bin
+
+mkdir -p ~/.vscode ~/.config/Code/User
+
+cat > ~/.vscode/argv.json << 'EOF'
+// This configuration file allows you to pass permanent command line arguments to VS Code.
+// Only a subset of arguments is currently supported to reduce the likelihood of breaking
+// the installation.
+//
+// PLEASE DO NOT CHANGE WITHOUT UNDERSTANDING THE IMPACT
+//
+// NOTE: Changing this file requires a restart of VS Code.
+{
+  "password-store":"gnome-libsecret"
+}
+EOF
+
+# Ensure VSC's own auto-update feature is turned off
+printf '{\n  "update.mode": "none"\n}\n' > ~/.config/Code/User/settings.json
+
+setsid gtk-launch code

bin/omarchy-launch-about

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec setsid uwsm-app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'

bin/omarchy-launch-browser

@@ -1,3 +1,12 @@
 #!/bin/bash
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@
+default_browser=$(xdg-settings get default-web-browser)
+browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1)
+
+if [[ $browser_exec =~ (firefox|zen|librewolf) ]]; then
+  private_flag="--private-window"
+else
+  private_flag="--incognito"
+fi
+
+exec setsid uwsm-app -- "$browser_exec" "${@/--private/$private_flag}"

bin/omarchy-launch-editor

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+case "${EDITOR:-nvim}" in
+nvim | vim | nano | micro | hx | helix)
+  exec setsid uwsm-app -- "$TERMINAL" -e "$EDITOR" "$@"
+  ;;
+*)
+  exec setsid uwsm-app -- "$EDITOR" "$@"
+  ;;
+esac

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

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cmd="$*"
-setsid alacritty --class Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"
+exec setsid uwsm-app -- alacritty -o font.size=9 --class=Omarchy --title=Omarchy -e bash -c "omarchy-show-logo; $cmd; omarchy-show-done"

bin/omarchy-launch-or-focus

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-launch-or-focus [window-pattern] [launch-command]"
+  exit 1
+fi
+
+WINDOW_PATTERN="$1"
+LAUNCH_COMMAND="${2:-"uwsm-app -- $WINDOW_PATTERN"}"
+WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|select((.class|test("\\b" + $p + "\\b";"i")) or (.title|test("\\b" + $p + "\\b";"i")))|.address' | head -n1)
+
+if [[ -n $WINDOW_ADDRESS ]]; then
+  hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
+else
+  eval exec $LAUNCH_COMMAND
+fi

bin/omarchy-launch-or-focus-webapp

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-launch-or-focus-webapp [window-pattern] [url-and-flags...]"
+  exit 1
+fi
+
+WINDOW_PATTERN="$1"
+shift
+LAUNCH_COMMAND="omarchy-launch-webapp $@"
+
+exec omarchy-launch-or-focus "$WINDOW_PATTERN" "$LAUNCH_COMMAND"

bin/omarchy-launch-screensaver

@@ -17,6 +17,8 @@ focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
 
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   hyprctl dispatch focusmonitor $m
+
+  # FIXME: Find a way to make this generic where we it can work for kitty + ghostty
   hyprctl dispatch exec -- \
     alacritty --class Screensaver \
     --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \

bin/omarchy-launch-terminal

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec setsid uwsm-app -- "${TERMINAL:-alacritty}" "$@"

bin/omarchy-launch-walker

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Ensure elephant is running before launching walker
+if ! pgrep -x elephant > /dev/null; then
+  setsid uwsm-app -- elephant &
+fi
+
+# Ensure walker service is running
+if ! pgrep -f "walker --gapplication-service" > /dev/null; then
+  setsid uwsm-app -- walker --gapplication-service &
+fi
+
+exec walker --width 644 --maxheight 300 --minheight 300 "$@"

bin/omarchy-launch-webapp

@@ -3,8 +3,8 @@
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in
-google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
 *) browser="chromium.desktop" ;;
 esac
 
-exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"
+exec setsid uwsm-app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$browser 2>/dev/null | head -1) --app="$1" "${@:2}"

bin/omarchy-launch-wifi

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec setsid uwsm-app -- "$TERMINAL" --class=Impala -e impala "$@"

bin/omarchy-menu

@@ -29,24 +29,24 @@ menu() {
     local index
     index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
     if [[ -n "$index" ]]; then
-      args+=("-a" "$index")
+      args+=("-c" "$index")
     fi
   fi
 
-  echo -e "$options" | walker --dmenu --theme dmenu_250 -p "$prompt…" "${args[@]}"
+  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
 }
 
 terminal() {
-  alacritty --class Omarchy -e "$@"
+  alacritty --class=Omarchy -e "$@"
 }
 
 present_terminal() {
   omarchy-launch-floating-terminal-with-presentation $1
 }
 
-edit_in_nvim() {
+open_in_editor() {
   notify-send "Editing config file" "$1"
-  alacritty -e nvim "$1"
+  omarchy-launch-editor "$1"
 }
 
 install() {
@@ -61,6 +61,10 @@ install_font() {
   present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
 }
 
+install_terminal() {
+  present_terminal "omarchy-install-terminal $1"
+}
+
 aur_install() {
   present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }
@@ -81,13 +85,70 @@ show_learn_menu() {
   esac
 }
 
+show_trigger_menu() {
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
+  *Capture*) show_capture_menu ;;
+  *Share*) show_share_menu ;;
+  *Toggle*) show_toggle_menu ;;
+  *) show_main_menu ;;
+  esac
+}
+
+show_capture_menu() {
+  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
+  *Screenshot*) show_screenshot_menu ;;
+  *Screenrecord*) show_screenrecord_menu ;;
+  *Color*) pkill hyprpicker || hyprpicker -a ;;
+  *) 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
+}
+
+show_screenrecord_menu() {
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio\n  Display + Webcam") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region --with-audio ;;
+  *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output --with-audio ;;
+  *"Display + Webcam"*) omarchy-cmd-screenrecord output --with-audio --with-webcam ;;
+  *Display*) omarchy-cmd-screenrecord output ;;
+  *) back_to show_capture_menu ;;
+  esac
+}
+
+show_share_menu() {
+  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
+  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
+  *File*) terminal bash -c "omarchy-cmd-share file" ;;
+  *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
+  *) back_to show_trigger_menu ;;
+  esac
+}
+
+show_toggle_menu() {
+  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
+  *Screensaver*) omarchy-toggle-screensaver ;;
+  *Nightlight*) omarchy-toggle-nightlight ;;
+  *Idle*) omarchy-toggle-idle ;;
+  *Bar*) omarchy-toggle-waybar ;;
+  *) show_trigger_menu ;;
+  esac
+}
+
 show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n󱄄  Screensaver\n  About") in
+  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 ;;
-  *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;;
-  *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
+  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
@@ -102,7 +163,7 @@ show_theme_menu() {
 }
 
 show_font_menu() {
-  theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
+  theme=$(menu "Font" "$(omarchy-font-list)" "--width 350" "$(omarchy-font-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
     back_to show_style_menu
   else
@@ -110,68 +171,30 @@ show_font_menu() {
   fi
 }
 
-show_capture_menu() {
-  case $(menu "Capture" "  Screenshot\n  Screenrecord\n󰃉  Color") in
-  *Screenshot*) show_screenshot_menu ;;
-  *Screenrecord*) show_screenrecord_menu ;;
-  *Color*) pkill hyprpicker || hyprpicker -a ;;
-  *) show_main_menu ;;
-  esac
-}
-
-show_screenshot_menu() {
-  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
-  *Region*) omarchy-cmd-screenshot ;;
-  *Window*) omarchy-cmd-screenshot window ;;
-  *Display*) omarchy-cmd-screenshot output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
-  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
-  *Region*) omarchy-cmd-screenrecord ;;
-  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
-  *Display*) omarchy-cmd-screenrecord output ;;
-  *) show_capture_menu ;;
-  esac
-}
-
-show_toggle_menu() {
-  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
-  *Screensaver*) omarchy-toggle-screensaver ;;
-  *Nightlight*) omarchy-toggle-nightlight ;;
-  *Idle*) omarchy-toggle-idle ;;
-  *Bar*) omarchy-toggle-waybar ;;
-  *) show_main_menu ;;
-  esac
-}
-
 show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) alacritty --class=Wiremix -e wiremix ;;
+  *Audio*) $TERMINAL --class=Wiremix -e wiremix ;;
   *Wifi*)
     rfkill unblock wifi
-    alacritty --class=Impala -e impala
+    omarchy-launch-wifi
     ;;
   *Bluetooth*)
     rfkill unblock bluetooth
     blueberry
     ;;
   *Power*) show_setup_power_menu ;;
-  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
+  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
+  *Input*) open_in_editor ~/.config/hypr/input.conf ;;
+  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
+  *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
   *) show_main_menu ;;
   esac
 }
@@ -188,20 +211,28 @@ show_setup_power_menu() {
 
 show_setup_config_menu() {
   case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
+  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
+  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
+  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
+  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
+  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
+  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
+  *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
   *) show_main_menu ;;
   esac
 }
 
+show_setup_security_menu() {
+  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
+  *) show_setup_menu ;;
+  esac
+}
+
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n󰍲  Windows\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -210,24 +241,27 @@ show_install_menu() {
   *Style*) show_install_style_menu ;;
   *Development*) show_install_development_menu ;;
   *Editor*) show_install_editor_menu ;;
+  *Terminal*) show_install_terminal_menu ;;
   *AI*) show_install_ai_menu ;;
+  *Windows*) present_terminal "omarchy-windows-vm install" ;;
   *Gaming*) show_install_gaming_menu ;;
   *) show_main_menu ;;
   esac
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
   *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
+  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
-  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
+  *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) aur_install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
@@ -237,6 +271,15 @@ show_install_editor_menu() {
   esac
 }
 
+show_install_terminal_menu() {
+  case $(menu "Install" "  Alacritty\n  Ghostty\n  Kitty") in
+  *Alacritty*) install_terminal "alacritty" ;;
+  *Ghostty*) install_terminal "ghostty" ;;
+  *Kitty*) install_terminal "kitty" ;;
+  *) show_install_menu ;;
+  esac
+}
+
 show_install_ai_menu() {
   ollama_pkg=$(
     (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
@@ -244,8 +287,9 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini [AUR]\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI [AUR]\n󱚤  Gemini [AUR]\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
   *Claude*) install "Claude Code" "claude-code" ;;
+  *Cursor*) aur_install "Cursor CLI" "cursor-cli" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) aur_install "Gemini" "gemini-cli" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
@@ -275,7 +319,7 @@ show_install_style_menu() {
 }
 
 show_install_font_menu() {
-  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "-w 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "--width 350") in
   *Meslo*) install_font "Meslo LG Mono" "ttf-meslo-nerd" "MesloLGL Nerd Font" ;;
   *Fira*) install_font "Fira Code" "ttf-firacode-nerd" "FiraCode Nerd Font" ;;
   *Victor*) install_font "Victor Code" "ttf-victor-mono-nerd" "VictorMono Nerd Font" ;;
@@ -330,11 +374,12 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\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 ;;
   *Theme*) present_terminal omarchy-theme-remove ;;
+  *Windows*) present_terminal "omarchy-windows-vm remove" ;;
   *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
   *Fido2*) present_terminal "omarchy-setup-fido2 --remove" ;;
   *) show_main_menu ;;
@@ -342,13 +387,15 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
   *Hardware*) show_update_hardware_menu ;;
-  *Timezone*) omarchy-cmd-tzupdate ;;
+  *Firmware*) present_terminal omarchy-update-firmware ;;
+  *Timezone*) present_terminal omarchy-tz-select ;;
+  *Time*) present_terminal omarchy-reset-time ;;
   *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
@@ -380,7 +427,8 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *Audio*) present_terminal omarchy-restart-pipewire ;;
   *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
   *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
   *) show_update_menu ;;
@@ -396,37 +444,36 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
   *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
-  *Restart*) systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
+  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
+  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
   *) back_to show_main_menu ;;
   esac
 }
 
 show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n  Capture\n󰔎  Toggle\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
+  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n󱓞  Trigger\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
 }
 
 go_to_menu() {
   case "${1,,}" in
   *apps*) walker -p "Launch…" ;;
   *learn*) show_learn_menu ;;
+  *trigger*) show_trigger_menu ;;
+  *share*) show_share_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
-  *capture*) show_capture_menu ;;
   *screenshot*) show_screenshot_menu ;;
   *screenrecord*) show_screenrecord_menu ;;
-  *toggle*) show_toggle_menu ;;
   *setup*) show_setup_menu ;;
   *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
-  *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
+  *about*) omarchy-launch-about ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-menu-keybindings

@@ -3,6 +3,69 @@
 # A script to display Hyprland keybindings defined in your configuration
 # using walker for an interactive search menu.
 
+declare -A KEYCODE_SYM_MAP
+
+build_keymap_cache() {
+  local keymap
+  keymap="$(xkbcli compile-keymap)" || {
+    echo "Failed to compile keymap" >&2
+    return 1
+  }
+
+  while IFS=, read -r code sym; do
+    [[ -z "$code" || -z "$sym" ]] && continue
+    KEYCODE_SYM_MAP["$code"]="$sym"
+  done < <(
+    awk '
+      BEGIN { sec = "" }
+      /xkb_keycodes/ { sec = "codes"; next }
+      /xkb_symbols/  { sec = "syms";  next }
+      sec == "codes" {
+        if (match($0, /<([A-Za-z0-9_]+)>\s*=\s*([0-9]+)\s*;/, m)) code_by_name[m[1]] = m[2]
+      }
+      sec == "syms" {
+        if (match($0, /key\s*<([A-Za-z0-9_]+)>\s*\{\s*\[\s*([^, \]]+)/, m)) sym_by_name[m[1]] = m[2]
+      }
+      END {
+        for (k in code_by_name) {
+          c = code_by_name[k]
+          s = sym_by_name[k]
+          if (c != "" && s != "" && s != "NoSymbol") print c "," s
+        }
+      }
+    ' <<<"$keymap"
+  )
+}
+
+lookup_keycode_cached() {
+  printf '%s\n' "${KEYCODE_SYM_MAP[$1]}"
+}
+
+parse_keycodes() {
+  local start end elapsed
+  [[ "${DEBUG:-0}" == "1" ]] && start=$(date +%s.%N)
+  while IFS= read -r line; do
+    if [[ "$line" =~ code:([0-9]+) ]]; then
+      code="${BASH_REMATCH[1]}"
+      symbol=$(lookup_keycode_cached "$code" "$XKB_KEYMAP_CACHE")
+      echo "${line/code:${code}/$symbol}"
+    else
+      echo "$line"
+    fi
+  done
+
+  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
+      elapsed=$(echo "$end - $start" | bc)
+    else
+      elapsed=$(awk -v s="$start" -v e="$end" 'BEGIN{printf "%.6f", (e - s)}')
+    fi
+    echo "[DEBUG] parse_keycodes elapsed: ${elapsed}s" >&2
+  fi
+}
+
 # Fetch dynamic keybindings from Hyprland
 #
 # Also do some pre-processing:
@@ -11,30 +74,31 @@
 # - Map numeric modifier key mask to a textual rendition
 # - Output comma-separated values that the parser can understand
 dynamic_bindings() {
-  hyprctl -j binds | \
-    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' | \
+  hyprctl -j binds |
+    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
     sed -r \
-        -e 's/null//' \
-        -e 's,~/.local/share/omarchy/bin/,,' \
-        -e 's,uwsm app -- ,,' \
-        -e 's/@0//' \
-        -e 's/,@/,code:/' \
-        -e 's/^0,/,/' \
-        -e 's/^1,/SHIFT,/' \
-        -e 's/^4,/CTRL,/' \
-        -e 's/^5,/SHIFT CTRL,/' \
-        -e 's/^8,/ALT,/' \
-        -e 's/^9,/SHIFT ALT,/' \
-        -e 's/^12,/CTRL ALT,/' \
-        -e 's/^13,/SHIFT CTRL ALT,/' \
-        -e 's/^64,/SUPER,/' \
-        -e 's/^65,/SUPER SHIFT,/' \
-        -e 's/^68,/SUPER CTRL,/' \
-        -e 's/^69,/SUPER SHIFT CTRL,/' \
-        -e 's/^72,/SUPER ALT,/' \
-        -e 's/^73,/SUPER SHIFT ALT,/' \
-        -e 's/^76,/SUPER CTRL ALT,/' \
-        -e 's/^77,/SUPER SHIFT CTRL ALT,/'
+      -e 's/null//' \
+      -e 's,~/.local/share/omarchy/bin/,,' \
+      -e 's,uwsm app -- ,,' \
+      -e 's,uwsm-app -- ,,' \
+      -e 's/@0//' \
+      -e 's/,@/,code:/' \
+      -e 's/^0,/,/' \
+      -e 's/^1,/SHIFT,/' \
+      -e 's/^4,/CTRL,/' \
+      -e 's/^5,/SHIFT CTRL,/' \
+      -e 's/^8,/ALT,/' \
+      -e 's/^9,/SHIFT ALT,/' \
+      -e 's/^12,/CTRL ALT,/' \
+      -e 's/^13,/SHIFT CTRL ALT,/' \
+      -e 's/^64,/SUPER,/' \
+      -e 's/^65,/SUPER SHIFT,/' \
+      -e 's/^68,/SUPER CTRL,/' \
+      -e 's/^69,/SUPER SHIFT CTRL,/' \
+      -e 's/^72,/SUPER ALT,/' \
+      -e 's/^73,/SUPER SHIFT ALT,/' \
+      -e 's/^76,/SUPER CTRL ALT,/' \
+      -e 's/^77,/SUPER SHIFT CTRL ALT,/'
 }
 
 # Parse and format keybindings
@@ -86,8 +150,10 @@ parse_bindings() {
 monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
 menu_height=$((monitor_height * 40 / 100))
 
-dynamic_bindings | \
-  sort -u | \
-  parse_bindings | \
-  walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height"
+build_keymap_cache
 
+dynamic_bindings |
+  sort -u |
+  parse_keycodes |
+  parse_bindings |
+  walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"

bin/omarchy-notification-dismiss

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-notification-dismiss <summary>"
+  exit 1
+fi
+
+# Find the first notification whose 'summary' matches the regex in $1
+notification_id=$(makoctl list | grep -F "$1" | head -n1 | sed -E 's/^Notification ([0-9]+):.*/\1/')
+
+if [[ -n $notification_id ]]; then
+  makoctl dismiss -n $notification_id
+fi

bin/omarchy-pkg-add

@@ -1,8 +1,14 @@
 #!/bin/bash
 
+if omarchy-pkg-missing "$@"; then
+  sudo pacman -S --noconfirm --needed "$@" || exit 1
+fi
+
 for pkg in "$@"; do
+  # Secondary check to handle states where pacman doesn't actually register an error
   if ! pacman -Q "$pkg" &>/dev/null; then
-    sudo pacman -S --noconfirm "$pkg" || exit 1
+    echo -e "\033[31mError: Package '$pkg' did not install\033[0m" >&2
+    exit 1
   fi
 done
 

bin/omarchy-pkg-aur-install

@@ -2,13 +2,15 @@
 
 fzf_args=(
   --multi
-  --preview 'yay -Sii {1}'
-  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview 'yay -Siia {1}'
+  --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, alt-j/k: scroll, tab: multi-select'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
   --bind 'alt-p:toggle-preview'
   --bind 'alt-d:preview-half-page-down,alt-u:preview-half-page-up'
   --bind 'alt-k:preview-up,alt-j:preview-down'
+  --bind 'alt-b:change-preview:yay -Gpa {1} | tail -n +5'
+  --bind 'alt-B:change-preview:yay -Siia {1}'
   --color 'pointer:green,marker:green'
 )
 

bin/omarchy-pkg-install

@@ -3,7 +3,7 @@
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'
-  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
   --bind 'alt-p:toggle-preview'

bin/omarchy-pkg-remove

@@ -3,7 +3,7 @@
 fzf_args=(
   --multi
   --preview 'yay -Qi {1}'
-  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
   --bind 'alt-p:toggle-preview'

bin/omarchy-refresh-limine

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+if [[ -f /boot/EFI/linux/omarchy_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
+  echo "Cleanup extra UKI"
+  sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
+fi
+echo "Resetting limine config"
+
+sudo mv /boot/limine.conf /boot/limine.conf.bak
+
+sudo tee /boot/limine.conf <<EOF >/dev/null
+### Read more at config document: https://github.com/limine-bootloader/limine/blob/trunk/CONFIG.md
+#timeout: 3
+default_entry: 2
+interface_branding: Omarchy Bootloader
+interface_branding_color: 2
+hash_mismatch_panic: no
+
+term_background: 1a1b26
+backdrop: 1a1b26
+
+# Terminal colors (Tokyo Night palette)
+term_palette: 15161e;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;a9b1d6
+term_palette_bright: 414868;f7768e;9ece6a;e0af68;7aa2f7;bb9af7;7dcfff;c0caf5
+
+# Text colors
+term_foreground: c0caf5
+term_foreground_bright: c0caf5
+term_background_bright: 24283b
+
+EOF
+
+sudo limine-update
+sudo limine-snapper-sync

bin/omarchy-refresh-walker

@@ -1,4 +1,6 @@
 #!/bin/bash
 
 omarchy-refresh-config walker/config.toml
+omarchy-refresh-config elephant/calc.toml
+omarchy-refresh-config elephant/desktopapplications.toml
 omarchy-restart-walker

bin/omarchy-reinstall

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+if [ "$EUID" -eq 0 ]; then
+  echo "Error: This script should not be run as root"
+  exit 1
+fi
+
+echo -e "This will reinstall all the default Omarchy packages and reset all default configs.\nWarning: All changes to configs will be lost.\n"
+
+if gum confirm "Are you sure you want to reinstall and lose all config changes?"; then
+  echo "Resetting Omarchy repository"
+  git clone "https://github.com/basecamp/omarchy.git" ~/.local/share/omarchy-new >/dev/null
+  rm -rf $OMARCHY_PATH
+  mv ~/.local/share/omarchy-new $OMARCHY_PATH
+
+  echo "Reinstalling missing Omarchy packages"
+  mapfile -t packages < <(grep -v '^#' "$OMARCHY_PATH/install/omarchy-base.packages" | grep -v '^$')
+  sudo pacman -Syu --noconfirm --needed "${packages[@]}"
+
+  echo "Resetting all Omarchy configs"
+  cp -R ~/.local/share/omarchy/config/* ~/.config/
+  cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
+  echo '[[ -f ~/.bashrc ]] && . ~/.bashrc' | tee ~/.bash_profile >/dev/null
+
+  $(bash $OMARCHY_PATH/install/config/theme.sh)
+  $(bash $OMARCHY_PATH/install/config/git.sh)
+
+  omarchy-refresh-limine
+  omarchy-refresh-plymouth
+  omarchy-nvim-setup
+fi

bin/omarchy-reset-time

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Updating time..."
+sudo systemctl restart systemd-timesyncd

bin/omarchy-restart-app

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 pkill -x $1
-setsid uwsm app -- $1 >/dev/null 2>&1 &
+setsid uwsm-app -- $1 >/dev/null 2>&1 &

bin/omarchy-restart-bluetooth

@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-pipewire

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo -e "Restarting pipewire audio service...\n"
+systemctl --user restart pipewire.service

bin/omarchy-restart-walker

@@ -1,7 +1,21 @@
 #!/bin/bash
 
+pkill elephant
 pkill walker
-# FIXME: Reenable the walker service once the memory leak has been fixed
-# See https://github.com/basecamp/omarchy/issues/698
-# setsid uwsm app -- walker --gapplication-service &
-echo # Always end in success so we don't terminate further running
+
+# Detect if we're running as root (from pacman hook)
+if [[ $EUID -eq 0 ]]; then
+  # Get the owner of this script to determine which user to run as
+  SCRIPT_OWNER=$(stat -c '%U' "$0")
+  USER_UID=$(id -u "$SCRIPT_OWNER")
+
+  # Restart services as the script owner
+  systemd-run --uid="$SCRIPT_OWNER" --setenv=XDG_RUNTIME_DIR="/run/user/$USER_UID" \
+    bash -c "
+      setsid uwsm-app -- elephant &
+      setsid uwsm-app -- walker --gapplication-service &
+    "
+else
+  setsid uwsm-app -- elephant &
+  setsid uwsm-app -- walker --gapplication-service &
+fi

bin/omarchy-restart-wifi

@@ -1,4 +1,5 @@
 #!/bin/bash
 
+echo -e "Unblocking wifi...\n"
 rfkill unblock wifi
 rfkill list wifi

bin/omarchy-setup-fingerprint

@@ -20,7 +20,7 @@ print_info() {
 }
 
 check_fingerprint_hardware() {
-  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity'; then
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity|FPC'; then
     print_error "\nNo fingerprint sensor detected."
     return 1
   fi

bin/omarchy-snapshot

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 COMMAND="$1"
 OMARCHY_PATH=${OMARCHY_PATH:-$HOME/.local/share/omarchy}
 

bin/omarchy-theme-bg-next

@@ -5,13 +5,13 @@
 BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"
 
-mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
 TOTAL=${#BACKGROUNDS[@]}
 
 if [[ $TOTAL -eq 0 ]]; then
   notify-send "No background was found for theme" -t 2000
   pkill -x swaybg
-  setsid uwsm app -- swaybg --color '#000000' >/dev/null 2>&1 &
+  setsid uwsm-app -- swaybg --color '#000000' >/dev/null 2>&1 &
 else
   # Get current background from symlink
   if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
@@ -44,5 +44,5 @@ else
 
   # Relaunch swaybg
   pkill -x swaybg
-  setsid uwsm app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
+  setsid uwsm-app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
 fi

bin/omarchy-theme-set

@@ -1,10 +1,7 @@
 #!/bin/bash
 
-# omarchy-theme-set: Set a theme, specified by its name.
-# Usage: omarchy-theme-set <theme-name>
-
-if [[ -z "$1" && "$1" != "CNCLD" ]]; then
-  echo "Usage: omarchy-theme-set <theme-name>" >&2
+if [[ -z $1 && $1 != "CNCLD" ]]; then
+  echo "Usage: omarchy-theme-set <theme-name>"
   exit 1
 fi
 
@@ -16,54 +13,32 @@ THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
-  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
-  exit 2
+  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
+  exit 1
 fi
 
 # Update theme symlinks
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# Change gnome modes
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
-else
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-fi
-
-# Change gnome icon theme color
-if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then
-  gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)"
-else
-  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
-fi
-
-# Change Chromium colors
-if command -v chromium &>/dev/null; then
-  if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-    chromium --no-startup-window --set-color-scheme="light"
-  else
-    chromium --no-startup-window --set-color-scheme="dark"
-  fi
-
-  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
-    chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
-  else
-    # Use a default, neutral grey if theme doesn't have a color
-    chromium --no-startup-window --set-theme-color="28,32,39"
-  fi
-fi
-
-# Trigger alacritty config reload
-touch "$HOME/.config/alacritty/alacritty.toml"
+# Change background with theme
+omarchy-theme-bg-next
 
 # Restart components to apply new theme
-pkill -SIGUSR2 btop
-omarchy-restart-waybar
+if pgrep -x waybar >/dev/null; then
+  omarchy-restart-waybar
+fi
 omarchy-restart-swayosd
-makoctl reload
 hyprctl reload
+pkill -SIGUSR2 btop
+makoctl reload
 
-# Set new background
-omarchy-theme-bg-next
+# Change gnome, browser, vscode, cursor themes
+omarchy-theme-set-terminal
+omarchy-theme-set-gnome
+omarchy-theme-set-browser
+omarchy-theme-set-vscode
+omarchy-theme-set-cursor
+omarchy-theme-set-obsidian
+
+# Call hook on theme set
+omarchy-hook theme-set "$THEME_NAME"

bin/omarchy-theme-set-browser

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+CHROMIUM_THEME=~/.config/omarchy/current/theme/chromium.theme
+
+if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy-cmd-present brave; then
+  if [[ -f $CHROMIUM_THEME ]]; then
+    THEME_RGB_COLOR=$(<$CHROMIUM_THEME)
+    THEME_HEX_COLOR=$(printf '#%02x%02x%02x' ${THEME_RGB_COLOR//,/ })
+  else
+    # Use a default, neutral grey if theme doesn't have a color
+    THEME_RGB_COLOR="28,32,39"
+    THEME_HEX_COLOR="#1c2027"
+  fi
+
+  if omarchy-cmd-present chromium; then
+    rm -f /etc/chromium/policies/managed/color.json
+    chromium --no-startup-window --set-theme-color="$THEME_RGB_COLOR"
+
+    if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+      chromium --no-startup-window --set-color-scheme="light"
+    else
+      chromium --no-startup-window --set-color-scheme="dark"
+    fi
+  fi
+
+  if omarchy-cmd-present helium-browser; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/chromium/policies/managed/color.json" >/dev/null
+    helium-browser --no-startup-window --refresh-platform-policy
+  fi
+
+  if omarchy-cmd-present brave; then
+    echo "{\"BrowserThemeColor\": \"$THEME_HEX_COLOR\"}" | tee "/etc/brave/policies/managed/color.json" >/dev/null
+    brave --refresh-platform-policy --no-startup-window
+  fi
+fi

bin/omarchy-theme-set-cursor

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Call the VSCode theme setter with Cursor-specific parameters
+omarchy-theme-set-vscode cursor "$HOME/.config/Cursor/User/settings.json" "$HOME/.local/state/omarchy/toggles/skip-cursor-theme-changes" Cursor

bin/omarchy-theme-set-gnome

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Change gnome modes
+if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
+else
+  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
+fi
+
+# Change gnome icon theme color
+GNOME_ICONS_THEME=~/.config/omarchy/current/theme/icons.theme
+if [[ -f $GNOME_ICONS_THEME ]]; then
+  gsettings set org.gnome.desktop.interface icon-theme "$(<$GNOME_ICONS_THEME)"
+else
+  gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"
+fi

bin/omarchy-theme-set-obsidian

@@ -0,0 +1,647 @@
+#!/bin/bash
+
+# omarchy-theme-set-obsidian: Bootstrap and update Omarchy theme for Obsidian
+#
+# - Ensures registry at ~/.local/state/omarchy/obsidian-vaults
+#   - Populates by extracting vault paths from ~/.config/obsidian/obsidian.json
+# - For each valid vault:
+#   - Ensures .obsidian/themes/Omarchy/{manifest.json, theme.css}
+#   - Updates theme.css (uses current theme’s obsidian.css if present; otherwise generates -- see below)
+
+# Theme automagic generation logic:
+#
+# - Background/foreground: read from ~/.config/omarchy/current/theme/alacritty.toml [colors.primary]
+#   (background/foreground). Fallbacks: bg=#1a1b26, fg=#a9b1d6. Compute bg brightness for light/dark handling.
+# - Palette extraction: collect colors from Alacritty (primary/normal/bright/dim/selection), Waybar (@define-color),
+#   and Hyprland (col.*_border; rgba->hex). Normalize, dedupe, and count frequencies.
+# - Slot ordering: remove bg/fg, sort remaining colors by frequency, then fill 13 slots by cycling. Map slots to:
+#   h1–h6, links, inline code, marks, interactive accent, blockquote border; muted/faint use border color.
+# - Code colors: code background = closest color to bg (Euclidean RGB); if none, make a subtle bg variant (+/− RGB).
+#   code foreground = closest color to fg; fallback #e0e0e0.
+# - Border color: from btop.theme theme[div_line]; else blended mix biased toward bg (≈ (bg+fg)/3).
+# - Selection: from Alacritty [colors.selection] (background/text), honoring CellForeground/Background.
+#   If missing, background = 75% bg + 25% fg; text chosen for contrast vs selection background.
+# - Fonts: monospace from Alacritty [font] or fontconfig monospace; UI font from fontconfig sans-serif.
+
+VAULTS_FILE="$HOME/.local/state/omarchy/obsidian-vaults"
+CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"
+
+ensure_vaults_file() {
+  mkdir -p "$(dirname "$VAULTS_FILE")"
+  local tmpfile
+  tmpfile="$(mktemp)"
+  # Extract the Obsidian vault location from config file <base>/<vault>/.obsidian
+  jq -r '.vaults | values[].path' ~/.config/obsidian/obsidian.json 2>/dev/null >>"$tmpfile"
+    if [ -s "$tmpfile" ]; then
+      sort -u "$tmpfile" >"$VAULTS_FILE"
+    else
+      : >"$VAULTS_FILE"
+    fi
+    rm "$tmpfile"
+}
+
+# Ensure theme directory and minimal manifest exist in a vault
+ensure_theme_scaffold() {
+  local vault_path="$1"
+  local theme_dir="$vault_path/.obsidian/themes/Omarchy"
+  mkdir -p "$theme_dir"
+  if [ ! -f "$theme_dir/manifest.json" ]; then
+    cat >"$theme_dir/manifest.json" <<'EOF'
+{
+  "name": "Omarchy",
+  "version": "1.0.0",
+  "minAppVersion": "0.16.0",
+  "description": "Automatically syncs with your current Omarchy system theme colors and fonts",
+  "author": "Omarchy",
+  "authorUrl": "https://omarchy.org"
+}
+EOF
+  fi
+  [ -f "$theme_dir/theme.css" ] || : >"$theme_dir/theme.css"
+}
+
+# Function to extract hex color from string
+extract_hex_color() {
+  echo "$1" | grep -oE '#[0-9a-fA-F]{6}' | head -1
+}
+
+# Function to convert RGB/RGBA to hex
+rgb_to_hex() {
+  local rgb_string="$1"
+  if [[ $rgb_string =~ rgba?\(([0-9]+),\s*([0-9]+),\s*([0-9]+) ]]; then
+    printf "#%02x%02x%02x\n" "${BASH_REMATCH[1]}" "${BASH_REMATCH[2]}" "${BASH_REMATCH[3]}"
+  fi
+}
+
+# Convert hex to RGB components
+hex_to_rgb() {
+  local hex="${1#\#}"
+  printf "%d %d %d\n" "0x${hex:0:2}" "0x${hex:2:2}" "0x${hex:4:2}"
+}
+
+# Calculate perceived brightness (0-255)
+calculate_brightness() {
+  local hex="$1"
+  read -r r g b <<<"$(hex_to_rgb "$hex")"
+  # Use perceived brightness formula
+  echo $(((r * 299 + g * 587 + b * 114) / 1000))
+}
+
+# Calculate color distance (euclidean in RGB space)
+color_distance() {
+  local hex1="$1"
+  local hex2="$2"
+  read -r r1 g1 b1 <<<"$(hex_to_rgb "$hex1")"
+  read -r r2 g2 b2 <<<"$(hex_to_rgb "$hex2")"
+  echo $(((r1 - r2) * (r1 - r2) + (g1 - g2) * (g1 - g2) + (b1 - b2) * (b1 - b2)))
+}
+
+# Extract all colors with frequency count
+extract_all_colors_with_count() {
+  local -A color_counts
+  local color
+
+  # Extract from Alacritty config
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    # Primary colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -E "(background|foreground|cursor|text)" "$CURRENT_THEME_DIR/alacritty.toml" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+
+    # Normal colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.normal\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+
+    # Bright colors
+    while IFS= read -r color; do
+      # Add # if missing
+      [[ "$color" =~ ^[0-9a-fA-F]{6}$ ]] && color="#$color"
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [[ "$color" =~ ^#[0-9a-f]{6}$ ]] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.bright\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']//;s/[\"'].*//")
+
+    # Dim colors if present
+    while IFS= read -r color; do
+      # Add # if missing
+      [[ "$color" =~ ^[0-9a-fA-F]{6}$ ]] && color="#$color"
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [[ "$color" =~ ^#[0-9a-f]{6}$ ]] && ((color_counts["$color"]++))
+    done < <(grep -A 20 "\[colors.dim\]" "$CURRENT_THEME_DIR/alacritty.toml" 2>/dev/null | grep -E "(black|red|green|yellow|blue|magenta|cyan|white)" | sed "s/.*[\"']//;s/[\"'].*//")
+
+    # Selection colors
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" 2>/dev/null | grep -E "(background|text)" | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | grep "^#")
+  fi
+
+  # Extract from Waybar CSS
+  if [ -f "$CURRENT_THEME_DIR/waybar.css" ]; then
+    while IFS= read -r color; do
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -oE '@define-color [a-z_-]+ #[0-9a-fA-F]{6}' "$CURRENT_THEME_DIR/waybar.css" | grep -oE '#[0-9a-fA-F]{6}')
+  fi
+
+  # Extract from Hyprland config
+  if [ -f "$CURRENT_THEME_DIR/hyprland.conf" ]; then
+    while IFS= read -r color; do
+      if [[ $color == rgba* ]] || [[ $color == rgb* ]]; then
+        color=$(rgb_to_hex "$color")
+      fi
+      color=$(echo "$color" | tr '[:upper:]' '[:lower:]') # Lowercase for consistency
+      [ -n "$color" ] && ((color_counts["$color"]++))
+    done < <(grep -E "col\.(active|inactive)_border" "$CURRENT_THEME_DIR/hyprland.conf" | grep -oE 'rgba?\([^)]+\)|#[0-9a-fA-F]{6,8}' | sed 's/ff$//')
+  fi
+
+  # Output colors with their counts
+  for color in "${!color_counts[@]}"; do
+    echo "${color_counts[$color]} $color"
+  done
+}
+
+# Sort colors by frequency
+sort_colors_by_frequency() {
+  # Input is already "count color" format
+  sort -rn | cut -d' ' -f2
+}
+
+# Fill color slots with cycling if needed
+fill_color_slots() {
+  local -a colors=("$@")
+  local -a slots
+  local num_colors=${#colors[@]}
+
+  # Need 13 slots total (code colors are handled separately)
+  local slots_needed=13
+
+  if [ $num_colors -eq 0 ]; then
+    # No colors available, use defaults
+    colors=("#3d3d3d" "#5d5d5d" "#7d7d7d" "#9d9d9d" "#bd93f9" "#50fa7b")
+    num_colors=6
+  fi
+
+  # Fill slots, cycling if necessary
+  for ((i = 0; i < slots_needed; i++)); do
+    slots[$i]="${colors[$((i % num_colors))]}"
+  done
+
+  echo "${slots[@]}"
+}
+
+# Main color extraction and theme generation
+extract_theme_data() {
+  # Get primary colors from Alacritty
+  local bg_color="#1a1b26"
+  local fg_color="#a9b1d6"
+
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    local extracted_bg=$(grep -A 5 "\[colors.primary\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^background = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    local extracted_fg=$(grep -A 5 "\[colors.primary\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^foreground = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    [ -n "$extracted_bg" ] && bg_color="$extracted_bg"
+    [ -n "$extracted_fg" ] && fg_color="$extracted_fg"
+  fi
+
+  # Determine if light or dark theme
+  local bg_brightness=$(calculate_brightness "$bg_color")
+  local is_light_theme=false
+  [ $bg_brightness -gt 127 ] && is_light_theme=true
+
+  # Extract all colors with counts
+  local color_data=$(extract_all_colors_with_count)
+
+  # Filter out background and foreground colors for the main array
+  local filtered_data=$(echo "$color_data" | grep -v "$bg_color" | grep -v "$fg_color")
+
+  # Get all unique colors (including bg/fg) for distance calculations
+  local -a all_unique_colors
+  readarray -t all_unique_colors < <(echo "$color_data" | cut -d' ' -f2 | sort -u)
+
+  # Find the 3 closest colors to background for background variations
+  local -a bg_distances
+  for color in "${all_unique_colors[@]}"; do
+    if [ "$color" != "$bg_color" ]; then
+      distance=$(color_distance "$color" "$bg_color")
+      bg_distances+=("$distance:$color")
+    fi
+  done
+
+  # Sort by distance and get the closest color for code background
+  local -a closest_to_bg
+  readarray -t closest_to_bg < <(printf '%s\n' "${bg_distances[@]}" | sort -n | head -1 | cut -d: -f2)
+
+  # All background variations use the same as primary background
+  local bg_primary_alt="$bg_color"
+  local bg_secondary="$bg_color"
+  local bg_secondary_alt="$bg_color"
+
+  # Code block background uses the closest different color
+  local code_bg="${closest_to_bg[0]}"
+
+  # If no different color available, create a subtle variant for code blocks
+  if [ -z "$code_bg" ]; then
+    read -r r g b <<<"$(hex_to_rgb "$bg_color")"
+    if [ $bg_brightness -gt 127 ]; then
+      r=$((r - 10))
+      g=$((g - 10))
+      b=$((b - 10))
+    else
+      r=$((r + 15))
+      g=$((g + 15))
+      b=$((b + 15))
+    fi
+    [ $r -lt 0 ] && r=0
+    [ $r -gt 255 ] && r=255
+    [ $g -lt 0 ] && g=0
+    [ $g -gt 255 ] && g=255
+    [ $b -lt 0 ] && b=0
+    [ $b -gt 255 ] && b=255
+    code_bg=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+  fi
+
+  # Find closest color to foreground for code block text
+  local code_fg=""
+  min_distance=999999999
+  for color in "${all_unique_colors[@]}"; do
+    if [ "$color" != "$fg_color" ]; then
+      distance=$(color_distance "$color" "$fg_color")
+      if [ $distance -lt $min_distance ]; then
+        min_distance=$distance
+        code_fg="$color"
+      fi
+    fi
+  done
+  [ -z "$code_fg" ] && code_fg="#e0e0e0" # Fallback
+
+  # Extract text selection colors from Alacritty
+  local selection_bg=""
+  local selection_fg=""
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    selection_bg=$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^background = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+    local selection_text=$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = " | sed "s/.*[\"']0x/#/;s/.*[\"']#/#/;s/[\"'].*//;s/.*#\([0-9a-fA-F]\{6\}\).*/\#\1/" | head -1 | tr '[:upper:]' '[:lower:]')
+
+    # If text is set to CellForeground/CellBackground, use the appropriate color
+    if [ -z "$selection_text" ] || [[ "$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = ")" == *"CellForeground"* ]]; then
+      selection_fg="$fg_color"
+    elif [[ "$(grep -A 5 "\[colors.selection\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep "^text = ")" == *"CellBackground"* ]]; then
+      selection_fg="$bg_color"
+    else
+      selection_fg="$selection_text"
+    fi
+  fi
+
+  # Fallback if no selection colors found
+  if [ -z "$selection_bg" ]; then
+    read -r r1 g1 b1 <<<"$(hex_to_rgb "$bg_color")"
+    read -r r2 g2 b2 <<<"$(hex_to_rgb "$fg_color")"
+    local r=$(((r1 * 3 + r2) / 4)) # 75% background, 25% foreground
+    local g=$(((g1 * 3 + g2) / 4))
+    local b=$(((b1 * 3 + b2) / 4))
+    selection_bg=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+  fi
+
+  # Use contrasting color for selection text if not defined
+  if [ -z "$selection_fg" ]; then
+    # Calculate brightness of selection background
+    local sel_brightness=$(calculate_brightness "$selection_bg")
+    if [ $sel_brightness -gt 127 ]; then
+      selection_fg="$bg_color" # Dark text on light selection
+    else
+      selection_fg="$fg_color" # Light text on dark selection
+    fi
+  fi
+
+  # Extract border color from btop theme
+  local border_color=""
+  if [ -f "$CURRENT_THEME_DIR/btop.theme" ]; then
+    # Look for theme[div_line] in btop theme
+    local btop_divline=$(grep 'theme\[div_line\]' "$CURRENT_THEME_DIR/btop.theme" | head -1)
+
+    if [ -n "$btop_divline" ]; then
+      # Extract the color value after the = sign
+      local extracted=$(echo "$btop_divline" | sed 's/.*=//' | xargs)
+
+      # Check if it's a hex color and lowercase it
+      if [[ $extracted =~ ^#[0-9a-fA-F]{6}$ ]]; then
+        border_color=$(echo "$extracted" | tr '[:upper:]' '[:lower:]')
+      elif [[ $extracted =~ ^[0-9a-fA-F]{6}$ ]]; then
+        # Add # if missing and lowercase
+        border_color=$(echo "#$extracted" | tr '[:upper:]' '[:lower:]')
+      fi
+    fi
+  fi
+
+  # Fallback if no border color found
+  if [ -z "$border_color" ]; then
+    # Use a color between bg and fg
+    read -r r1 g1 b1 <<<"$(hex_to_rgb "$bg_color")"
+    read -r r2 g2 b2 <<<"$(hex_to_rgb "$fg_color")"
+    local r=$(((r1 + r2) / 3)) # Closer to background
+    local g=$(((g1 + g2) / 3))
+    local b=$(((b1 + b2) / 3))
+    border_color=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
+  fi
+
+  # Get unique colors array (without bg/fg) sorted by frequency
+  local -a unique_colors
+  readarray -t unique_colors < <(echo "$filtered_data" | sort_colors_by_frequency)
+
+  # Fill the 13 color slots (code colors handled separately)
+  local -a color_slots
+  readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
+
+  # Extract fonts
+  local monospace_font="CaskaydiaMono Nerd Font"
+  local ui_font="Liberation Sans"
+
+  if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
+    local alacritty_font=$(grep -A 5 "\[font\]" "$CURRENT_THEME_DIR/alacritty.toml" | grep 'family = ' | head -1 | cut -d'"' -f2)
+    [ -n "$alacritty_font" ] && monospace_font="$alacritty_font"
+  fi
+
+  if [ -f "$HOME/.config/fontconfig/fonts.conf" ]; then
+    local fontconfig_mono=$(xmlstarlet sel -t -v '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' "$HOME/.config/fontconfig/fonts.conf" 2>/dev/null || true)
+    [ -n "$fontconfig_mono" ] && monospace_font="$fontconfig_mono"
+
+    local fontconfig_sans=$(xmlstarlet sel -t -v '//match[@target="pattern"][test/string="sans-serif"]/edit[@name="family"]/string' "$HOME/.config/fontconfig/fonts.conf" 2>/dev/null || true)
+    [ -n "$fontconfig_sans" ] && ui_font="$fontconfig_sans"
+  fi
+
+  # Generate CSS with 14-slot system
+  cat <<EOF
+/* Omarchy Theme for Obsidian */
+/* Generated on $(date) from theme: $(basename "$(readlink "$CURRENT_THEME_DIR" 2>/dev/null || echo "unknown")") */
+/* Colors sorted by frequency, backgrounds by distance */
+
+.theme-dark, .theme-light {
+  /* Core colors */
+  --background-primary: $bg_color;
+  --text-normal: $fg_color;
+
+  /* Background variations (always distance-based) */
+  --background-primary-alt: $bg_primary_alt;
+  --background-secondary: $bg_secondary;
+  --background-secondary-alt: $bg_secondary_alt;
+
+  /* Code block colors (always distance-based) */
+  --code-background: $code_bg;
+  --code-foreground: $code_fg;
+
+  /* Border color from btop theme */
+  --border-color: $border_color;
+
+  /* Selection colors from Alacritty */
+  --text-selection: $selection_bg;
+  --text-selection-fg: $selection_fg;
+
+  /* 13-slot color system for remaining elements */
+  --text-title-h1: ${color_slots[0]};
+  --text-title-h2: ${color_slots[1]};
+  --text-title-h3: ${color_slots[2]};
+  --text-title-h4: ${color_slots[3]};
+  --text-title-h5: ${color_slots[4]};
+  --text-title-h6: ${color_slots[4]};  /* Same as h5 */
+  --text-link: ${color_slots[5]};
+  --markup-code: ${color_slots[6]};
+  --text-mark: ${color_slots[7]};
+  --interactive-accent: ${color_slots[8]};
+  --blockquote-border: ${color_slots[9]};
+  --text-muted: $border_color;  /* Use border color for muted text */
+  --text-faint: $border_color;  /* Use border color for faint text */
+
+  /* Additional mappings */
+  --text-accent: var(--interactive-accent);
+  --text-accent-hover: var(--interactive-accent);
+  --text-error: var(--text-title-h1);
+  --text-error-hover: var(--text-title-h1);
+  --text-highlight-bg: $fg_color;  /* Use text color as highlight background */
+  --text-on-accent: $bg_color;
+
+  --interactive-normal: var(--code-background);
+  --interactive-hover: var(--interactive-accent);
+  --interactive-accent-hover: var(--interactive-accent);
+  --interactive-success: var(--text-title-h2);
+
+  --scrollbar-bg: var(--background-primary);
+  --scrollbar-thumb-bg: var(--code-background);
+  --scrollbar-active-thumb-bg: var(--interactive-accent);
+
+  --background-modifier-border: var(--border-color);
+  --background-modifier-form-field: var(--code-background);
+  --background-modifier-form-field-highlighted: var(--code-background);
+  --background-modifier-box-shadow: rgba(0, 0, 0, 0.3);
+  --background-modifier-success: var(--interactive-success);
+  --background-modifier-error: var(--text-error);
+  --background-modifier-error-hover: var(--text-error);
+  --background-modifier-cover: rgba(0, 0, 0, 0.8);
+
+  --link-color: var(--text-link);
+  --link-color-hover: var(--text-link);
+  --link-unresolved-color: var(--text-muted);
+  --link-unresolved-opacity: 0.7;
+
+  --tag-color: var(--text-title-h3);
+  --tag-background: var(--code-background);
+
+  --graph-line: var(--text-muted);
+  --graph-node: var(--interactive-accent);
+  --graph-node-unresolved: var(--text-muted);
+  --graph-node-focused: var(--text-link);
+  --graph-node-tag: var(--text-title-h3);
+  --graph-node-attachment: var(--text-title-h2);
+
+  /* Fonts */
+  --font-interface-theme: "$ui_font";
+  --font-text-theme: "$ui_font";
+  --font-monospace-theme: "$monospace_font";
+}
+
+/* Headers */
+.cm-header-1, .markdown-rendered h1 { color: var(--text-title-h1); }
+.cm-header-2, .markdown-rendered h2 { color: var(--text-title-h2); }
+.cm-header-3, .markdown-rendered h3 { color: var(--text-title-h3); }
+.cm-header-4, .markdown-rendered h4 { color: var(--text-title-h4); }
+.cm-header-5, .markdown-rendered h5 { color: var(--text-title-h5); }
+.cm-header-6, .markdown-rendered h6 { color: var(--text-title-h6); }
+
+/* Code blocks */
+.markdown-rendered code {
+  font-family: var(--font-monospace-theme);
+  background-color: var(--code-background);
+  color: var(--markup-code);
+  padding: 2px 4px;
+  border-radius: 3px;
+}
+
+.markdown-rendered pre {
+  background-color: var(--code-background);
+  border: 1px solid var(--background-modifier-border);
+  border-radius: 5px;
+}
+
+.markdown-rendered pre code {
+  background-color: transparent;
+  color: var(--code-foreground);
+}
+
+/* Syntax highlighting */
+.cm-s-obsidian span.cm-keyword { color: var(--text-title-h1); }
+.cm-s-obsidian span.cm-string { color: var(--text-title-h2); }
+.cm-s-obsidian span.cm-number { color: var(--text-title-h3); }
+.cm-s-obsidian span.cm-comment { color: var(--text-muted); }
+.cm-s-obsidian span.cm-operator { color: var(--text-link); }
+.cm-s-obsidian span.cm-variable { color: var(--text-normal); }
+.cm-s-obsidian span.cm-def { color: var(--text-link); }
+
+/* Highlighted text */
+.markdown-rendered mark,
+.cm-s-obsidian span.cm-highlight,
+mark {
+  background-color: var(--text-highlight-bg) !important;
+  color: var(--code-background) !important;
+}
+
+/* Links */
+.markdown-rendered a {
+  color: var(--text-link);
+}
+
+/* Blockquotes */
+.markdown-rendered blockquote {
+  border-left: 4px solid var(--blockquote-border);
+  padding-left: 1em;
+}
+
+/* Status bar */
+.status-bar {
+  background-color: var(--code-background);
+  border-top: 1px solid var(--background-modifier-border);
+}
+
+/* Active file */
+.workspace-leaf.mod-active .workspace-leaf-header-title {
+  color: var(--interactive-accent);
+}
+
+.nav-file-title.is-active {
+  background-color: var(--code-background);
+  color: var(--interactive-accent);
+}
+
+/* Text selection */
+::selection {
+  background-color: var(--text-selection);
+  color: var(--text-selection-fg);
+}
+
+/* Search results */
+.search-result-file-title {
+  color: var(--interactive-accent);
+}
+
+.search-result-file-match {
+  background-color: var(--code-background);
+  color: var(--text-normal);
+  border-left: 3px solid var(--interactive-accent);
+}
+
+.search-result-file-matched-text {
+  color: var(--code-background);
+}
+
+/* Tables */
+.markdown-rendered table {
+  border: 1px solid var(--background-modifier-border);
+}
+
+.markdown-rendered th {
+  background-color: var(--code-background);
+  color: var(--text-accent);
+}
+
+.markdown-rendered td {
+  border: 1px solid var(--background-modifier-border);
+}
+
+/* Callouts */
+.callout {
+  border-left: 4px solid var(--interactive-accent);
+  background-color: var(--code-background);
+}
+.callout * {
+  color: var(--text-normal);
+}
+
+/* Modal dialogs */
+.modal {
+  background-color: var(--background-primary);
+  border: 2px solid var(--background-modifier-border);
+}
+
+/* Settings */
+.vertical-tab-header-group-title {
+  color: var(--interactive-accent);
+}
+
+.vertical-tab-nav-item.is-active {
+  background-color: var(--code-background);
+  color: var(--interactive-accent);
+}
+EOF
+}
+
+# Option handling
+if [ "${1:-}" = "--reset" ]; then
+  echo "♻️  Resetting Omarchy themes and registry..."
+  if [ -f "$VAULTS_FILE" ] && [ -s "$VAULTS_FILE" ]; then
+    while IFS= read -r vault_path || [ -n "$vault_path" ]; do
+      case "$vault_path" in ""|\#*) continue ;; esac
+      vault_path="${vault_path%/}"
+      vault_name=$(basename "$vault_path")
+      theme_dir="$vault_path/.obsidian/themes/Omarchy"
+      if [ -d "$theme_dir" ]; then
+        rm -rf "$theme_dir"
+        echo "   ✅ $vault_name (theme removed)"
+      else
+        echo "   ℹ️  $vault_name (no theme present)"
+      fi
+    done <"$VAULTS_FILE"
+  fi
+  rm -f "$VAULTS_FILE"
+  echo "✅ Registry removed"
+  exit 0
+fi
+
+# Main update logic
+echo "🔄 Updating Obsidian vaults..."
+
+# Step 1: ensure registry exists (bootstrap if needed)
+ensure_vaults_file
+
+while IFS= read -r vault_path || [ -n "$vault_path" ]; do
+  case "$vault_path" in "" | \#*) continue ;; esac
+  vault_path="${vault_path%/}"
+  vault_name=$(basename "$vault_path")
+
+  # Step 2: verify path exists; log/skip gracefully if invalid
+  if [ ! -d "$vault_path" ] || [ ! -d "$vault_path/.obsidian" ]; then
+    echo "   ❌ $vault_name (invalid entry: missing directory or .obsidian)"
+    continue
+  fi
+
+  # Ensure theme files exist for this vault
+  ensure_theme_scaffold "$vault_path"
+  THEME_DIR="$vault_path/.obsidian/themes/Omarchy"
+
+  # Step 3: update theme.css
+  if [ -f "$CURRENT_THEME_DIR/obsidian.css" ]; then
+    cp "$CURRENT_THEME_DIR/obsidian.css" "$THEME_DIR/theme.css"
+    echo "   ✅ $vault_name (custom theme)"
+  else
+    extract_theme_data >"$THEME_DIR/theme.css"
+    echo "   ✅ $vault_name (generated theme)"
+  fi
+done <"$VAULTS_FILE"

bin/omarchy-theme-set-terminal

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+  touch ~/.config/alacritty/alacritty.toml
+fi
+
+killall -SIGUSR1 kitty
+killall -SIGUSR2 ghostty

bin/omarchy-theme-set-vscode

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Note: We cannot use `jq` to update settings.json because it’s JSONC (allows comments),
+# which jq doesn’t support.
+
+# Parameters: EDITOR_CMD SETTINGS_PATH SKIP_FLAG EDITOR_NAME
+EDITOR_CMD="${1:-code}"
+SETTINGS_PATH="${2:-$HOME/.config/Code/User/settings.json}"
+SKIP_FLAG="${3:-$HOME/.local/state/omarchy/toggles/skip-vscode-theme-changes}"
+EDITOR_NAME="${4:-VS Code}"
+
+VS_CODE_THEME="$HOME/.config/omarchy/current/theme/vscode.json"
+
+if omarchy-cmd-present "$EDITOR_CMD" && [[ ! -f "$SKIP_FLAG" ]]; then
+  if [[ -f "$VS_CODE_THEME" ]]; then
+    theme_name=$(jq -r '.name' "$VS_CODE_THEME")
+    extension=$(jq -r '.extension' "$VS_CODE_THEME")
+
+    # Install $EDITOR_NAME theme extension
+    if [[ -n "$extension" ]] && ! "$EDITOR_CMD" --list-extensions | grep -Fxq "$extension"; then
+      "$EDITOR_CMD" --install-extension "$extension" >/dev/null
+    fi
+
+    # Create config file if there isn't already one
+    mkdir -p "$(dirname "$SETTINGS_PATH")"
+    if [[ ! -f "$SETTINGS_PATH" ]]; then
+      printf '{\n}\n' >"$SETTINGS_PATH"
+    fi
+
+    # Create a `workbench.colorTheme` entry in settings.
+    if ! grep -q '"workbench.colorTheme"' "$SETTINGS_PATH"; then
+      # Insert `"workbench.colorTheme": "",` immediately after the first `{`
+      # Use sed's first-match range (0,/{/) to only replace the first `{`
+      sed -i --follow-symlinks -E '0,/\{/{s/\{/{\ "workbench.colorTheme": "",/}' "$SETTINGS_PATH"
+    fi
+
+    # Update theme
+    sed -i --follow-symlinks -E \
+      "s/(\"workbench.colorTheme\"[[:space:]]*:[[:space:]]*\")[^\"]*(\")/\1$theme_name\2/" \
+      "$SETTINGS_PATH"
+  else
+    # Remove theme from settings.json when the theme doesn't have $EDITOR_NAME support
+    if [[ -f "$SETTINGS_PATH" ]]; then
+      sed -i --follow-symlinks -E 's/\"workbench\.colorTheme\"[[:space:]]*:[^,}]*,?//' "$SETTINGS_PATH"
+    fi
+  fi
+fi

bin/omarchy-theme-update

@@ -1,5 +1,8 @@
 #!/bin/bash
 
 for dir in ~/.config/omarchy/themes/*/; do
-  [ -d "$dir" ] && [ ! -L "${dir%/}" ] && echo "Updating: $(basename "$dir")" && git -C "$dir" pull
+  if [[ -d $dir ]] && [[ ! -L "${dir%/}" ]] && [[ -d "$dir/.git" ]]; then
+    echo "Updating: $(basename "$dir")"
+    git -C "$dir" pull
+  fi
 done

bin/omarchy-toggle-idle

@@ -4,6 +4,6 @@ if pgrep -x hypridle >/dev/null; then
   pkill -x hypridle
   notify-send "Stop locking computer when idle"
 else
-  uwsm app -- hypridle >/dev/null 2>&1 &
+  uwsm-app -- hypridle >/dev/null 2>&1 &
   notify-send "Now locking computer when idle"
 fi

bin/omarchy-toggle-nightlight

@@ -6,7 +6,7 @@ OFF_TEMP=6000
 
 # Ensure hyprsunset is running
 if ! pgrep -x hyprsunset; then
-  setsid uwsm app -- hyprsunset &
+  setsid uwsm-app -- hyprsunset &
   sleep 1 # Give it time to register
 fi
 

bin/omarchy-toggle-waybar

@@ -3,5 +3,5 @@
 if pgrep -x waybar >/dev/null; then
   pkill -x waybar
 else
-  uwsm app -- waybar >/dev/null 2>&1 &
+  uwsm-app -- waybar >/dev/null 2>&1 &
 fi

bin/omarchy-tui-install

@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=alacritty --class $APP_CLASS -e $APP_EXEC
+Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-tui-remove

@@ -6,7 +6,7 @@ DESKTOP_DIR="$HOME/.local/share/applications/"
 if [ "$#" -eq 0 ]; then
   # Find all TUIs
   while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*alacritty.*-e' "$file"; then
+    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-tz-select

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+timezone=$(timedatectl list-timezones | gum filter --height 20 --header "Set timezone") || exit 1
+sudo timedatectl set-timezone "$timezone"
+echo "Timezone is now set to $timezone"
+omarchy-restart-waybar

bin/omarchy-update

@@ -2,9 +2,8 @@
 
 set -e
 
+trap 'echo ""; echo -e "\033[0;31mSomething went wrong during the update!\n\nPlease review the output above carefully, correct the error, and retry the update.\n\nIf you need assistance, get help from the community at https://omarchy.org/discord\033[0m"' ERR
+
 omarchy-snapshot create || [ $? -eq 127 ]
 omarchy-update-git
-omarchy-migrate
-omarchy-update-system-pkgs
-omarchy-update-restart
-omarchy-update-available-reset
+omarchy-update-perform

bin/omarchy-update-available-reset

@@ -2,3 +2,4 @@
 
 # Ensure Waybar icon offering the available update is removed
 pkill -RTMIN+7 waybar
+exit 0

bin/omarchy-update-branch

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -e
+
+if (($# == 0)); then
+  echo "Usage: omarchy-update-branch [master|dev]"
+  exit 1
+fi
+
+branch="$1"
+
+# Snapshot before switching branch
+omarchy-snapshot create || [ $? -eq 127 ]
+
+if ! git -C "$OMARCHY_PATH" diff --quiet || ! git -C "$OMARCHY_PATH" diff --cached --quiet; then
+  stashed=true
+  git -C "$OMARCHY_PATH" stash push -u -m "Autostash before switching to $branch"
+else
+  stashed=false
+fi
+
+# Switch branches
+git -C "$OMARCHY_PATH" switch "$branch"
+
+# Reapply stash if we made one
+if [[ $stashed == true ]]; then
+  if ! git -C "$OMARCHY_PATH" stash pop; then
+    echo "⚠️ Conflicts when applying stash — stash kept"
+  fi
+fi
+
+# Update the system from the new branch
+omarchy-update-perform

bin/omarchy-update-firmware

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+echo -e "\e[32mUpdate Firmware\e[0m"
+
+if omarchy-cmd-missing fwupdmgr; then
+  omarchy-pkg-add fwupd
+fi
+
+fwupdmgr refresh
+sudo fwupdmgr update

bin/omarchy-update-git

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo -e "\e[32mUpdate Omarchy\e[0m"
 
 git -C $OMARCHY_PATH pull --autostash

bin/omarchy-update-perform

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+omarchy-update-available-reset
+omarchy-update-system-pkgs
+omarchy-migrate
+omarchy-hook post-update
+omarchy-update-restart

bin/omarchy-update-restart

@@ -5,9 +5,6 @@ if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $
 
 elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then
   gum confirm "Updates require reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
-
-elif [ -f "$HOME/.local/state/omarchy/relaunch-required" ]; then
-  gum confirm "Updates require Hyprland relaunch. Ready?" && omarchy-state clear re*-required && uwsm stop
 fi
 
 for file in "$HOME"/.local/state/omarchy/restart-*-required; do

bin/omarchy-update-system-pkgs

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # Used in package emergencies if a bad package has been pushed and we can't revoke.
 # Requires manually installing the good package using sudo pacman -U <url>
 ignored_packages=$(omarchy-pkg-ignored)
@@ -21,7 +23,7 @@ if pacman -Qem >/dev/null; then
   fi
 fi
 
-orphans=$(pacman -Qtdq)
+orphans=$(pacman -Qtdq || true)
 if [[ -n $orphans ]]; then
   echo -e "\e[32m\nRemove orphan system packages\e[0m"
   for pkg in $orphans; do

bin/omarchy-version

@@ -1,3 +1,2 @@
 #!/bin/bash
-
-git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1)
+cat $OMARCHY_PATH/version

bin/omarchy-webapp-handler-hey

@@ -0,0 +1,11 @@
+#!/bin/bash
+url="$1"
+web_url="https://app.hey.com"
+
+# Handle mailto: URLs
+if [[ $url =~ ^mailto: ]]; then
+  email=$(echo "$url" | sed 's/mailto://')
+  web_url="https://app.hey.com/messages/new?to=$email"
+fi
+
+exec omarchy-launch-webapp "$web_url"

bin/omarchy-webapp-handler-zoom

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+url="$1"
+web_url="https://app.zoom.us/wc/home"
+
+if [[ $url =~ ^zoom(mtg|us):// ]]; then
+  confno=$(echo "$url" | sed -n 's/.*[?&]confno=\([^&]*\).*/\1/p')
+
+  if [[ -n $confno ]]; then
+    pwd=$(echo "$url" | sed -n 's/.*[?&]pwd=\([^&]*\).*/\1/p')
+
+    if [[ -n $pwd ]]; then
+      web_url="https://app.zoom.us/wc/join/$confno?pwd=$pwd"
+    else
+      web_url="https://app.zoom.us/wc/join/$confno"
+    fi
+  fi
+fi
+
+exec omarchy-launch-webapp "$web_url"

bin/omarchy-webapp-install

@@ -1,49 +1,71 @@
 #!/bin/bash
 
-if [ "$#" -ne 3 ]; then
+if [ "$#" -lt 3 ]; then
   echo -e "\e[32mLet's create a new web app you can start with the app launcher.\n\e[0m"
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My favorite web app")
   APP_URL=$(gum input --prompt "URL> " --placeholder "https://example.com")
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
+  ICON_REF=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
+  CUSTOM_EXEC=""
+  MIME_TYPES=""
+  INTERACTIVE_MODE=true
 else
   APP_NAME="$1"
   APP_URL="$2"
-  ICON_URL="$3"
+  ICON_REF="$3"
+  CUSTOM_EXEC="$4" # Optional custom exec command
+  MIME_TYPES="$5"  # Optional mime types
+  INTERACTIVE_MODE=false
 fi
 
-if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_URL" ]]; then
+# Ensure valid execution
+if [[ -z "$APP_NAME" || -z "$APP_URL" || -z "$ICON_REF" ]]; then
   echo "You must set app name, app URL, and icon URL!"
   exit 1
 fi
 
+# Refer to local icon or fetch remotely from URL
 ICON_DIR="$HOME/.local/share/applications/icons"
-DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-
-if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
-  ICON_PATH="$ICON_URL"
-else
+if [[ $ICON_REF =~ ^https?:// ]]; then
   ICON_PATH="$ICON_DIR/$APP_NAME.png"
-  mkdir -p "$ICON_DIR"
-  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+  if curl -sL -o "$ICON_PATH" "$ICON_REF"; then
+    ICON_PATH="$ICON_DIR/$APP_NAME.png"
+  else
     echo "Error: Failed to download icon."
     exit 1
   fi
+else
+  ICON_PATH="$ICON_DIR/$ICON_REF"
 fi
 
+# Use custom exec if provided, otherwise default behavior
+if [[ -n $CUSTOM_EXEC ]]; then
+  EXEC_COMMAND="$CUSTOM_EXEC"
+else
+  EXEC_COMMAND="omarchy-launch-webapp $APP_URL"
+fi
+
+# Create application .desktop file
+DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
+
 cat >"$DESKTOP_FILE" <<EOF
 [Desktop Entry]
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=omarchy-launch-webapp $APP_URL
+Exec=$EXEC_COMMAND
 Terminal=false
 Type=Application
 Icon=$ICON_PATH
 StartupNotify=true
 EOF
 
+# Add mime types if provided
+if [[ -n $MIME_TYPES ]]; then
+  echo "MimeType=$MIME_TYPES" >>"$DESKTOP_FILE"
+fi
+
 chmod +x "$DESKTOP_FILE"
 
-if [ "$#" -ne 3 ]; then
+if [[ $INTERACTIVE_MODE == true ]]; then
   echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
 fi

bin/omarchy-webapp-remove

@@ -6,7 +6,7 @@ DESKTOP_DIR="$HOME/.local/share/applications/"
 if [ "$#" -eq 0 ]; then
   # Find all web apps
   while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*omarchy-launch-webapp.*' "$file"; then
+    if grep -q '^Exec=.*\(omarchy-launch-webapp\|omarchy-webapp-handler\).*' "$file"; then
       WEB_APPS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-windows-vm

@@ -0,0 +1,445 @@
+#!/bin/bash
+COMPOSE_FILE="$HOME/.config/windows/docker-compose.yml"
+
+check_prerequisites() {
+  local DISK_SIZE_GB=${1:-64}
+  local REQUIRED_SPACE=$((DISK_SIZE_GB + 10))  # Add 10GB for Windows ISO and overhead
+
+  # Check for KVM support
+  if [ ! -e /dev/kvm ]; then
+    gum style \
+      --border normal \
+      --padding "1 2" \
+      --margin "1" \
+      "❌ KVM virtualization not available!" \
+      "" \
+      "Please enable virtualization in BIOS or run:" \
+      "  sudo modprobe kvm-intel  # for Intel CPUs" \
+      "  sudo modprobe kvm-amd    # for AMD CPUs"
+    exit 1
+  fi
+
+  # Check disk space
+  AVAILABLE_SPACE=$(df "$HOME" | awk 'NR==2 {print int($4/1024/1024)}')
+  if [ "$AVAILABLE_SPACE" -lt "$REQUIRED_SPACE" ]; then
+    echo "❌ Insufficient disk space!"
+    echo "   Available: ${AVAILABLE_SPACE}GB"
+    echo "   Required: ${REQUIRED_SPACE}GB (${DISK_SIZE_GB}GB disk + 10GB for Windows image)"
+    exit 1
+  fi
+}
+
+install_windows() {
+  # Set up trap to handle Ctrl+C
+  trap "echo ''; echo 'Installation cancelled by user'; exit 1" INT
+
+  check_prerequisites
+
+  omarchy-pkg-add freerdp openbsd-netcat gum
+
+  mkdir -p "$HOME/.windows"
+  mkdir -p "$HOME/.config/windows"
+  mkdir -p "$HOME/.local/share/applications/icons"
+
+  # Install Windows VM icon and desktop file
+  if [ -f "$OMARCHY_PATH/applications/icons/windows.png" ]; then
+    cp "$OMARCHY_PATH/applications/icons/windows.png" "$HOME/.local/share/applications/icons/windows.png"
+  fi
+
+  cat << EOF | tee "$HOME/.local/share/applications/windows-vm.desktop" > /dev/null
+[Desktop Entry]
+Name=Windows
+Comment=Start Windows VM via Docker and connect with RDP
+Exec=uwsm app -- omarchy-windows-vm launch
+Icon=$HOME/.local/share/applications/icons/windows.png
+Terminal=false
+Type=Application
+Categories=System;Virtualization;
+EOF
+
+  # Get system resources
+  TOTAL_RAM=$(free -h | awk 'NR==2 {print $2}')
+  TOTAL_RAM_GB=$(awk 'NR==1 {printf "%d", $2/1024/1024}' /proc/meminfo)
+  TOTAL_CORES=$(nproc)
+
+  echo ""
+  echo "System Resources Detected:"
+  echo "  Total RAM: $TOTAL_RAM"
+  echo "  Total CPU Cores: $TOTAL_CORES"
+  echo ""
+
+  RAM_OPTIONS=""
+  for size in 2 4 8 16 32 64; do
+    if [ $size -le $TOTAL_RAM_GB ]; then
+      RAM_OPTIONS="$RAM_OPTIONS ${size}G"
+    fi
+  done
+
+  SELECTED_RAM=$(echo $RAM_OPTIONS | tr ' ' '\n' | gum choose --selected="4G" --header="How much RAM would you like to allocate to Windows VM?")
+
+  # Check if user cancelled
+  if [ -z "$SELECTED_RAM" ]; then
+    echo "Installation cancelled by user"
+    exit 1
+  fi
+
+  SELECTED_CORES=$(gum input --placeholder="Number of CPU cores (1-$TOTAL_CORES)" --value="2" --header="How many CPU cores would you like to allocate to Windows VM?" --char-limit=2)
+
+  # Check if user cancelled (Ctrl+C in gum input returns empty string)
+  if [ -z "$SELECTED_CORES" ]; then
+    echo "Installation cancelled by user"
+    exit 1
+  fi
+
+  if ! [[ "$SELECTED_CORES" =~ ^[0-9]+$ ]] || [ "$SELECTED_CORES" -lt 1 ] || [ "$SELECTED_CORES" -gt "$TOTAL_CORES" ]; then
+    echo "Invalid input. Using default: 2 cores"
+    SELECTED_CORES=2
+  fi
+
+  AVAILABLE_SPACE=$(df "$HOME" | awk 'NR==2 {print int($4/1024/1024)}')
+  MAX_DISK_GB=$((AVAILABLE_SPACE - 10))  # Leave 10GB for Windows image
+
+  # Check if we have enough space for minimum
+  if [ $MAX_DISK_GB -lt 32 ]; then
+    echo "❌ Insufficient disk space for Windows VM!"
+    echo "   Available: ${AVAILABLE_SPACE}GB"
+    echo "   Minimum required: 42GB (32GB disk + 10GB for Windows image)"
+    exit 1
+  fi
+
+  DISK_OPTIONS=""
+  for size in 32 64 128 256 512; do
+    if [ $size -le $MAX_DISK_GB ]; then
+      DISK_OPTIONS="$DISK_OPTIONS ${size}G"
+    fi
+  done
+
+  # Default to 64G if available, otherwise 32G
+  DEFAULT_DISK="64G"
+  if ! echo "$DISK_OPTIONS" | grep -q "64G"; then
+    DEFAULT_DISK="32G"
+  fi
+
+  SELECTED_DISK=$(echo $DISK_OPTIONS | tr ' ' '\n' | gum choose --selected="$DEFAULT_DISK" --header="How much disk space would you like to give Windows VM? (64GB+ recommended)")
+
+  # Check if user cancelled
+  if [ -z "$SELECTED_DISK" ]; then
+    echo "Installation cancelled by user"
+    exit 1
+  fi
+
+  # Extract just the number for prerequisite check
+  DISK_SIZE_NUM=$(echo "$SELECTED_DISK" | sed 's/G//')
+
+  # Re-check prerequisites with selected disk size
+  check_prerequisites "$DISK_SIZE_NUM"
+
+  # Prompt for username and password
+  USERNAME=$(gum input --placeholder="Username (Press enter to use default: docker)" --header="Enter Windows username:")
+  if [ -z "$USERNAME" ]; then
+    USERNAME="docker"
+  fi
+
+  PASSWORD=$(gum input --placeholder="Password (Press enter to use default: admin)" --password --header="Enter Windows password:")
+  if [ -z "$PASSWORD" ]; then
+    PASSWORD="admin"
+    PASSWORD_DISPLAY="(default)"
+  else
+    PASSWORD_DISPLAY="(user-defined)"
+  fi
+
+  # Display configuration summary
+  gum style \
+    --border normal \
+    --padding "1 2" \
+    --margin "1" \
+    --align left \
+    --bold \
+    "Windows VM Configuration" \
+    "" \
+    "RAM:       $SELECTED_RAM" \
+    "CPU:       $SELECTED_CORES cores" \
+    "Disk:      $SELECTED_DISK" \
+    "Username:  $USERNAME" \
+    "Password:  $PASSWORD_DISPLAY"
+
+  # Ask for confirmation
+  echo ""
+  if ! gum confirm "Proceed with this configuration?"; then
+    echo "Installation cancelled by user"
+    exit 1
+  fi
+
+  mkdir -p $HOME/Windows
+
+  # Create docker-compose.yml in user config directory
+  cat << EOF | tee "$COMPOSE_FILE" > /dev/null
+services:
+  windows:
+    image: dockurr/windows
+    container_name: omarchy-windows
+    environment:
+      VERSION: "11"
+      RAM_SIZE: "$SELECTED_RAM"
+      CPU_CORES: "$SELECTED_CORES"
+      DISK_SIZE: "$SELECTED_DISK"
+      USERNAME: "$USERNAME"
+      PASSWORD: "$PASSWORD"
+    devices:
+      - /dev/kvm
+      - /dev/net/tun
+    cap_add:
+      - NET_ADMIN
+    ports:
+      - 8006:8006
+      - 3389:3389/tcp
+      - 3389:3389/udp
+    volumes:
+      - $HOME/.windows:/storage
+      - $HOME/Windows:/shared
+    restart: always
+    stop_grace_period: 2m
+EOF
+
+  echo ""
+  echo "Starting Windows VM installation..."
+  echo "This will download a Windows 11 image (may take 10-15 minutes)."
+  echo ""
+  echo "Monitor installation progress at: http://127.0.0.1:8006"
+  echo ""
+
+  # Start docker-compose with user's config
+  echo "Starting Windows VM with docker-compose..."
+  if ! docker-compose -f "$COMPOSE_FILE" up -d 2>&1; then
+    echo "❌ Failed to start Windows VM!"
+    echo "   Common issues:"
+    echo "   - Docker daemon not running: sudo systemctl start docker"
+    echo "   - Port already in use: check if another VM is running"
+    echo "   - Permission issues: make sure you're in the docker group"
+    exit 1
+  fi
+
+  echo ""
+  echo "Windows VM is starting up!"
+  echo ""
+  echo "Opening browser to monitor installation..."
+
+  # Open browser to monitor installation
+  sleep 3
+  xdg-open "http://127.0.0.1:8006"
+
+  echo ""
+  echo "Installation is running in the background."
+  echo "You can monitor progress at: http://127.0.0.1:8006"
+  echo ""
+  echo "Once finished, launch 'Windows' via Super + Space"
+  echo ""
+  echo "To stop the VM: omarchy-windows-vm stop"
+  echo "To change resources: ~/.config/windows/docker-compose.yml"
+  echo ""
+}
+
+remove_windows() {
+  echo "Removing Windows VM..."
+
+  docker-compose -f "$COMPOSE_FILE" down 2>/dev/null || true
+
+  docker rmi dockurr/windows 2>/dev/null || echo "Image already removed or not found"
+
+  rm "$HOME/.local/share/applications/windows-vm.desktop"
+  rm -rf "$HOME/.config/windows"
+  rm -rf "$HOME/.windows"
+
+  echo ""
+  echo "Windows VM removal completed!"
+}
+
+launch_windows() {
+  KEEP_ALIVE=false
+  if [ "$1" = "--keep-alive" ] || [ "$1" = "-k" ]; then
+    KEEP_ALIVE=true
+  fi
+
+  # Check if config exists
+  if [ ! -f "$COMPOSE_FILE" ]; then
+    echo "Windows VM not configured. Please run: omarchy-windows-vm install"
+    exit 1
+  fi
+
+  # Check if container is already running
+  CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' omarchy-windows 2>/dev/null)
+
+  if [ "$CONTAINER_STATUS" != "running" ]; then
+    echo "Starting Windows VM..."
+
+    # Send desktop notification
+    notify-send "    Starting Windows VM" "      This can take 15-30 seconds" -t 15000
+
+    if ! docker-compose -f "$COMPOSE_FILE" up -d 2>&1; then
+      echo "❌ Failed to start Windows VM!"
+      echo "   Try checking: omarchy-windows-vm status"
+      echo "   View logs: docker logs omarchy-windows"
+      notify-send -u critical "Windows VM" "Failed to start Windows VM"
+      exit 1
+    fi
+
+    # Wait for RDP to be ready
+    echo "Waiting for Windows VM to be ready..."
+    WAIT_COUNT=0
+    while ! nc -z 127.0.0.1 3389 2>/dev/null; do
+      sleep 2
+      WAIT_COUNT=$((WAIT_COUNT + 1))
+      if [ $WAIT_COUNT -gt 60 ]; then  # 2 minutes timeout
+        echo "❌ Timeout waiting for RDP!"
+        echo "   The VM might still be installing Windows."
+        echo "   Check progress at: http://127.0.0.1:8006"
+        exit 1
+      fi
+    done
+
+    # Give it a moment more to fully initialize
+    sleep 5
+  fi
+
+  # Extract credentials from compose file
+  WIN_USER=$(grep "USERNAME:" "$COMPOSE_FILE" | sed 's/.*USERNAME: "\(.*\)"/\1/')
+  WIN_PASS=$(grep "PASSWORD:" "$COMPOSE_FILE" | sed 's/.*PASSWORD: "\(.*\)"/\1/')
+
+  # Use defaults if not found
+  [ -z "$WIN_USER" ] && WIN_USER="docker"
+  [ -z "$WIN_PASS" ] && WIN_PASS="admin"
+
+  # Build the connection info
+  if [ "$KEEP_ALIVE" = true ]; then
+    LIFECYCLE="VM will keep running after RDP closes
+To stop: omarchy-windows-vm stop"
+  else
+    LIFECYCLE="VM will auto-stop when RDP closes"
+  fi
+
+  gum style \
+    --border normal \
+    --padding "1 2" \
+    --margin "1" \
+    --align center \
+    "Connecting to Windows VM" \
+    "" \
+    "$LIFECYCLE"
+
+  # Detect display scale from Hyprland
+  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[0].scale')
+  SCALE_PERCENT=$(echo "$HYPR_SCALE" | awk '{print int($1 * 100)}')
+
+  RDP_SCALE=""
+  if [ "$SCALE_PERCENT" -ge 170 ]; then
+    RDP_SCALE="/scale:180"
+  elif [ "$SCALE_PERCENT" -ge 130 ]; then
+    RDP_SCALE="/scale:140"
+  fi
+  # If scale is less than 130%, don't set any scale (use default 100)
+
+  # Connect with RDP in fullscreen (auto-detects resolution)
+  xfreerdp3 /u:"$WIN_USER" /p:"$WIN_PASS" /v:127.0.0.1:3389 -grab-keyboard /sound /microphone /cert:ignore /title:"Windows VM - Omarchy" /dynamic-resolution /gfx:AVC444 /floatbar:sticky:off,default:visible,show:fullscreen $RDP_SCALE
+
+  # After RDP closes, stop the container unless --keep-alive was specified
+  if [ "$KEEP_ALIVE" = false ]; then
+    echo ""
+    echo "RDP session closed. Stopping Windows VM..."
+    docker-compose -f "$COMPOSE_FILE" down
+    echo "Windows VM stopped."
+  else
+    echo ""
+    echo "RDP session closed. Windows VM is still running."
+    echo "To stop it: omarchy-windows-vm stop"
+  fi
+}
+
+stop_windows() {
+  if [ ! -f "$COMPOSE_FILE" ]; then
+    echo "Windows VM not configured."
+    exit 1
+  fi
+
+  echo "Stopping Windows VM..."
+  docker-compose -f "$COMPOSE_FILE" down
+  echo "Windows VM stopped."
+}
+
+status_windows() {
+  if [ ! -f "$COMPOSE_FILE" ]; then
+    echo "Windows VM not configured."
+    echo "To set up: omarchy-windows-vm install"
+    exit 1
+  fi
+
+  CONTAINER_STATUS=$(docker inspect --format='{{.State.Status}}' omarchy-windows 2>/dev/null)
+
+  if [ -z "$CONTAINER_STATUS" ]; then
+    echo "Windows VM container not found."
+    echo "To start: omarchy-windows-vm launch"
+  elif [ "$CONTAINER_STATUS" = "running" ]; then
+    gum style \
+      --border normal \
+      --padding "1 2" \
+      --margin "1" \
+      --align left \
+      "Windows VM Status: RUNNING" \
+      "" \
+      "Web interface: http://127.0.0.1:8006" \
+      "RDP available: port 3389" \
+      "" \
+      "To connect: omarchy-windows-vm launch" \
+      "To stop:    omarchy-windows-vm stop"
+  else
+    echo "Windows VM is stopped (status: $CONTAINER_STATUS)"
+    echo "To start: omarchy-windows-vm launch"
+  fi
+}
+
+show_usage() {
+  echo "Usage: omarchy-windows-vm [command] [options]"
+  echo ""
+  echo "Commands:"
+  echo "  install              Install and configure Windows VM"
+  echo "  remove               Remove Windows VM and optionally its data"
+  echo "  launch [options]     Start Windows VM (if needed) and connect via RDP"
+  echo "                       Options:"
+  echo "                         --keep-alive, -k   Keep VM running after RDP closes"
+  echo "  stop                 Stop the running Windows VM"
+  echo "  status               Show current VM status"
+  echo "  help                 Show this help message"
+  echo ""
+  echo "Examples:"
+  echo "  omarchy-windows-vm install           # Set up Windows VM for first time"
+  echo "  omarchy-windows-vm launch            # Connect to VM (auto-stop on exit)"
+  echo "  omarchy-windows-vm launch -k         # Connect to VM (keep running)"
+  echo "  omarchy-windows-vm stop              # Shut down the VM"
+}
+
+# Main command dispatcher
+case "$1" in
+  install)
+    install_windows
+    ;;
+  remove)
+    remove_windows
+    ;;
+  launch|start)
+    launch_windows "$2"
+    ;;
+  stop|down)
+    stop_windows
+    ;;
+  status)
+    status_windows
+    ;;
+  help|--help|-h|"")
+    show_usage
+    ;;
+  *)
+    echo "Unknown command: $1" >&2
+    echo "" >&2
+    show_usage >&2
+    exit 1
+    ;;
+esac

boot.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Set install mode to online since boot.sh is used for curl installations
-export OMARCHY_INSTALL_MODE="online"
+export OMARCHY_ONLINE_INSTALL=true
 
 ansi_art='                 ▄▄▄                                                   
  ▄█████▄    ▄███████████▄    ▄███████   ▄███████   ▄███████   ▄█   █▄    ▄█   █▄ 
@@ -29,7 +29,7 @@ git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/
 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"
 if [[ $OMARCHY_REF != "master" ]]; then
-  echo -e "\eUsing branch: $OMARCHY_REF"
+  echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
   cd ~/.local/share/omarchy
   git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
   cd -

config/alacritty/alacritty.toml

@@ -16,5 +16,6 @@ decorations = "None"
 
 [keyboard]
 bindings = [
-{ key = "F11", action = "ToggleFullscreen" }
+{ key = "Insert", mods = "Shift", action = "Paste" },
+{ key = "Insert", mods = "Control", action = "Copy" }
 ]

config/brave-flags.conf

@@ -1,3 +1,5 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
+# Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
+--disable-features=WaylandWpColorManagerV1