Merge branch 'dev' into update-omarchy-refresh-plymouth

.editorconfig

@@ -1,9 +0,0 @@
-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

@@ -1,5 +1,5 @@
 name: Bug
-description: Report a validated bug -- NOT FOR SUPPORT REQUESTS
+description: Report a problem
 labels: [bug]
 body:
   - type: markdown
@@ -19,6 +19,5 @@ 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,8 +1 @@
 blank_issues_enabled: false
-contact_links:
-  - name: Suggestion
-    url: https://github.com/basecamp/omarchy/discussions/categories/suggestions
-    about: Suggest a new feature, change to existing feature, or other ideas in Discussions.
-  - name: 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 only.

.github/ISSUE_TEMPLATE/documentation.yml

@@ -0,0 +1,15 @@
+name: Documentation
+description: New pages or changes to existing
+labels: [documentation]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What correction or addition do we need?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,15 @@
+name: Enhancement
+description: Feature or change
+labels: [enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What do you need?
+    validations:
+      required: true

README.md

@@ -1,9 +1,10 @@
 # Omarchy
 
-Omarchy is a beautiful, modern & opinionated Linux distribution by DHH.
+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.
 
 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

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

applications/hidden/electron37.desktop

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

applications/hidden/fcitx5-wayland-launcher.desktop

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

applications/hidden/java-java-openjdk.desktop

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

applications/hidden/jconsole-java-openjdk.desktop

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

applications/hidden/jshell-java-openjdk.desktop

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

applications/nvim.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Neovim
+GenericName=Text Editor
+Comment=Edit text files
+Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
+Terminal=false
+Type=Application
+Keywords=Text;editor;
+Icon=nvim
+Categories=Utility;TextEditor;
+StartupNotify=false
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;

autostart/walker.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Walker
-Comment=Walker Service
-Exec=walker --gapplication-service
-StartupNotify=false
-Terminal=false
-Type=Application

bin/omarchy-battery-monitor

@@ -4,20 +4,33 @@
 
 BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
-BATTERY_LEVEL=$(omarchy-battery-remaining)
+
-BATTERY_STATE=$(upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}')
+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}'
+}
 
 send_notification() {
   notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
 }
 
-if [[ -n "$BATTERY_LEVEL" && "$BATTERY_LEVEL" =~ ^[0-9]+$ ]]; then
+BATTERY_LEVEL=$(get_battery_percentage)
-  if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then
+BATTERY_STATE=$(get_battery_state)
-    if [[ ! -f $NOTIFICATION_FLAG ]]; then
+
-      send_notification $BATTERY_LEVEL
+if [[ "$BATTERY_STATE" == "discharging" && "$BATTERY_LEVEL" -le "$BATTERY_THRESHOLD" ]]; then
-      touch $NOTIFICATION_FLAG
+  if [[ ! -f "$NOTIFICATION_FLAG" ]]; then
-    fi
+    send_notification "$BATTERY_LEVEL"
-  else
+    touch "$NOTIFICATION_FLAG"
-    rm -f $NOTIFICATION_FLAG
   fi
+else
+  rm -f "$NOTIFICATION_FLAG"
 fi

bin/omarchy-battery-remaining

@@ -1,11 +0,0 @@
-#!/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-branch-set

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-branch-set [master|dev]"
-  exit 1
-else
-  branch="$1"
-fi
-
-case "$branch" in
-  "master") git -C $OMARCHY_PATH switch master ;;
-  "dev") git -C $OMARCHY_PATH switch dev ;;
-  *) echo "Unknown branch: $branch"; exit 1; ;;
-esac

bin/omarchy-channel-set

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-channel-set [stable|edge|dev]"
-  exit 1
-else
-  channel="$1"
-fi
-
-case "$channel" in
-"stable") omarchy-branch-set "master" && omarchy-refresh-pacman "stable" ;;
-"edge") omarchy-branch-set "master" && omarchy-refresh-pacman "edge" ;;
-"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
-*) echo "Unknown channel: $channel"; exit 1; ;;
-esac

bin/omarchy-cmd-apple-display-brightness

