Update version

Omarchy 3.2.1

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,5 +1,5 @@
 name: Bug
-description: Report a problem
+description: Report a validated bug -- NOT FOR SUPPORT REQUESTS
 labels: [bug]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 🛟 Community Support
+  - 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, documentation, and enhancement proposals only.
+    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

@@ -1,16 +0,0 @@
-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?
-      description: Please provide reference links and specifics of what should be updated
-    validations:
-      required: true

.github/ISSUE_TEMPLATE/enhancement.yml

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

applications/nvim.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Neovim
-GenericName=Text Editor
-Comment=Edit text files
-Exec=omarchy-launch-editor %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

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

bin/omarchy-battery-monitor

@@ -11,11 +11,13 @@ send_notification() {
   notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000
 }
 
-if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then
-  if [[ ! -f $NOTIFICATION_FLAG ]]; then
-    send_notification $BATTERY_LEVEL
-    touch $NOTIFICATION_FLAG
+if [[ -n "$BATTERY_LEVEL" && "$BATTERY_LEVEL" =~ ^[0-9]+$ ]]; then
+  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
   fi
-else
-  rm -f $NOTIFICATION_FLAG
 fi

bin/omarchy-branch-set

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-channel-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

@@ -0,0 +1,15 @@
+#!/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 "edge" && omarchy-refresh-pacman "stable" ;;
+"dev") omarchy-branch-set "dev" && omarchy-refresh-pacman "edge" ;;
+*) echo "Unknown channel: $channel"; exit 1; ;;
+esac

bin/omarchy-cmd-first-run

@@ -12,8 +12,9 @@ if [[ -f "$FIRST_RUN_MODE" ]]; then
   bash "$OMARCHY_PATH/install/first-run/firewall.sh"
   bash "$OMARCHY_PATH/install/first-run/dns-resolver.sh"
   bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
+  bash "$OMARCHY_PATH/install/first-run/elephant.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"
+  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
 fi

bin/omarchy-cmd-reboot

@@ -0,0 +1,6 @@
+#!/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,15 +8,17 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-SCOPE=""
-AUDIO="false"
+DESKTOP_AUDIO="false"
+MICROPHONE_AUDIO="false"
 WEBCAM="false"
+STOP_RECORDING="false"
 
 for arg in "$@"; do
   case "$arg" in
-    --with-audio) AUDIO="true" ;;
+    --with-desktop-audio) DESKTOP_AUDIO="true" ;;
+    --with-microphone-audio) MICROPHONE_AUDIO="true" ;;
     --with-webcam) WEBCAM="true" ;;
-    output|region) SCOPE="$arg" ;;
+    --stop-recording) STOP_RECORDING="true"
   esac
 done
 
@@ -57,27 +59,35 @@ start_webcam_overlay() {
 
 start_screenrecording() {
   local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+  local audio_devices=""
   local audio_args=""
 
-  # 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"
+  [[ "$DESKTOP_AUDIO" == "true" ]] && audio_devices+="default_output"
 
-  gpu-screen-recorder -w "$@" -f 60 -c mp4 -o "$filename" $audio_args &
+  if [[ "$MICROPHONE_AUDIO" == "true" ]]; then
+    # Merge audio tracks into one - separate tracks only play one at a time in most players
+    [[ -n "$audio_devices" ]] && audio_devices+="|"
+    audio_devices+="default_input"
+  fi
+
+  [[ -n "$audio_devices" ]] && audio_args+="-a $audio_devices"
+
+  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 -SIGINT -f "^gpu-screen-recorder"  # SIGINT required to save video properly
 
   # Wait a maximum of 5 seconds to finish before hard killing
   local count=0
-  while pgrep -f "gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
+  while pgrep -f "^gpu-screen-recorder" >/dev/null && [ $count -lt 50 ]; do
     sleep 0.1
     count=$((count + 1))
   done
 
-  if pgrep -f "gpu-screen-recorder" >/dev/null; then
-    pkill -9 -f "gpu-screen-recorder"
+  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
@@ -92,51 +102,19 @@ toggle_screenrecording_indicator() {
 }
 
 screenrecording_active() {
-  pgrep -f "gpu-screen-recorder" >/dev/null || pgrep -x slurp >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
+  pgrep -f "^gpu-screen-recorder" >/dev/null || pgrep -f "WebcamOverlay" >/dev/null
 }
 
 if screenrecording_active; then
-  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
+  if pgrep -f "WebcamOverlay" >/dev/null && ! pgrep -f "^gpu-screen-recorder" >/dev/null; then
     cleanup_webcam
   else
     stop_screenrecording
   fi
-elif [[ "$SCOPE" == "output" ]]; then
+elif [[ "$STOP_RECORDING" == "false" ]]; then
   [[ "$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"
+  start_screenrecording || cleanup_webcam
 else
-  [[ "$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"
+  exit 1
 fi

bin/omarchy-cmd-screensaver

@@ -1,28 +1,31 @@
 #!/bin/bash
 
 screensaver_in_focus() {
-  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
+  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 "alacritty --class Screensaver" 2>/dev/null
+  pkill -f org.omarchy.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)
+  effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | grep -Ev '^(dev_worm)$' | sort -u | shuf -n1)
+
   tte -i ~/.config/omarchy/branding/screensaver.txt \
-    --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-    "$effect" &
+    --frame-rate 120 --canvas-width 0 --canvas-height 0 --reuse-canvas --anchor-canvas c --anchor-text c\
+    --no-eol --no-restore-cursor $effect &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3 || ! screensaver_in_focus; then
+    if read -n 1 -t 1 || ! screensaver_in_focus; then
       exit_screensaver
     fi
   done

bin/omarchy-cmd-shutdown

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

@@ -6,8 +6,10 @@ shell_pid=$(pgrep -P "$terminal_pid" | tail -n1)
 
 if [[ -n $shell_pid ]]; then
   cwd=$(readlink -f "/proc/$shell_pid/cwd" 2>/dev/null)
+  shell=$(readlink -f "/proc/$shell_pid/exe" 2>/dev/null)
 
-  if [[ -d $cwd ]]; then
+  # 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"

bin/omarchy-font-set

@@ -18,6 +18,7 @@ if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
       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 \
@@ -27,7 +28,10 @@ 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

bin/omarchy-hyprland-window-pop

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

@@ -4,7 +4,7 @@ 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"
+  hyprctl keyword "workspace $workspace_id, gapsout:10, gapsin:5, bordersize:2"
 else \
-  hyprctl keyword "workspace $workspace_id, gapsout:0, gapsin:0, border:false"
+  hyprctl keyword "workspace $workspace_id, gapsout:0, gapsin:0, bordersize:0"
 fi

bin/omarchy-install-dev-env

@@ -50,6 +50,7 @@ ruby)
   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"
   ;;

bin/omarchy-install-steam

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo "Now pick dependencies matching your graphics card"
-sudo pacman -Syu --noconfirm steam
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-install-terminal

@@ -7,15 +7,53 @@ 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
-  # Set as default terminal
-  echo "Setting $package as new default terminal..."
-  sed -i "/export TERMINAL=/ c\export TERMINAL=$package" ~/.config/uwsm/default
+  # 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=
 
-  # Restart is needed for new default to take effect
-  echo
-  gum confirm "Restart to use new terminal?" && systemctl reboot --no-wall
+[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

@@ -21,4 +21,7 @@ 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

@@ -0,0 +1,17 @@
+#!/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 +1,3 @@
 #!/bin/bash
 
-exec setsid uwsm-app -- alacritty --class=Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s'
+exec omarchy-launch-or-focus-tui "bash -c 'fastfetch; read -n 1 -s'"

bin/omarchy-launch-bluetooth

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

bin/omarchy-launch-editor

@@ -1,8 +1,10 @@
 #!/bin/bash
 
-case "${EDITOR:-nvim}" in
+omarchy-cmd-present "$EDITOR" || EDITOR=nvim
+
+case "$EDITOR" in
 nvim | vim | nano | micro | hx | helix)
-  exec setsid uwsm-app -- "$TERMINAL" -e "$EDITOR" "$@"
+  exec omarchy-launch-tui "$EDITOR" "$@"
   ;;
 *)
   exec setsid uwsm-app -- "$EDITOR" "$@"

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

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

bin/omarchy-launch-or-focus

@@ -12,5 +12,5 @@ WINDOW_ADDRESS=$(hyprctl clients -j | jq -r --arg p "$WINDOW_PATTERN" '.[]|selec
 if [[ -n $WINDOW_ADDRESS ]]; then
   hyprctl dispatch focuswindow "address:$WINDOW_ADDRESS"
 else
-  eval exec $LAUNCH_COMMAND
+  eval exec setsid $LAUNCH_COMMAND
 fi

bin/omarchy-launch-or-focus-tui

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

@@ -6,7 +6,7 @@ if ! command -v tte &>/dev/null; then
 fi
 
 # Exit early if screensave is already running
-pgrep -f "alacritty --class Screensaver" && exit 0
+pgrep -f org.omarchy.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,15 +14,36 @@ 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
 
-  # 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 \
-    -e omarchy-cmd-screensaver
+  case $terminal in
+  *Alacritty*)
+    hyprctl dispatch exec -- \
+      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-terminal

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

bin/omarchy-launch-tui

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

bin/omarchy-launch-webapp

@@ -3,7 +3,7 @@
 browser=$(xdg-settings get default-web-browser)
 
 case $browser in
-google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium-browser*) ;;
+google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi* | helium*) ;;
 *) browser="chromium.desktop" ;;
 esac
 