@@ -3,12 +3,5 @@
 if [[ $# -eq 0 ]]; then
   echo "Adjust Apple Display Brightness by passing +5000 or -5000 (or any range from 0-60000)"
 else
-  DEVICE="$(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1)"
+  sudo asdcontrol $(sudo asdcontrol --detect /dev/usb/hiddev* | grep ^/dev/usb/hiddev | cut -d: -f1) -- "$1"
-  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 | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
+sinks=$(pactl -f json list sinks | jq '[.[] | select([.ports[]? | .availability == "available"] | any)]')
 sinks_count=$(echo "$sinks" | jq '. | length')
 
 if [ "$sinks_count" -eq 0 ]; then
@@ -23,13 +23,7 @@ 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,15 +6,8 @@ FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
 
 if [[ -f "$FIRST_RUN_MODE" ]]; then
   rm -f "$FIRST_RUN_MODE"
-
+  $OMARCHY_PATH/install/first-run/battery-monitor.sh
-  bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
+  $OMARCHY_PATH/install/first-run/firewall.sh
-  bash "$OMARCHY_PATH/install/first-run/cleanup-reboot-sudoers.sh"
+  $OMARCHY_PATH/install/first-run/gnome-theme.sh
-  bash "$OMARCHY_PATH/install/first-run/firewall.sh"
-  bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
-  bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
-  bash "$OMARCHY_PATH/install/first-run/elephant.sh"
   sudo rm -f /etc/sudoers.d/first-run
-
-  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
-  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
 fi

bin/omarchy-cmd-reboot

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-omarchy-state clear re*-required
-omarchy-hyprland-window-close-all
-sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl reboot --no-wall

bin/omarchy-cmd-screenrecord

@@ -8,92 +8,31 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-DESKTOP_AUDIO="false"
+# Selects region or output
-MICROPHONE_AUDIO="false"
+SCOPE="$1"
-WEBCAM="false"
-STOP_RECORDING="false"
 
-for arg in "$@"; do
+# Selects audio inclusion or not
-  case "$arg" in
+AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
-    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
-    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
-    --with-webcam) WEBCAM="true" ;;
-    --stop-recording) STOP_RECORDING="true"
-  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() {
-  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  local audio_devices=""
-  local audio_args=""
 
-  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
+  if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-
+    wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
-  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
+  else
-    # Merge audio tracks into one - separate tracks only play one at a time in most players
+    wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &
-    [[ -n "$audio_devices" ]] && audio_devices+="|"
-    audio_devices+="default_input"
   fi
 
-  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
-
-  gpu-screen-recorder -w portal -f 60 -fallback-cpu-encoding yes -o "$filename" $audio_args -ac aac &
   toggle_screenrecording_indicator
 }
 
 stop_screenrecording() {
-  pkill -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly
+  pkill -x wl-screenrec
+  pkill -x wf-recorder
 
-  # Wait a maximum of 5 seconds to finish before hard killing
+  notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
-  local count=0
-  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
-    sleep 0.1
-    count=$((count + 1))
-  done
 
-  if pgrep -f "^gpu-screen-recorder" >/dev/null; then
+  sleep 0.2 # ensures the process is actually dead before we check
-    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
 }
 
@@ -102,19 +41,14 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null
 }
 
 if screenrecording_active; then
-  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
+  stop_screenrecording
-    cleanup_webcam
+elif [[ "$SCOPE" == "output" ]]; then
-  else
+  start_screenrecording
-    stop_screenrecording
-  fi
-elif [[ "$STOP_RECORDING" == "false" ]]; then
-  [[ "$WEBCAM" == "true" ]] && start_webcam_overlay
-
-  start_screenrecording || cleanup_webcam
 else
-  exit 1
+  region=$(slurp) || exit 1
+  start_screenrecording -g "$region"
 fi

bin/omarchy-cmd-screensaver

@@ -1,30 +1,21 @@
 #!/bin/bash
 
-screensaver_in_focus() {
+function exit_screensaver {
-  hyprctl activewindow -j | jq -e '.class == "org.omarchy.screensaver"' >/dev/null 2>&1
-}
-
-exit_screensaver() {
-  hyprctl keyword cursor:invisible false
   pkill -x tte 2>/dev/null
-  pkill -f org.omarchy.screensaver 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
   exit 0
 }
 
 trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
 
-printf '\033]11;rgb:00/00/00\007'  # Set background color to black
-
-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)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
+    --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-    --random-effect --exclude-effects dev_worm \
+    "$effect" &
-    --no-eol --no-restore-cursor &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 1 || ! screensaver_in_focus; then
+    if read -n 1 -t 3; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-screenshot

@@ -8,76 +8,10 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-pkill slurp && exit 0
+pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
-
-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

@@ -1,44 +0,0 @@
-#!/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-shutdown

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-omarchy-state clear re*-required
-omarchy-hyprland-window-close-all
-sleep 1 # Allow apps like Chrome to shutdown correctly
-systemctl poweroff --no-wall

bin/omarchy-cmd-terminal-cwd

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

bin/omarchy-cmd-tzupdate

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

@@ -1,61 +0,0 @@
-#!/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 'font-family:\s*["'\'']?\K[^;"'\'']+' ~/.config/waybar/style.css | head -n1
+grep -oP 'family\s*=\s*"\K[^"]+' ~/.config/alacritty/alacritty.toml | head -n1

bin/omarchy-font-set

@@ -4,21 +4,7 @@ font_name="$1"
 
 if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
   if fc-list | grep -iq "$font_name"; then
-    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
-      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/hypr/hyprlock.conf
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \
@@ -28,12 +14,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
 
     omarchy-restart-waybar
     omarchy-restart-swayosd
-
+    omarchy-restart-walker
-    if pgrep -x ghostty; then
-      notify-send "    You must restart Ghostty to see font change"
-    fi
-
-    omarchy-hook font-set "$font_name"
   else
     echo "Font '$font_name' not found."
     exit 1

bin/omarchy-hook

@@ -1,16 +0,0 @@
-#!/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-window-pop

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Toggle to pop-out a tile to stay fixed on a display basis.
-
-# Usage:
-# omarchy-hyprland-window-pop [width height [x y]]
-#
-# Arguments:
-#   width   Optional. Width of the floating window. Default: 1300
-#   height  Optional. Height of the floating window. Default: 900
-#   x       Optional. X position of the window. Must provide both X and Y to take effect.
-#   y       Optional. Y position of the window. Must provide both X and Y to take effect.
-#
-# Behavior:
-#   - If the window is already pinned, it will be unpinned and removed from the pop layer.
-#   - If the window is not pinned, it will be floated, resized, moved/centered, pinned, brought to top, and popped.
-
-width=${1:-1300}
-height=${2:-900}
-x=${3:-}
-y=${4:-}
-
-active=$(hyprctl activewindow -j)
-pinned=$(echo "$active" | jq ".pinned")
-addr=$(echo "$active" | jq -r ".address")
-
-if [[ $pinned == "true" ]]; then
-  hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch togglefloating address:$addr;" \
-    "dispatch tagwindow -pop address:$addr;"
-elif [[ -n $addr ]]; then
-  hyprctl dispatch togglefloating address:$addr
-  hyprctl dispatch resizeactive exact $width $height address:$addr
-
-  if [[ -n $x && -n $y ]]; then
-    hyprctl dispatch moveactive $x $y address:$addr
-  else
-    hyprctl dispatch centerwindow address:$addr
-  fi
-
-  hyprctl -q --batch \
-    "dispatch pin address:$addr;" \
-    "dispatch alterzorder top address:$addr;" \
-    "dispatch tagwindow +pop address:$addr;"
-fi

bin/omarchy-hyprland-workspace-toggle-gaps

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

bin/omarchy-install-chromium-google-account

@@ -1,13 +0,0 @@
-#!/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,10 +47,8 @@ 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
-  echo "gem: --no-document" > ~/.gemrc
   mise x ruby -- gem install rails --no-document
   echo -e "\nYou can now run: rails new myproject"
   ;;
@@ -121,7 +119,6 @@ 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" "MSSQL")
+options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
 
 if [[ "$#" -eq 0 ]]; then
-  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
 else
   choices="$@"
 fi
@@ -16,7 +16,6 @@ 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-steam

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-set -e
+echo "Adding multilib repository for 32-bit compatibility"
+sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
 
 echo "Now pick dependencies matching your graphics card"
-sudo pacman -S steam
+sudo pacman -Syu --noconfirm steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-terminal

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-if (($# == 0)); then
-  echo "Usage: omarchy-install-terminal [alacritty|ghostty|kitty]"
-  exit 1
-fi
-
-package="$1"
-
-# Map package name to desktop entry ID
-case "$package" in
-alacritty) desktop_id="Alacritty.desktop" ;;
-ghostty) desktop_id="com.mitchellh.ghostty.desktop" ;;
-kitty) desktop_id="kitty.desktop" ;;
-*)
-  echo "Unknown terminal: $package"
-  exit 1
-  ;;
-esac
-
-# Install package
-if omarchy-pkg-add $package; then
-  # Copy custom desktop entry for alacritty with X-TerminalArg* keys
-  if [[ $package == "alacritty" ]]; then
-    mkdir -p ~/.local/share/applications
-    cat > ~/.local/share/applications/Alacritty.desktop << EOF
-[Desktop Entry]
-Type=Application
-TryExec=alacritty
-Exec=alacritty
-Icon=Alacritty
-Terminal=false
-Categories=System;TerminalEmulator;
-Name=Alacritty
-GenericName=Terminal
-Comment=A fast, cross-platform, OpenGL terminal emulator
-StartupNotify=true
-StartupWMClass=Alacritty
-Actions=New;
-X-TerminalArgExec=-e
-X-TerminalArgAppId=--class=
-X-TerminalArgTitle=--title=
-X-TerminalArgDir=--working-directory=
-
-[Desktop Action New]
-Name=New Terminal
-Exec=alacritty
-EOF
-  fi
-
-  # Update xdg-terminals.list to prioritize the proper terminal
-  cat > ~/.config/xdg-terminals.list << EOF
-# Terminal emulator preference order for xdg-terminal-exec
-# The first found and valid terminal will be used
-$desktop_id
-EOF
-else
-  echo "Failed to install $package"
-fi

bin/omarchy-install-vscode

@@ -1,27 +0,0 @@
-#!/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
-
-# Apply Omarchy theme to VSCode
-omarchy-theme-set-vscode
-
-setsid gtk-launch code

bin/omarchy-install-xbox-controllers

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Install xpadneo to ensure controllers work out of the box
-sudo pacman -S --noconfirm --needed linux-headers
-yay -S --noconfirm xpadneo-dkms
-
-# Prevent xpad/xpadneo driver conflict
-echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null
-echo hid_xpadneo | sudo tee /etc/modules-load.d/xpadneo.conf >/dev/null
-
-# Give user access to game controllers
-sudo usermod -a -G input $USER
-
-# Modules need to be loaded
-gum confirm "Install requires reboot. Ready?" && sudo reboot now