bin/omarchy-launch-wifi

@@ -1,3 +1,4 @@
 #!/bin/bash
 
-exec setsid uwsm-app -- "$TERMINAL" --class=Impala -e impala "$@"
+rfkill unblock wifi
+omarchy-launch-or-focus-tui impala

bin/omarchy-lock-screen

@@ -9,4 +9,4 @@ if pgrep -x "1password" >/dev/null; then
 fi
 
 # Avoid running screensaver when locked
-pkill -f "alacritty --class Screensaver"
+pkill -f org.omarchy.screensaver

bin/omarchy-menu

@@ -33,11 +33,11 @@ menu() {
     fi
   fi
 
-  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 600 -p "$prompt…" "${args[@]}" 2>/dev/null
+  echo -e "$options" | omarchy-launch-walker --dmenu --width 295 --minheight 1 --maxheight 630 -p "$prompt…" "${args[@]}" 2>/dev/null
 }
 
 terminal() {
-  alacritty --class=Omarchy -e "$@"
+  xdg-terminal-exec --app-id=org.omarchy.terminal "$@"
 }
 
 present_terminal() {
@@ -112,19 +112,19 @@ show_screenshot_menu() {
 }
 
 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 ;;
+  omarchy-cmd-screenrecord --stop-recording && exit 0
+
+  case $(menu "Screenrecord" "  With desktop audio\n  With desktop + microphone audio\n  With desktop + microphone audio + webcam") in
+  *"With desktop audio") omarchy-cmd-screenrecord --with-desktop-audio ;;
+  *"With desktop + microphone audio") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio ;;
+  *"With desktop + microphone audio + webcam") omarchy-cmd-screenrecord --with-desktop-audio --with-microphone-audio --with-webcam ;;
   *) 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" ;;
+  *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 ;;
@@ -154,12 +154,7 @@ show_style_menu() {
 }
 
 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
+  omarchy-launch-walker -m menus:omarchythemes --width 800 --minheight 400
 }
 
 show_font_menu() {
@@ -178,15 +173,9 @@ show_setup_menu() {
   options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) $TERMINAL --class=Wiremix -e wiremix ;;
-  *Wifi*)
-    rfkill unblock wifi
-    omarchy-launch-wifi
-    ;;
-  *Bluetooth*)
-    rfkill unblock bluetooth
-    blueberry
-    ;;
+  *Audio*) omarchy-launch-or-focus-tui wiremix ;;
+  *Wifi*) omarchy-launch-wifi ;;
+  *Bluetooth*) omarchy-launch-bluetooth ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
   *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
@@ -263,8 +252,8 @@ show_install_editor_menu() {
   case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) present_terminal omarchy-install-vscode ;;
   *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
-  *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
-  *Sublime*) aur_install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
+  *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;;
+  *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
   *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_menu ;;
@@ -287,11 +276,11 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  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
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Cursor CLI\n󱚤  Gemini\n󱚤  OpenAI Codex\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" ;;
+  *Cursor*) install "Cursor CLI" "cursor-cli" ;;
+  *OpenAI*) install "OpenAI Codex" "openai-codex-bin" ;;
+  *Gemini*) install "Gemini" "gemini-cli" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
@@ -301,10 +290,11 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) aur_install_and_launch "Minecraft [AUR]" "minecraft-launcher" "minecraft-launcher" ;;
+  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac
 }
@@ -395,7 +385,7 @@ show_update_menu() {
   *Hardware*) show_update_hardware_menu ;;
   *Firmware*) present_terminal omarchy-update-firmware ;;
   *Timezone*) present_terminal omarchy-tz-select ;;
-  *Time*) present_terminal omarchy-reset-time ;;
+  *Time*) present_terminal omarchy-update-time ;;
   *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
@@ -448,8 +438,8 @@ show_system_menu() {
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
   *Suspend*) systemctl suspend ;;
-  *Restart*) omarchy-state clear re*-required && systemctl reboot --no-wall ;;
-  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff --no-wall ;;
+  *Restart*) omarchy-cmd-reboot ;;
+  *Shutdown*) omarchy-cmd-shutdown ;;
   *) back_to show_main_menu ;;
   esac
 }