bin/omarchy-launch-about

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"

bin/omarchy-launch-bluetooth

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock bluetooth
-exec omarchy-launch-or-focus-tui bluetui

bin/omarchy-launch-browser

@@ -1,12 +1,3 @@
 #!/bin/bash
 
-default_browser=$(xdg-settings get default-web-browser)
+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[@]} $@
-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

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-omarchy-cmd-present "$EDITOR" || EDITOR=nvim
-
-case "$EDITOR" in
-nvim | vim | nano | micro | hx | helix)
-  exec omarchy-launch-tui "$EDITOR" "$@"
-  ;;
-*)
-  exec setsid uwsm-app -- "$EDITOR" "$@"
-  ;;
-esac

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

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

bin/omarchy-launch-or-focus

@@ -1,16 +0,0 @@
-#!/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 setsid $LAUNCH_COMMAND
-fi

bin/omarchy-launch-or-focus-tui

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-APP_ID="org.omarchy.$(basename $1)"
-LAUNCH_COMMAND="omarchy-launch-tui $@"
-
-exec omarchy-launch-or-focus "$APP_ID" "$LAUNCH_COMMAND"

bin/omarchy-launch-or-focus-webapp

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

@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f org.omarchy.screensaver && exit 0
+pgrep -f "alacritty --class Screensaver" && exit 0
 
 # Allow screensaver to be turned off but also force started
 if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
@@ -14,36 +14,13 @@ if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]
 fi
 
 focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')
-terminal=$(xdg-terminal-exec --print-id)
 
 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
   hyprctl dispatch focusmonitor $m
-
+  hyprctl dispatch exec -- \
-  case $terminal in
+    alacritty --class Screensaver \
-  *Alacritty*)
+    --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-    hyprctl dispatch exec -- \
+    -e omarchy-cmd-screensaver
-      alacritty --class=org.omarchy.screensaver \
-      --config-file ~/.local/share/omarchy/default/alacritty/screensaver.toml \
-      -e omarchy-cmd-screensaver
-    ;;
-  *ghostty*)
-    hyprctl dispatch exec -- \
-      ghostty --class=org.omarchy.screensaver \
-      --config-file=~/.local/share/omarchy/default/ghostty/screensaver \
-      --font-size=18 \
-      -e omarchy-cmd-screensaver
-    ;;
-  *kitty*)
-    hyprctl dispatch exec -- \
-      kitty --class=org.omarchy.screensaver \
-      --override font_size=18 \
-      --override window_padding_width=0 \
-      -e omarchy-cmd-screensaver
-    ;;
-  *)
-    notify-send "✋  Screensaver only runs in Alacritty, Ghostty, or Kitty"
-    ;;
-  esac
 done
 
 hyprctl dispatch focusmonitor $focused

bin/omarchy-launch-tui

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec setsid uwsm-app -- xdg-terminal-exec --app-id=org.omarchy.$(basename $1) -e "$1" "${@:2}"

bin/omarchy-launch-walker

@@ -1,13 +0,0 @@
-#!/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* | helium*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) 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

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rfkill unblock wifi
-omarchy-launch-or-focus-tui impala

bin/omarchy-lock-screen

@@ -3,13 +3,10 @@
 # Lock the screen
 pidof hyprlock || hyprlock &
 
-# Set keyboard layout to default (first layout)
-hyprctl switchxkblayout all 0 > /dev/null 2>&1
-
 # Ensure 1password is locked
 if pgrep -x "1password" >/dev/null; then
   1password --lock &
 fi
 
 # Avoid running screensaver when locked
-pkill -f org.omarchy.screensaver
+pkill -f "alacritty --class Screensaver"

bin/omarchy-menu

@@ -8,7 +8,7 @@ BACK_TO_EXIT=false
 back_to() {
   local parent_menu="$1"
 
-  if [[ "$BACK_TO_EXIT" == "true" ]]; then
+  if [[ "$DIRECT_ACCESS" == "true" ]]; then
     exit 0
   elif [[ -n "$parent_menu" ]]; then
     "$parent_menu"
@@ -29,24 +29,24 @@ menu() {
     local index
     index=$(echo -e "$options" | grep -nxF "$preselect" | cut -d: -f1)
     if [[ -n "$index" ]]; then
-      args+=("-c" "$index")
+      args+=("-a" "$index")
     fi
   fi
 
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
+  echo -e "$options" | walker --dmenu --theme dmenu_250 -p "$prompt…" "${args[@]}"
 }
 
 terminal() {
-  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
+  alacritty --class Omarchy -e "$@"
 }
 
 present_terminal() {
   omarchy-launch-floating-terminal-with-presentation $1
 }
 
-open_in_editor() {
+edit_in_nvim() {
   notify-send "Editing config file" "$1"
-  omarchy-launch-editor "$1"
+  alacritty -e nvim "$1"
 }
 
 install() {
@@ -61,10 +61,6 @@ 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"
 }
@@ -85,49 +81,60 @@ show_learn_menu() {
   esac
 }
 
-show_trigger_menu() {
+show_style_menu() {
-  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
+  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n󱄄  Screensaver\n  About") in
-  *Capture*) show_capture_menu ;;
+  *Theme*) show_theme_menu ;;
-  *Share*) show_share_menu ;;
+  *Font*) show_font_menu ;;
-  *Toggle*) show_toggle_menu ;;
+  *Background*) omarchy-theme-bg-next ;;
+  *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
 
+show_theme_menu() {
+  theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+    back_to show_style_menu
+  else
+    omarchy-theme-set "$theme"
+  fi
+}
+
+show_font_menu() {
+  theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
+  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
+    back_to show_style_menu
+  else
+    omarchy-font-set "$theme"
+  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_trigger_menu ;;
+  *) show_main_menu ;;
   esac
 }
 
 show_screenshot_menu() {
-  case $(menu "Screenshot" "  Snap with Editing\n  Straight to Clipboard") in
+  case $(menu "Screenshot" "  Region\n  Window\n  Display") in
-  *Editing*) omarchy-cmd-screenshot smart ;;
+  *Region*) omarchy-cmd-screenshot ;;
-  *Clipboard*) omarchy-cmd-screenshot smart clipboard ;;
+  *Window*) omarchy-cmd-screenshot window ;;
+  *Display*) omarchy-cmd-screenshot output ;;
   *) show_capture_menu ;;
   esac
 }
 
 show_screenrecord_menu() {
-  omarchy-cmd-screenrecord --stop-recording && exit 0
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
-
+  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
-  case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
+  *Region*) omarchy-cmd-screenrecord ;;
-  *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
-  *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
+  *Display*) omarchy-cmd-screenrecord output ;;
-  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
+  *) show_capture_menu ;;
-  *) back_to show_capture_menu ;;
-  esac
-}
-
-show_share_menu() {
-  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
-  *Clipboard*) 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
 }
 
@@ -137,53 +144,34 @@ show_toggle_menu() {
   *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  Hyprland\n󱄄  Screensaver\n  About") in
-  *Theme*) show_theme_menu ;;
-  *Font*) show_font_menu ;;
-  *Background*) omarchy-theme-bg-next ;;
-  *Hyprland*) open_in_editor ~/.config/hypr/looknfeel.conf ;;
-  *Screensaver*) open_in_editor ~/.config/omarchy/branding/screensaver.txt ;;
-  *About*) open_in_editor ~/.config/omarchy/branding/about.txt ;;
   *) show_main_menu ;;
   esac
 }
 
-show_theme_menu() {
-  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
-}
-
-show_font_menu() {
-  theme=$(menu "Font" "$(omarchy-font-list)" "--width 350" "$(omarchy-font-current)")
-  if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    back_to show_style_menu
-  else
-    omarchy-font-set "$theme"
-  fi
-}
-
 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  Defaults\n󰱔  DNS\n  Security\n  Config"
+  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
 
   case $(menu "Setup" "$options") in
-  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
+  *Audio*) alacritty --class=Wiremix -e wiremix ;;
-  *Wifi*) omarchy-launch-wifi ;;
+  *Wifi*)
-  *Bluetooth*) omarchy-launch-bluetooth ;;
+    rfkill unblock wifi
+    alacritty --class=Impala -e impala
+    ;;
+  *Bluetooth*)
+    rfkill unblock bluetooth
+    blueberry
+    ;;
   *Power*) show_setup_power_menu ;;
-  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
+  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
+  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
-  *Input*) open_in_editor ~/.config/hypr/input.conf ;;
+  *Input*) edit_in_nvim ~/.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
 }
@@ -200,28 +188,20 @@ 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*) open_in_editor ~/.config/hypr/hyprland.conf ;;
+  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
+  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
+  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
+  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
+  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
+  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
+  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
+  *XCompose*) edit_in_nvim ~/.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  Terminal\n󱚤  AI\n󰍲  Windows\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -230,45 +210,33 @@ 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\n  Chromium Account") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") 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*) present_terminal omarchy-install-vscode ;;
+  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
+  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
-  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
+  *Sublime*) aur_install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_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) ||
@@ -276,11 +244,10 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini [AUR]\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
   *Claude*) install "Claude Code" "claude-code" ;;
-  *Cursor*) install "Cursor CLI" "cursor-cli" ;;
+  *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
-  *OpenAI*) install "OpenAI Codex" "openai-codex-bin" ;;
+  *Gemini*) aur_install "Gemini" "gemini-cli" ;;
-  *Gemini*) install "Gemini" "gemini-cli" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
@@ -290,11 +257,10 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *Minecraft*) aur_install_and_launch "Minecraft [AUR]" "minecraft-launcher" "minecraft-launcher" ;;
-  *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac
 }