bin/omarchy-menu-keybindings

@@ -49,6 +49,17 @@ parse_keycodes() {
       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
@@ -101,6 +112,11 @@ dynamic_bindings() {
       -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
 #
 # `awk` does the heavy lifting:
@@ -147,13 +163,67 @@ 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 |
+{
+  dynamic_bindings
+  static_bindings
+} |
   sort -u |
   parse_keycodes |
   parse_bindings |
+  prioritize_entries |
   walker --dmenu -p 'Keybindings' --width 800 --height "$menu_height"
+

bin/omarchy-pkg-ignored

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

@@ -0,0 +1,20 @@
+#!/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
+sudo pacman -Syu --noconfirm

bin/omarchy-refresh-pacman-mirrorlist

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

bin/omarchy-refresh-walker

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

bin/omarchy-restart-terminal

@@ -4,5 +4,10 @@ if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
   touch ~/.config/alacritty/alacritty.toml
 fi
 
-killall -SIGUSR1 kitty
-killall -SIGUSR2 ghostty
+if pgrep -x kitty; then
+  killall -SIGUSR1 kitty
+fi
+
+if pgrep -x ghostty; then
+  killall -SIGUSR2 ghostty
+fi

bin/omarchy-restart-walker

@@ -12,10 +12,11 @@ if [[ $EUID -eq 0 ]]; then
   # 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 &
+      systemctl --user restart elephant.service
+      setsid walker --gapplication-service &
     "
 else
-  setsid uwsm-app -- elephant &
-  setsid uwsm-app -- walker --gapplication-service &
+  elephant service enable 2>/dev/null
+  systemctl --user restart elephant.service
+  setsid walker --gapplication-service &
 fi

bin/omarchy-setup-fingerprint

@@ -51,6 +51,16 @@ 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
@@ -71,6 +81,9 @@ 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
@@ -90,6 +103,9 @@ 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-theme-set

@@ -28,12 +28,12 @@ if pgrep -x waybar >/dev/null; then
   omarchy-restart-waybar
 fi
 omarchy-restart-swayosd
+omarchy-restart-terminal
 hyprctl reload
 pkill -SIGUSR2 btop
 makoctl reload
 
 # Change gnome, browser, vscode, cursor themes
-omarchy-theme-set-terminal
 omarchy-theme-set-gnome
 omarchy-theme-set-browser
 omarchy-theme-set-vscode

bin/omarchy-theme-set-browser

@@ -23,11 +23,6 @@ if omarchy-cmd-present chromium || omarchy-cmd-present helium-browser || omarchy
     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

bin/omarchy-theme-set-obsidian

@@ -87,6 +87,35 @@ calculate_brightness() {
   echo $(((r * 299 + g * 587 + b * 114) / 1000))
 }
 
+# Calculate approximate contrast ratio between two colors
+# Returns ratio scaled by 100 (e.g., 450 = 4.5:1 ratio)
+# (this is due to bash not supporting decimal math)
+calculate_contrast_ratio() {
+  local hex1="$1" hex2="$2"
+  local br1=$(calculate_brightness "$hex1")  # 0-255 range
+  local br2=$(calculate_brightness "$hex2")  # 0-255 range
+
+  # Ensure br1 is the lighter color (higher brightness)
+  if [ $br1 -lt $br2 ]; then
+    local temp=$br1
+    br1=$br2
+    br2=$temp
+  fi
+
+  # Approximate contrast ratio scaled by 100
+  # Add offset to avoid division by zero and approximate WCAG +0.05 behavior
+  echo $(((br1 + 13) * 100 / (br2 + 13)))
+}
+
+# Check if two colors meet minimum contrast threshold
+# Usage: meets_contrast_threshold <ratio> <threshold>
+# Both ratio and threshold should be scaled by 100 (e.g., 300 = 3:1)
+meets_contrast_threshold() {
+  local ratio="$1"        # Ratio scaled by 100 (from calculate_contrast_ratio)
+  local threshold="$2"    # Threshold scaled by 100 (300=3:1, 450=4.5:1, 700=7:1)
+  [ $ratio -ge $threshold ]
+}
+
 # Calculate color distance (euclidean in RGB space)
 color_distance() {
   local hex1="$1"
@@ -229,38 +258,30 @@ extract_theme_data() {
     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")
+  # Generate code background color that will contrast with foreground text
+  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")
+
 
   # Find closest color to foreground for code block text
   local code_fg=""
@@ -345,6 +366,22 @@ extract_theme_data() {
     border_color=$(printf "#%02x%02x%02x" "$r" "$g" "$b")
   fi
 
+  # Set text colors for muted/faint based on contrast
+  local text_muted_color="$border_color"
+  local text_faint_color="$border_color"
+
+  # Validate border color contrast against background
+
+  # Represents a 3:1 WCAG contrast ratio
+  local ideal_contrast_ratio=300
+
+  local border_contrast=$(calculate_contrast_ratio "$border_color" "$bg_color")
+  if ! meets_contrast_threshold "$border_contrast" "$ideal_contrast_ratio"; then
+    # Override text colors for readability, keep border color for visibility
+    text_muted_color="$fg_color"
+    text_faint_color="$fg_color"
+  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)
@@ -354,7 +391,7 @@ extract_theme_data() {
   readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
 
   # Extract fonts
-  local monospace_font="CaskaydiaMono Nerd Font"
+  local monospace_font="JetBrainsMono Nerd Font"
   local ui_font="Liberation Sans"
 
   if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
@@ -409,8 +446,8 @@ extract_theme_data() {
   --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 */
+  --text-muted: $text_muted_color;  /* Use text-specific color for muted text */
+  --text-faint: $text_faint_color;  /* Use text-specific color for faint text */
 
   /* Additional mappings */
   --text-accent: var(--interactive-accent);

bin/omarchy-tui-install

@@ -5,7 +5,7 @@ if [ "$#" -ne 4 ]; then
   APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
   APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
   WINDOW_STYLE=$(gum choose --header "Window style" float tile)
-  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG or SVG!)")
 else
   APP_NAME="$1"
   APP_EXEC="$2"
@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
+Exec=xdg-terminal-exec --app-id=$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=.*$TERMINAL.*-e' "$file"; then
+    if grep -qE '^Exec=.*(\$TERMINAL|xdg-terminal-exec).*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)

bin/omarchy-update

@@ -4,6 +4,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-update-perform
+if omarchy-update-confirm; then
+  omarchy-snapshot create || [ $? -eq 127 ]
+  omarchy-update-git
+  omarchy-update-perform
+fi

bin/omarchy-update-confirm

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+gum style --border normal --border-foreground 6 --padding "1 2" \
+  "Ready to update Omarchy?" \
+  "" \
+  "• You cannot stop the update once you start!" \
+  "• Make sure you're connected to power or have a full battery"
+
+if ! gum confirm "Continue with update?"; then
+  echo "Update cancelled"
+  exit 1
+fi

bin/omarchy-update-keyring

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Ensure we have the omarchy-keyring and it's populated
+if omarchy-pkg-missing omarchy-keyring || ! sudo pacman-key --list-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 &>/dev/null; then
+  sudo pacman-key --recv-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571 --keyserver keys.openpgp.org
+  sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571
+
+  # This is generally not a good idea, but this is a special case because we're going to be updating
+  # the full set of packages in omarchy-update-system-pkgs right after this (and it needs latest keyring)!
+  sudo pacman -Sy
+  omarchy-pkg-add omarchy-keyring
+
+  sudo pacman-key --list-keys 40DFB630FF42BCFFB047046CF0134EE680CAC571
+fi

bin/omarchy-update-perform

@@ -2,6 +2,8 @@
 
 set -e
 
+omarchy-update-time
+omarchy-update-keyring
 omarchy-update-available-reset
 omarchy-update-system-pkgs
 omarchy-migrate

bin/omarchy-update-system-pkgs

@@ -2,20 +2,14 @@
 
 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)
-
 echo -e "\e[32m\nUpdate system packages\e[0m"
-[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
-sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+sudo pacman -Syu --noconfirm
 
 # Update AUR packages if any are installed
 if pacman -Qem >/dev/null; then
   if omarchy-pkg-aur-accessible; then
     echo -e "\e[32m\nUpdate AUR packages\e[0m"
-    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
-    yay -Sua --noconfirm --ignore "$ignored_packages"
+    yay -Sua --noconfirm
     echo
   else
     echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

bin/omarchy-version-channel

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if grep -q "https://stable-mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
+  mirror="stable"
+elif grep -q "https://mirror.omarchy.org/" /etc/pacman.d/mirrorlist; then
+  mirror="edge"
+else
+  mirror="unknown"
+fi
+
+if grep -q "https://pkgs.omarchy.org/stable/" /etc/pacman.conf; then
+  pkgs="stable"
+elif grep -q "https://pkgs.omarchy.org/edge/" /etc/pacman.conf; then
+  pkgs="edge"
+else
+  pkgs="unknown"
+fi
+
+if [[ $mirror == $pkgs ]]; then
+  echo $mirror
+else
+  echo "$mirror / $pkgs"
+fi

bin/omarchy-version-pkgs

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+date -d "$(grep upgraded /var/log/pacman.log | tail -1 | sed -E 's/\[([^]]+)\].*/\1/')" "+%A, %B %d %Y at %H:%M"

bin/omarchy-webapp-remove

@@ -30,7 +30,7 @@ else
 fi
 
 if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
-  echo "You must provide web app names."
+  echo "You must select at least one web app to remove."
   exit 1
 fi
 

bin/omarchy-windows-vm

@@ -327,7 +327,7 @@ To stop: omarchy-windows-vm stop"
     "$LIFECYCLE"
 
   # Detect display scale from Hyprland
-  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[0].scale')
+  HYPR_SCALE=$(hyprctl monitors -j | jq -r '.[] | select (.focused == true) | .scale')
   SCALE_PERCENT=$(echo "$HYPR_SCALE" | awk '{print int($1 * 100)}')
 
   RDP_SCALE=""

config/alacritty/alacritty.toml

@@ -4,9 +4,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
 TERM = "xterm-256color"
 
 [font]
-normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
-bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
-italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
+normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
+bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
+italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
 size = 9
 
 [window]

config/brave-flags.conf

@@ -1,5 +1,6 @@
 --ozone-platform=wayland
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
+--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
 # Chromium crash workaround for Wayland color management on Hyprland - see https://github.com/hyprwm/Hyprland/issues/11957
 --disable-features=WaylandWpColorManagerV1

config/fastfetch/config.jsonc

@@ -74,6 +74,12 @@
       "keyColor": "blue",
       "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
+    {
+      "type": "command",
+      "key": "│ ├󰔫",
+      "keyColor": "blue",
+      "text": "channel=$(omarchy-version-channel); echo \"$channel\""
+    },
     {
       "type": "kernel",
       "key": "│ ├",
@@ -122,7 +128,7 @@
     "break",
     {
       "type": "custom",
-      "format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
+      "format": "\u001b[90m┌────────────────Age / Uptime / Update───────────────┐"
     },
     {
       "type": "command",
@@ -135,6 +141,12 @@
       "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
+    {
+      "type": "command",
+      "key": " Update",
+      "keyColor": "magenta",
+      "text": "updated=$(omarchy-version-pkgs); echo \"$updated\""
+    },
     {
       "type": "custom",
       "format": "\u001b[90m└────────────────────────────────────────────────────┘"

config/fcitx5/conf/clipboard.conf

@@ -0,0 +1,2 @@
+TriggerKey=
+PastePrimaryKey=

config/fontconfig/fonts.conf

@@ -24,7 +24,7 @@
       <string>monospace</string>
     </test>
     <edit name="family" mode="assign" binding="strong">
-      <string>CaskaydiaMono Nerd Font</string>
+      <string>JetBrainsMono Nerd Font</string>
     </edit>
   </match>
 

config/ghostty/config

@@ -2,7 +2,7 @@
 config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
-font-family = "CaskaydiaMono Nerd Font"
+font-family = "JetBrainsMono Nerd Font"
 font-style = Regular
 font-size = 9
 
@@ -17,11 +17,18 @@ gtk-toolbar-style = flat
 # Cursor styling
 cursor-style = "block"
 cursor-style-blink = false
-shell-integration-features = no-cursor
+
+# Cursor styling + SSH session terminfo
+# (all shell integration options must be passed together)
+shell-integration-features = no-cursor,ssh-env
 
 # Keyboard bindings
 keybind = shift+insert=paste_from_clipboard
 keybind = control+insert=copy_to_clipboard
+keybind = super+control+shift+alt+arrow_down=resize_split:down,100
+keybind = super+control+shift+alt+arrow_up=resize_split:up,100
+keybind = super+control+shift+alt+arrow_left=resize_split:left,100
+keybind = super+control+shift+alt+arrow_right=resize_split:right,100
 
-# SSH session terminfo
-shell-integration-features = ssh-env
+# Slowdown mouse scrolling
+mouse-scroll-multiplier = 0.95

config/git/config

@@ -0,0 +1,28 @@
+# See https://git-scm.com/docs/git-config
+
+[alias]
+	co = checkout
+	br = branch
+	ci = commit
+	st = status
+[init]
+	defaultBranch = master
+[pull]
+	rebase = true 			 # Rebase (instead of merge) on pull
+[push]
+	autoSetupRemote = true   # Automatically set upstream branch on push
+[diff]
+	algorithm = histogram    # Clearer diffs on moved/edited lines
+	colorMoved = plain       # Highlight moved blocks in diffs
+	mnemonicPrefix = true    # More intuitive refs in diff output
+[commit]
+	verbose = true           # Include diff comment in commit message template
+[column]
+	ui = auto 			     # Output in columns when possible
+[branch]
+	sort = -committerdate    # Sort branches by most recent commit first
+[tag]
+	sort = -version:refname  # Sort version numbers as you would expect
+[rerere]
+	enabled = true           # Record and reuse conflict resolutions
+	autoupdate = true        # Apply stored conflict resolutions automatically

config/hypr/bindings.conf

@@ -1,18 +1,15 @@
 # Application bindings
-$terminal = uwsm-app -- $TERMINAL
-$browser = omarchy-launch-browser
-
-bindd = SUPER, RETURN, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
+bindd = SUPER, RETURN, Terminal, exec, uwsm-app -- xdg-terminal-exec --dir="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER SHIFT, F, File manager, exec, uwsm-app -- nautilus --new-window
-bindd = SUPER SHIFT, B, Browser, exec, $browser
-bindd = SUPER SHIFT ALT, B, Browser (private), exec, $browser --private
+bindd = SUPER SHIFT, B, Browser, exec, omarchy-launch-browser
+bindd = SUPER SHIFT ALT, B, Browser (private), exec, omarchy-launch-browser --private
 bindd = SUPER SHIFT, M, Music, exec, omarchy-launch-or-focus spotify
 bindd = SUPER SHIFT, N, Editor, exec, omarchy-launch-editor
-bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
-bindd = SUPER SHIFT, D, Docker, exec, $terminal -e lazydocker
-bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus signal "uwsm-app -- signal-desktop"
-bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus "^obsidian$" "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
-bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora
+bindd = SUPER SHIFT, T, Activity, exec, omarchy-launch-tui btop
+bindd = SUPER SHIFT, D, Docker, exec, omarchy-launch-tui lazydocker
+bindd = SUPER SHIFT, G, Signal, exec, omarchy-launch-or-focus ^signal$ "uwsm-app -- signal-desktop"
+bindd = SUPER SHIFT, O, Obsidian, exec, omarchy-launch-or-focus ^obsidian$ "uwsm-app -- obsidian -disable-gpu --enable-wayland-ime"
+bindd = SUPER SHIFT, W, Typora, exec, uwsm-app -- typora --enable-wayland-ime
 bindd = SUPER SHIFT, SLASH, Passwords, exec, uwsm-app -- 1password
 
 # If your web app url contains #, type it as ## to prevent hyprland treating it as a comment

config/hypr/envs.conf

@@ -1,2 +0,0 @@
-# Extra env variables
-# env = MY_GLOBAL_ENV,setting

config/hypr/hyprland.conf

@@ -16,7 +16,6 @@ source = ~/.config/omarchy/current/theme/hyprland.conf
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/input.conf
 source = ~/.config/hypr/bindings.conf
-source = ~/.config/hypr/envs.conf
 source = ~/.config/hypr/looknfeel.conf
 source = ~/.config/hypr/autostart.conf
 

config/hypr/hyprlock.conf

@@ -22,10 +22,10 @@ input-field {
     outer_color = $outer_color
     outline_thickness = 4
 
-    font_family = CaskaydiaMono Nerd Font Propo
+    font_family = JetBrainsMono Nerd Font
     font_color = $font_color
 
-    placeholder_text = Enter Password 󰈷
+    placeholder_text = Enter Password
     check_color = $check_color
     fail_text = <i>$FAIL ($ATTEMPTS)</i>
 

config/hypr/hyprsunset.conf

@@ -5,7 +5,9 @@ profile {
     identity = true
 }
 
-# Enable auto switch to nightlight:
+# To enable auto switch to nightlight, set in your .config/hypr/autostart:
+# exec-once = uwsm app -- hyprsunset
+# and use the following:
 # profile {
 #     time = 20:00
 #     temperature = 4000

config/hypr/input.conf

@@ -3,7 +3,7 @@
 input {
   # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
   # kb_layout = us,dk,eu
-  kb_options = compose:caps # ,grp:shifts_toggle
+  kb_options = compose:caps # ,grp:alts_toggle
 
   # Change speed of keyboard repeat
   repeat_rate = 40

config/hypr/looknfeel.conf

@@ -2,9 +2,10 @@
 
 # https://wiki.hyprland.org/Configuring/Variables/#general
 general {
-    # No gaps between windows
+    # No gaps between windows or borders
     # gaps_in = 0
     # gaps_out = 0
+    # border_size = 0
 
     # Use master layout instead of dwindle
     # layout = master

config/hypr/monitors.conf

@@ -8,7 +8,7 @@ monitor=,preferred,auto,auto
 
 # Good compromise for 27" or 32" 4K monitors (but fractional!)
 # env = GDK_SCALE,1.75
-# monitor=,preferred,auto,1.666667
+# monitor=,preferred,auto,1.6
 
 # Straight 1x setup for low-resolution displays like 1080p or 1440p
 # env = GDK_SCALE,1

config/hypr/xdph.conf

@@ -0,0 +1,3 @@
+screencopy {
+    allow_token_by_default = true
+}

config/imv/config

@@ -0,0 +1,13 @@
+[binds]
+
+# Print the current image file
+<Ctrl+p> = exec lp "$imv_current_file"
+
+# Delete the current image and quit the viewer
+<Ctrl+x> = exec rm "$imv_current_file"; quit
+
+# Delete the current image and move to the next one
+<Ctrl+Shift+X> = exec rm "$imv_current_file"; close
+
+# Rotate the currently open image by 90 degrees
+<Ctrl+r> = exec mogrify -rotate 90 "$imv_current_file"

config/kitty/kitty.conf

@@ -1,7 +1,7 @@
 include ~/.config/omarchy/current/theme/kitty.conf
 
 # Font
-font_family CaskaydiaMono Nerd Font
+font_family JetBrainsMono Nerd Font
 bold_italic_font auto
 font_size        9.0
 

config/swayosd/style.css

@@ -9,7 +9,7 @@ window {
 }
 
 label {
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 11pt;
 
   color: @label;

config/uwsm/default

@@ -1,7 +1,7 @@
 # Changes require a restart to take effect.
 
 # Install other terminals via Install > Terminal
-export TERMINAL=alacritty
+export TERMINAL=xdg-terminal-exec
 
 # Use code for VSCode
 export EDITOR=nvim

config/uwsm/env

@@ -2,7 +2,7 @@
 
 # Ensure Omarchy bins are in the path
 export OMARCHY_PATH=$HOME/.local/share/omarchy
-export PATH=$OMARCHY_PATH/bin/:$PATH
+export PATH=$OMARCHY_PATH/bin:$PATH
 
 # Set default terminal and editor
 source ~/.config/uwsm/default

config/walker/config.toml

@@ -1,41 +1,21 @@
 force_keyboard_focus = true                                                 # forces keyboard forcus to stay in Walker
-close_when_open = true                                                      # close walker when invoking while already opened
 selection_wrap = true                                                       # wrap list if at bottom or top
-click_to_close = true                                                       # closes walker if clicking outside of the main content area
-global_argument_delimiter = "#"                                             # query: firefox#https://benz.dev => part after delimiter will be ignored when querying. this should be the same as in the elephant config
-exact_search_prefix = "'"                                                   # disable fuzzy searching
 theme = "omarchy-default"                                                   # theme to use
-disable_mouse = false                                                       # disable mouse (on input and list only)
 additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
-
-[shell]
-anchor_top = true
-anchor_bottom = true
-anchor_left = true
-anchor_right = true
+hide_action_hints = true                                                    # globally hide the action hints
 
 [placeholders]
 "default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
 
 [keybinds]
-close = ["Escape"]
-next = ["Down"]
-previous = ["Up"]
-toggle_exact = ["ctrl e"]
-resume_last_query = ["ctrl r"]
 quick_activate = []
 
 [providers]
+max_results = 256 # 256 should be enough for everyone
 default = [
   "desktopapplications",
-  "menus",
   "websearch",
 ] # providers to be queried by default
-empty = ["desktopapplications"] # providers to be queried when query is empty
-max_results = 50 # global max results
-
-[providers.sets] # define your own defaults/empty sets of providers
-[providers.max_results_provider] # define max results per provider in here
 
 [[providers.prefixes]]
 prefix = "/"
@@ -60,86 +40,3 @@ provider = "websearch"
 [[providers.prefixes]]
 prefix = "$"
 provider = "clipboard"
-
-[providers.actions] # This will be MERGED/OVEWRITTEN with what the user specifies
-dmenu = [{ action = "select", default = true, bind = "Return" }]
-
-providerlist = [
-  { action = "activate", default = true, bind = "Return", after = "ClearReload" },
-]
-
-bluetooth = [
-  { action = "find", global = true, bind = "ctrl f", after = "AsyncClearReload" },
-  { action = "trust", bind = "ctrl t", after = "AsyncReload" },
-  { action = "untrust", bind = "ctrl t", after = "AsyncReload" },
-  { action = "pair", bind = "Return", after = "AsyncReload" },
-  { action = "remove", bind = "ctrl d", after = "AsyncReload" },
-  { action = "connect", bind = "Return", after = "AsyncReload" },
-  { action = "disconnect", bind = "Return", after = "AsyncReload" },
-]
-
-archlinuxpkgs = [
-  { action = "install", bind = "Return", default = true },
-  { action = "remove", bind = "Return" },
-]
-
-calc = [
-  { action = "copy", default = true, bind = "Return" },
-  { action = "delete", bind = "ctrl d", after = "AsyncReload" },
-  { action = "save", bind = "ctrl s", after = "AsyncClearReload" },
-]
-
-websearch = [
-  { action = "search", default = true, bind = "Return" },
-  { action = "erase_history", label = "clear hist", bind = "ctrl h", after = "Reload" },
-]
-
-desktopapplications = [
-  { action = "start", default = true, bind = "Return" },
-  { action = "start:keep", label = "open+next", bind = "shift Return", after = "KeepOpen" },
-  { action = "erase_history", label = "clear hist", bind = "ctrl h", after = "AsyncReload" },
-  { action = "pin", bind = "ctrl p", after = "AsyncReload" },
-  { action = "unpin", bind = "ctrl p", after = "AsyncReload" },
-  { action = "pinup", bind = "ctrl n", after = "AsyncReload" },
-  { action = "pindown", bind = "ctrl m", after = "AsyncReload" },
-]
-
-files = [
-  { action = "open", default = true, bind = "Return" },
-  { action = "opendir", label = "open dir", bind = "ctrl Return" },
-  { action = "copypath", label = "copy path", bind = "ctrl shift c" },
-  { action = "copyfile", label = "copy file", bind = "ctrl c" },
-]
-
-todo = [
-  { action = "save", default = true, bind = "Return", after = "ClearReload" },
-  { action = "delete", bind = "ctrl d", after = "ClearReload" },
-  { action = "active", bind = "Return", after = "ClearReload" },
-  { action = "inactive", bind = "Return", after = "ClearReload" },
-  { action = "done", bind = "ctrl f", after = "ClearReload" },
-  { action = "clear", bind = "ctrl x", after = "ClearReload", global = true },
-]
-
-runner = [
-  { action = "run", default = true, bind = "Return" },
-  { action = "runterminal", label = "run in terminal", bind = "shift Return" },
-  { action = "erase_history", label = "clear hist", bind = "ctrl h", after = "Reload" },
-]
-
-symbols = [
-  { action = "run_cmd", label = "select", default = true, bind = "Return" },
-  { action = "erase_history", label = "clear hist", bind = "ctrl h", after = "Reload" },
-]
-
-unicode = [
-  { action = "run_cmd", label = "select", default = true, bind = "Return" },
-  { action = "erase_history", label = "clear hist", bind = "ctrl h", after = "Reload" },
-]
-
-clipboard = [
-  { action = "copy", default = true, bind = "Return" },
-  { action = "remove", bind = "ctrl d", after = "ClearReload" },
-  { action = "remove_all", global = true, label = "clear", bind = "ctrl shift d", after = "ClearReload" },
-  { action = "toggle_images", global = true, label = "toggle images", bind = "ctrl i", after = "ClearReload" },
-  { action = "edit", bind = "ctrl o" },
-]

config/waybar/config.jsonc

@@ -28,6 +28,7 @@
       "7": "7",
       "8": "8",
       "9": "9",
+      "10": "0",
       "active": "󱓻"
     },
     "persistent-workspaces": {
@@ -41,7 +42,7 @@
   "custom/omarchy": {
     "format": "<span font='omarchy'>\ue900</span>",
     "on-click": "omarchy-menu",
-    "on-click-right": "omarchy-launch-terminal",
+    "on-click-right": "xdg-terminal-exec",
     "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
   },
   "custom/update": {
@@ -50,13 +51,13 @@
     "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
     "tooltip-format": "Omarchy update available",
     "signal": 7,
-    "interval": 3600
+    "interval": 21600
   },
 
   "cpu": {
     "interval": 5,
     "format": "󰍛",
-    "on-click": "$TERMINAL -e btop"
+    "on-click": "omarchy-launch-or-focus-tui btop"
   },
   "clock": {
     "format": "{:L%A %H:%M}",
@@ -99,13 +100,14 @@
   "bluetooth": {
     "format": "",
     "format-disabled": "󰂲",
-    "format-connected": "",
+    "format-connected": "󰂱",
+    "format-no-controller": "",
     "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "blueberry"
+    "on-click": "omarchy-launch-bluetooth"
   },
   "pulseaudio": {
     "format": "{icon}",
-    "on-click": "$TERMINAL --class=Wiremix -e wiremix",
+    "on-click": "omarchy-launch-or-focus-tui wiremix",
     "on-click-right": "pamixer -t",
     "tooltip-format": "Playing at {volume}%",
     "scroll-step": 5,
@@ -123,7 +125,7 @@
     "modules": ["custom/expand-icon", "tray"]
   },
   "custom/expand-icon": {
-    "format": "",
+    "format": "",
     "tooltip": false
   },
   "custom/screenrecording-indicator": {

config/waybar/style.css

@@ -7,7 +7,7 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 12px;
 }
 
@@ -53,7 +53,7 @@
 }
 
 #custom-expand-icon {
-  margin-right: 20px;
+  margin-right: 18px;
 }
 
 tooltip {

config/xdg-terminals.list

@@ -0,0 +1,3 @@
+# Terminal emulator preference order for xdg-terminal-exec
+# The first found and valid terminal will be used
+com.mitchellh.ghostty.desktop

default/bash/aliases

@@ -1,19 +1,26 @@
 # File system
-alias ls='eza -lh --group-directories-first --icons=auto'
-alias lsa='ls -a'
-alias lt='eza --tree --level=2 --long --icons --git'
-alias lta='lt -a'
+if command -v eza &> /dev/null; then
+  alias ls='eza -lh --group-directories-first --icons=auto'
+  alias lsa='ls -a'
+  alias lt='eza --tree --level=2 --long --icons --git'
+  alias lta='lt -a'
+fi
+
 alias ff="fzf --preview 'bat --style=numbers --color=always {}'"
-alias cd="zd"
-zd() {
-  if [ $# -eq 0 ]; then
-    builtin cd ~ && return
-  elif [ -d "$1" ]; then
-    builtin cd "$1"
-  else
-    z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
-  fi
-}
+
+if command -v zoxide &> /dev/null; then
+  alias cd="zd"
+  zd() {
+    if [ $# -eq 0 ]; then
+      builtin cd ~ && return
+    elif [ -d "$1" ]; then
+      builtin cd "$1"
+    else
+      z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
+    fi
+  }
+fi
+
 open() {
   xdg-open "$@" >/dev/null 2>&1 &
 }

default/bash/functions

@@ -15,7 +15,7 @@ iso2sd() {
   fi
 }
 
-# Format an entire drive for a single partition using ext4
+# Format an entire drive for a single partition using exFAT
 format-drive() {
   if [ $# -ne 2 ]; then
     echo "Usage: format-drive <device> <name>"
@@ -25,14 +25,20 @@ format-drive() {
   else
     echo "WARNING: This will completely erase all data on $1 and label it '$2'."
     read -rp "Are you sure you want to continue? (y/N): " confirm
+
     if [[ "$confirm" =~ ^[Yy]$ ]]; then
       sudo wipefs -a "$1"
       sudo dd if=/dev/zero of="$1" bs=1M count=100 status=progress
       sudo parted -s "$1" mklabel gpt
-      sudo parted -s "$1" mkpart primary ext4 1MiB 100%
-      sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
-      sudo chmod -R 777 "/run/media/$USER/$2"
-      echo "Drive $1 formatted and labeled '$2'."
+      sudo parted -s "$1" mkpart primary 1MiB 100%
+
+      partition="$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
+      sudo partprobe "$1" || true
+      sudo udevadm settle || true
+
+      sudo mkfs.exfat -n "$2" "$partition"
+
+      echo "Drive $1 formatted as exFAT and labeled '$2'."
     fi
   fi
 }
@@ -49,19 +55,28 @@ transcode-video-4K() {
 
 # Transcode any image to JPG image that's great for shrinking wallpapers
 img2jpg() {
-  magick $1 -quality 95 -strip ${1%.*}.jpg
+  img="$1"
+  shift
+
+  magick "$img" $@ -quality 95 -strip ${img%.*}-optimized.jpg
 }
 
 # Transcode any image to JPG image that's great for sharing online without being too big
 img2jpg-small() {
-  magick $1 -resize 1080x\> -quality 95 -strip ${1%.*}.jpg
+  img="$1"
+  shift
+
+  magick "$img" $@ -resize 1080x\> -quality 95 -strip ${img%.*}-optimized.jpg
 }
 
 # Transcode any image to compressed-but-lossless PNG
 img2png() {
-  magick "$1" -strip -define png:compression-filter=5 \
+  img="$1"
+  shift
+
+  magick "$img" $@ -strip -define png:compression-filter=5 \
     -define png:compression-level=9 \
     -define png:compression-strategy=1 \
     -define png:exclude-chunk=all \
-    "${1%.*}.png"
+    "${img%.*}-optimized.png"
 }

default/bash/init

@@ -10,6 +10,10 @@ if command -v zoxide &> /dev/null; then
   eval "$(zoxide init bash)"
 fi
 
+if command -v try &> /dev/null; then
+  eval "$(try init ~/Work/tries)"
+fi
+
 if command -v fzf &> /dev/null; then
   if [[ -f /usr/share/fzf/completion.bash ]]; then
     source /usr/share/fzf/completion.bash

default/bash/prompt

@@ -1,7 +0,0 @@
-# Technicolor dreams
-force_color_prompt=yes
-color_prompt=yes
-
-# Simple prompt with path in the window/pane title and caret for typing line
-PS1=$'\uf0a9 '
-PS1="\[\e]0;\w\a\]$PS1"

default/bash/rc

@@ -1,7 +1,6 @@
 source ~/.local/share/omarchy/default/bash/shell
 source ~/.local/share/omarchy/default/bash/aliases
 source ~/.local/share/omarchy/default/bash/functions
-source ~/.local/share/omarchy/default/bash/prompt
 source ~/.local/share/omarchy/default/bash/init
 source ~/.local/share/omarchy/default/bash/envs
 [[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc

default/elephant/omarchy_themes.lua

@@ -0,0 +1,70 @@
+--
+-- Dynamic Omarchy Theme Menu for Elephant/Walker
+--
+Name = "omarchythemes"
+NamePretty = "Omarchy Themes"
+
+-- The main function elephant will call
+function GetEntries()
+  local entries = {}
+  local theme_dir = os.getenv("HOME") .. "/.config/omarchy/themes"
+
+  -- First, get all theme directories
+  local find_dirs_cmd = "find -L '" .. theme_dir .. "' -mindepth 1 -maxdepth 1 -type d 2>/dev/null"
+
+  local handle = io.popen(find_dirs_cmd)
+  if not handle then
+    return entries
+  end
+
+  for theme_path in handle:lines() do
+    local theme_name = theme_path:match(".*/(.+)$")
+
+    if theme_name then
+      -- find preview image
+      local find_preview_cmd = "find -L '"
+        .. theme_path
+        .. "' -maxdepth 1 -type f \\( -name 'preview.png' -o -name 'preview.jpg' \\) 2>/dev/null | head -n 1"
+      local preview_handle = io.popen(find_preview_cmd)
+      local preview_path = nil
+
+      if preview_handle then
+        preview_path = preview_handle:read("*l")
+        preview_handle:close()
+      end
+
+      -- If no preview found, use first image from backgrounds folder
+      if not preview_path or preview_path == "" then
+        local bg_cmd = "find -L '"
+          .. theme_path
+          .. "/backgrounds' -maxdepth 1 -type f \\( -iname '*.png' -o -iname '*.jpg' -o -iname '*.jpeg' \\) 2>/dev/null | head -n 1"
+        local bg_handle = io.popen(bg_cmd)
+        if bg_handle then
+          preview_path = bg_handle:read("*l")
+          bg_handle:close()
+        end
+      end
+
+      if preview_path and preview_path ~= "" then
+        local display_name = theme_name:gsub("_", " "):gsub("%-", " ")
+        display_name = display_name:gsub("(%a)([%w_']*)", function(first, rest)
+          return first:upper() .. rest:lower()
+        end)
+        display_name = display_name .. "  "
+
+        table.insert(entries, {
+          Text = display_name,
+          Preview = preview_path,
+          PreviewType = "file",
+          Actions = {
+            activate = "omarchy-theme-set " .. theme_name,
+          },
+        })
+      end
+    end
+  end
+
+  handle:close()
+  return entries
+end
+

default/ghostty/screensaver

@@ -0,0 +1,3 @@
+window-padding-x = 0
+window-padding-y = 0
+window-padding-color = "extend-always"

default/hypr/apps/1password.conf

@@ -1 +1,2 @@
-windowrule = noscreenshare, class:^(1Password)$
+windowrule = noscreenshare, class:^(1[p|P]assword)$
+windowrule = tag +floating-window, class:^(1[p|P]assword)$

default/hypr/apps/browser.conf

@@ -1,5 +1,5 @@
 # Browser types
-windowrule = tag +chromium-based-browser, class:((google-)?[cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable|helium)
+windowrule = tag +chromium-based-browser, class:((google-)?[cC]hrom(e|ium)|[bB]rave-browser|[mM]icrosoft-edge|Vivaldi-stable|helium)
 windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
 
 # Force chromium-based browsers into a tile to deal with --app bug

default/hypr/apps/davinci-resolve.conf

@@ -0,0 +1,2 @@
+# Focus floating DaVinci Resolve dialog windows
+windowrule = stayfocused, class:.*[Rr]esolve.*, floating:1

default/hypr/apps/jetbrains.conf

@@ -1,6 +1,22 @@
-# Fixing popup size issue
-windowrule = size 50% 50%, class:(.*jetbrains.*)$, title:^$,floating:1
+# Fix splash screen showing in weird places and prevent annoying focus takeovers
+windowrule = tag +jetbrains-splash, class:^(jetbrains-.*)$, title:^(splash)$, floating:1
+windowrule = center, tag:jetbrains-splash
+windowrule = nofocus, tag:jetbrains-splash
+windowrule = noborder, tag:jetbrains-splash
 
-# Fix tab dragging (always have a single space character as their title)
-windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^\\s$
-windowrule = nofocus, class:^(.*jetbrains.*)$, title:^\\s$
+# Center popups/find windows
+windowrule = tag +jetbrains, class:^(jetbrains-.*), title:^()$, floating:1
+windowrule = center, tag:jetbrains
+
+# Enabling this makes it possible to provide input in popup dialogs (search window, new file, etc.)
+windowrule = stayfocused, tag:jetbrains
+windowrule = noborder, tag:jetbrains
+
+# For some reason tag:jetbrains does not work for size rule
+windowrule = size >50% >50%, class:^(jetbrains-.*), title:^()$, floating:1
+
+# Disable window flicker when autocomplete or tooltips appear
+windowrule = noinitialfocus, class:^(jetbrains-.*)$, title:^(win.*)$, floating:1
+
+# Disable mouse focus
+windowrule = nofollowmouse, class:^(jetbrains-.*)$

default/hypr/apps/pip.conf

@@ -1,5 +1,5 @@
 # Picture-in-picture overlays
-windowrule = tag +pip, title:(Picture.{0,1}in.{0,1}[Pp]icture)
+windowrule = tag +pip, title:(Picture.?in.?[Pp]icture)
 windowrule = float, tag:pip
 windowrule = pin, tag:pip
 windowrule = size 600 338, tag:pip

default/hypr/apps/system.conf

@@ -1,14 +1,17 @@
 # Floating windows
 windowrule = float, tag:floating-window
 windowrule = center, tag:floating-window
-windowrule = size 800 600, tag:floating-window
+windowrule = size 875 600, tag:floating-window
 
-windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
-windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files)
+windowrule = tag +floating-window, class:(org.omarchy.bluetui|org.omarchy.impala|org.omarchy.wiremix|org.omarchy.btop|org.omarchy.terminal|org.omarchy.bash|org.gnome.NautilusPreviewer|org.gnome.Evince|com.gabm.satty|Omarchy|About|TUI.float|imv|mpv)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open [F|f]older.*|Save.*Files?|Save.*As|Save|All Files|.*wants to [open|save].*|[C|c]hoose.*)
 windowrule = float, class:org.gnome.Calculator
 
 # Fullscreen screensaver
-windowrule = fullscreen, class:Screensaver
+windowrule = fullscreen, class:org.omarchy.screensaver
 
 # No transparency on media windows
 windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
+
+# Popped window rounding
+windowrule = rounding 8, tag:pop

default/hypr/autostart.conf

@@ -6,5 +6,7 @@ exec-once = uwsm-app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm-app -- swayosd-server
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = omarchy-cmd-first-run
-exec-once = uwsm-app -- elephant
-exec-once = uwsm-app -- walker --gapplication-service
+
+# Slow app launch fix -- set systemd vars
+exec-once = systemctl --user import-environment $(env | cut -d'=' -f 1)
+exec-once = dbus-update-activation-environment --systemd --all

default/hypr/bindings/clipboard.conf

@@ -1,5 +1,5 @@
 # Copy / Paste
-bindd = SUPER, C, Copy, sendshortcut, CTRL, Insert,
-bindd = SUPER, V, Paste, sendshortcut, SHIFT, Insert,
-bindd = SUPER, X, Cut, sendshortcut, CTRL, X,
-bindd = SUPER CTRL, V, Clipboard, exec, omarchy-launch-walker -m clipboard
+bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert,
+bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert,
+bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X,
+bindd = SUPER CTRL, V, Clipboard manager, exec, omarchy-launch-walker -m clipboard