@@ -309,7 +275,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" "--width 350") in
+  case $(menu "Install" "  Meslo LG Mono\n  Fira Code\n  Victor Code\n  Bistream Vera Mono" "-w 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" ;;
@@ -364,12 +330,11 @@ show_install_elixir_menu() {
 }
 
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰍲  Windows\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\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 ;;
@@ -377,15 +342,13 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Firmware\n  Password\n  Timezone\n  Time") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") 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 ;;
-  *Firmware*) present_terminal omarchy-update-firmware ;;
+  *Timezone*) omarchy-cmd-tzupdate ;;
-  *Timezone*) present_terminal omarchy-tz-select ;;
-  *Time*) present_terminal omarchy-update-time ;;
   *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
@@ -417,8 +380,7 @@ show_update_config_menu() {
 }
 
 show_update_hardware_menu() {
-  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  case $(menu "Restart" "󱚾  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 ;;
@@ -434,36 +396,37 @@ show_update_password_menu() {
 }
 
 show_system_menu() {
-  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
   *Suspend*) systemctl suspend ;;
-  *Restart*) omarchy-cmd-reboot ;;
+  *Relaunch*) uwsm stop ;;
-  *Shutdown*) omarchy-cmd-shutdown ;;
+  *Restart*) systemctl reboot ;;
+  *Shutdown*) systemctl poweroff ;;
   *) back_to show_main_menu ;;
   esac
 }
 
 show_main_menu() {
-  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 "$(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() {
   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*) omarchy-launch-about ;;
+  *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
   *system*) show_system_menu ;;
   esac
 }

bin/omarchy-menu-keybindings

@@ -3,80 +3,6 @@
 # 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}"
-    elif [[ "$line" =~ mouse:([0-9]+) ]]; then
-      code="${BASH_REMATCH[1]}"
-
-      case "$code" in
-        272) symbol="LEFT MOUSE BUTTON" ;;
-        273) symbol="RIGHT MOUSE BUTTON" ;;
-        274) symbol="MIDDLE MOUSE BUTTON" ;;
-        *)   symbol="mouse:${code}" ;;
-      esac
-
-      echo "${line/mouse:${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:
@@ -85,36 +11,30 @@ parse_keycodes() {
 # - Map numeric modifier key mask to a textual rendition
 # - Output comma-separated values that the parser can understand
 dynamic_bindings() {
-  hyprctl -j binds |
+  hyprctl -j binds | \
-    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
+    jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' | \
     sed -r \
-      -e 's/null//' \
+        -e 's/null//' \
-      -e 's,~/.local/share/omarchy/bin/,,' \
+        -e 's,~/.local/share/omarchy/bin/,,' \
-      -e 's,uwsm app -- ,,' \
+        -e 's,uwsm app -- ,,' \
-      -e 's,uwsm-app -- ,,' \
+        -e 's/@0//' \
-      -e 's/@0//' \
+        -e 's/,@/,code:/' \
-      -e 's/,@/,code:/' \
+        -e 's/^0,/,/' \
-      -e 's/^0,/,/' \
+        -e 's/^1,/SHIFT,/' \
-      -e 's/^1,/SHIFT,/' \
+        -e 's/^4,/CTRL,/' \
-      -e 's/^4,/CTRL,/' \
+        -e 's/^5,/SHIFT CTRL,/' \
-      -e 's/^5,/SHIFT CTRL,/' \
+        -e 's/^8,/ALT,/' \
-      -e 's/^8,/ALT,/' \
+        -e 's/^9,/SHIFT ALT,/' \
-      -e 's/^9,/SHIFT ALT,/' \
+        -e 's/^12,/CTRL ALT,/' \
-      -e 's/^12,/CTRL ALT,/' \
+        -e 's/^13,/SHIFT CTRL ALT,/' \
-      -e 's/^13,/SHIFT CTRL ALT,/' \
+        -e 's/^64,/SUPER,/' \
-      -e 's/^64,/SUPER,/' \
+        -e 's/^65,/SUPER SHIFT,/' \
-      -e 's/^65,/SUPER SHIFT,/' \
+        -e 's/^68,/SUPER CTRL,/' \
-      -e 's/^68,/SUPER CTRL,/' \
+        -e 's/^69,/SUPER SHIFT CTRL,/' \
-      -e 's/^69,/SUPER SHIFT CTRL,/' \
+        -e 's/^72,/SUPER ALT,/' \
-      -e 's/^72,/SUPER ALT,/' \
+        -e 's/^73,/SUPER SHIFT ALT,/' \
-      -e 's/^73,/SUPER SHIFT ALT,/' \
+        -e 's/^76,/SUPER CTRL ALT,/' \
-      -e 's/^76,/SUPER CTRL ALT,/' \
+        -e 's/^77,/SUPER SHIFT CTRL ALT,/'
-      -e 's/^77,/SUPER SHIFT CTRL ALT,/'
-}
-
-# Hardcoded bindings, like the copy-url extension and such
-static_bindings() {
-    echo "SHIFT ALT,L,Copy URL from Web App,extension,copy-url"
 }
 
 # Parse and format keybindings
@@ -163,67 +83,11 @@ parse_bindings() {
 }'
 }
 
-prioritize_entries() {
-  awk '
-  {
-    line = $0
-    prio = 50
-    if (match(line, /Terminal/)) prio = 0
-    if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/)) prio = 1
-    if (match(line, /File manager/))  prio = 2
-    if (match(line, /Launch apps/))  prio = 3
-    if (match(line, /Omarchy menu/))  prio = 4
-    if (match(line, /System menu/))  prio = 5
-    if (match(line, /Theme menu/))  prio = 6
-    if (match(line, /Full screen/))  prio = 7
-    if (match(line, /Close window/))  prio = 8
-    if (match(line, /Toggle window floating/))  prio = 9
-    if (match(line, /Toggle window split/))  prio = 10
-    if (match(line, /Universal/))  prio = 11
-    if (match(line, /Clipboard/))  prio = 12
-    if (match(line, /Emoji picker/))  prio = 13
-    if (match(line, /Color picker/))  prio = 14
-    if (match(line, /Screenshot/))  prio = 15
-    if (match(line, /Screenrecording/))  prio = 16
-    if (match(line, /(Switch|Next|Former|Previous).*workspace/))  prio = 17
-    if (match(line, /Move window to workspace/))  prio = 18
-    if (match(line, /Swap window/))  prio = 19
-    if (match(line, /Move window focus/))  prio = 20
-    if (match(line, /Move window$/))  prio = 21
-    if (match(line, /Resize window/))  prio = 22
-    if (match(line, /Expand window/))  prio = 23
-    if (match(line, /Shrink window/))  prio = 24
-    if (match(line, /scratchpad/))  prio = 25
-    if (match(line, /notification/))  prio = 26
-    if (match(line, /Toggle window transparency/))  prio = 27
-    if (match(line, /Toggle workspace gaps/))  prio = 28
-    if (match(line, /Toggle nightlight/))  prio = 29
-    if (match(line, /group/))  prio = 94
-    if (match(line, /Scroll active workspace/))  prio = 95
-    if (match(line, /Cycle to/))  prio = 96
-    if (match(line, /Reveal active/))  prio = 97
-    if (match(line, /Apple Display/))  prio = 98
-    if (match(line, /XF86/))  prio = 99
-
-    # print "priority<TAB>line"
-    printf "%d\t%s\n", prio, line
-  }' |
-  sort -k1,1n -k2,2 |
-  cut -f2-
-}
-
 monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
 menu_height=$((monitor_height * 40 / 100))
 
-build_keymap_cache
+dynamic_bindings | \
-
+  sort -u | \
-{
+  parse_bindings | \
-  dynamic_bindings
+  walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height"
-  static_bindings
-} |
-  sort -u |
-  parse_keycodes |
-  parse_bindings |
-  prioritize_entries |
-  walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
 

bin/omarchy-notification-dismiss

@@ -1,13 +0,0 @@
-#!/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,14 +1,8 @@
 #!/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
-    echo -e "\033[31mError: Package '$pkg' did not install\033[0m" >&2
+    sudo pacman -S --noconfirm "$pkg" || exit 1
-    exit 1
   fi
 done
 

bin/omarchy-pkg-aur-install

@@ -2,15 +2,13 @@
 
 fzf_args=(
   --multi
-  --preview 'yay -Siia {1}'
+  --preview 'yay -Sii {1}'
-  --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, alt-j/k: scroll, tab: multi-select'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --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-ignored

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored"
+
+if [[ -f $IGNORED_PACKAGES_FILE ]]; then
+  tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//'
+fi

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'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --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'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
   --bind 'alt-p:toggle-preview'

bin/omarchy-refresh-hyprland

@@ -2,6 +2,6 @@
 
 omarchy-refresh-config hypr/autostart.conf
 omarchy-refresh-config hypr/bindings.conf
+omarchy-refresh-config hypr/envs.conf
 omarchy-refresh-config hypr/input.conf
-omarchy-refresh-config hypr/looknfeel.conf
 omarchy-refresh-config hypr/hyprland.conf

bin/omarchy-refresh-limine

@@ -1,34 +0,0 @@
-#!/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-pacman

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# Take backup of existing files
-sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak
-sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
-
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-
-if [[ $1 == "edge" ]]; then
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf
-  echo "Setting channel to edge"
-else
-  sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist
-  sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf
-  echo "Setting channel to stable"
-fi
-
-echo
-
-# Reset all package DBs and then update
-sudo pacman -Syyu --noconfirm

bin/omarchy-refresh-pacman-mirrorlist

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist

bin/omarchy-refresh-plymouth

@@ -7,4 +7,4 @@ if command -v limine-mkinitcpio &>/dev/null; then
   sudo limine-mkinitcpio
 else
   sudo mkinitcpio -P
-fi
+fi

bin/omarchy-refresh-walker

@@ -1,10 +1,4 @@
 #!/bin/bash
 
-# Ensure walker is set to autostart
-mkdir -p ~/.config/autostart/
-cp $OMARCHY_PATH/autostart/walker.desktop ~/.config/autostart/
-
 omarchy-refresh-config walker/config.toml
-omarchy-refresh-config elephant/calc.toml
-omarchy-refresh-config elephant/desktopapplications.toml
 omarchy-restart-walker

bin/omarchy-reinstall

@@ -1,33 +0,0 @@
-#!/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-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,5 +1,4 @@
 #!/bin/bash
 
-echo -e "Unblocking bluetooth...\n"
 rfkill unblock bluetooth
 rfkill list bluetooth

bin/omarchy-restart-pipewire

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

bin/omarchy-restart-terminal

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

bin/omarchy-restart-walker

@@ -1,22 +1,7 @@
 #!/bin/bash
 
-pkill elephant
 pkill walker
-
+# FIXME: Reenable the walker service once the memory leak has been fixed
-# Detect if we're running as root (from pacman hook)
+# See https://github.com/basecamp/omarchy/issues/698
-if [[ $EUID -eq 0 ]]; then
+# setsid uwsm app -- walker --gapplication-service &
-  # Get the owner of this script to determine which user to run as
+echo # Always end in success so we don't terminate further running
-  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 "
-      systemctl --user restart elephant.service
-      setsid walker --gapplication-service &
-    "
-else
-  elephant service enable 2>/dev/null
-  systemctl --user restart elephant.service
-  setsid walker --gapplication-service &
-fi

bin/omarchy-restart-wifi

@@ -1,5 +1,4 @@
 #!/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|FPC'; then
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity'; then
     print_error "\nNo fingerprint sensor detected."
     return 1
   fi
@@ -51,16 +51,6 @@ EOF
   fi
 }
 
-add_hyprlock_fingerprint_icon() {
-  print_info "Adding fingerprint icon to hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = <span> Enter Password 󰈷 <\/span>/' ~/.config/hypr/hyprlock.conf
-}
-
-remove_hyprlock_fingerprint_icon() {
-  print_info "Removing fingerprint icon from hyprlock placeholder text..."
-  sed -i 's/placeholder_text = .*/placeholder_text = Enter Password/' ~/.config/hypr/hyprlock.conf
-}
-
 remove_pam_config() {
   # Remove from sudo
   if grep -q pam_fprintd.so /etc/pam.d/sudo; then
@@ -81,9 +71,6 @@ if [[ "--remove" == "$1" ]]; then
   # Remove PAM configuration
   remove_pam_config
 
-  # Remove fingerprint icon from hyprlock placeholder text
-  remove_hyprlock_fingerprint_icon
-
   # Uninstall packages
   print_info "Removing fingerprint packages..."
   sudo pacman -Rns --noconfirm fprintd
@@ -103,9 +90,6 @@ else
   # Configure PAM
   setup_pam_config
 
-  # Add fingerprint icon to hyprlock placeholder text
-  add_hyprlock_fingerprint_icon
-
   # Enroll first fingerprint
   print_success "\nLet's setup your right index finger as the first fingerprint."
   print_info "Keep moving the finger around on sensor until the process completes.\n"

bin/omarchy-snapshot

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 COMMAND="$1"
 OMARCHY_PATH=${OMARCHY_PATH:-$HOME/.local/share/omarchy}
 
@@ -19,7 +17,7 @@ create)
   DESC="$(omarchy-version)"
 
   echo -e "\e[32mCreate system snapshot\e[0m"
-
+  
   # Get existing snapper config names from CSV output
   mapfile -t CONFIGS < <(sudo snapper --csvout list-configs | awk -F, 'NR>1 {print $1}')
 

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 -L "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+mapfile -d '' -t BACKGROUNDS < <(find "$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-remove

@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
   mapfile -t extra_themes < <(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
 
   if [[ ${#extra_themes[@]} -gt 0 ]]; then
-    THEME_NAME=$(printf '%s\n' "${extra_themes[@]}" | sort | gum choose --header="Remove extra theme")
+    THEME_NAME=$(gum choose --header="Remove extra theme" "${extra_themes[@]}")
   else
     echo "No extra themes installed."
     exit 1

bin/omarchy-theme-set

@@ -1,7 +1,10 @@
 #!/bin/bash
 
-if [[ -z $1 && $1 != "CNCLD" ]]; then
+# omarchy-theme-set: Set a theme, specified by its name.
-  echo "Usage: omarchy-theme-set <theme-name>"
+# Usage: omarchy-theme-set <theme-name>
+
+if [[ -z "$1" && "$1" != "CNCLD" ]]; then
+  echo "Usage: omarchy-theme-set <theme-name>" >&2
   exit 1
 fi
 
@@ -13,32 +16,54 @@ 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"
+  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
-  exit 1
+  exit 2
 fi
 
 # Update theme symlinks
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# Change background with theme
+# Change gnome modes
-omarchy-theme-bg-next
+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"
 
 # Restart components to apply new theme
-if pgrep -x waybar >/dev/null; then
-  omarchy-restart-waybar
-fi
-omarchy-restart-swayosd
-omarchy-restart-terminal
-hyprctl reload
 pkill -SIGUSR2 btop
+omarchy-restart-waybar
+omarchy-restart-swayosd
 makoctl reload
+hyprctl reload
 
-# Change gnome, browser, vscode, cursor themes
+# Set new background
-omarchy-theme-set-gnome
+omarchy-theme-bg-next
-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"