Merge branch 'dev' into sddm-uki-changes

* Fix comment

* Adjust database installation message to only one

Follow up to e260d28f43

---------

Co-authored-by: David Heinemeier Hansson <david@hey.com>

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,23 @@
+name: Bug
+description: Report a problem
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Remember: Omarchy is an open source gift, not a product you bought from a vendor
+
+  - type: input
+    id: system-details
+    attributes:
+      label: System details
+      placeholder: e.g. AMD 9950X, NVIDIA 5090, Omarchy 2.1.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: What's wrong?
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.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

applications/hidden/electron36.desktop

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

applications/hidden/electron37.desktop

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

applications/hidden/java-java-openjdk.desktop

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

applications/hidden/jconsole-java-openjdk.desktop

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

applications/hidden/jshell-java-openjdk.desktop

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

applications/nvim.desktop

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

bin/omarchy-battery-monitor

@@ -6,7 +6,13 @@ BATTERY_THRESHOLD=10
 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified"
 
 get_battery_percentage() {
-  upower -i $(upower -e | grep 'BAT') | grep -E "percentage" | grep -o '[0-9]\+%' | sed 's/%//'
+  upower -i "$(upower -e | grep 'BAT')" \
+  | awk -F: '/percentage/ {
+      gsub(/[%[:space:]]/, "", $2);
+      val=$2;
+      printf("%d\n", (val+0.5))
+      exit
+    }'
 }
 
 get_battery_state() {

bin/omarchy-cmd-audio-switch

@@ -1,19 +1,50 @@
 #!/bin/bash
 
-# Find all the audio sinks but exit if there are none
+focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
-sinks=($(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep -E '^\s*│\s+\*?\s*[0-9]+\.' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/'))
-[ ${#sinks[@]} -eq 0 ] && exit 1
 
-# Find current audio sink
+sinks=$(pactl -f json list sinks | jq '[.[] | select((.ports | length == 0) or ([.ports[]? | .availability != "not available"] | any))]')
-current=$(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep '^\s*│\s*\*' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/')
+sinks_count=$(echo "$sinks" | jq '. | length')
 
-# Find the next sink (looping around in the list)
+if [ "$sinks_count" -eq 0 ]; then
-for i in "${!sinks[@]}"; do
+  swayosd-client \
-  [ "${sinks[$i]}" = "$current" ] && next=${sinks[$(((i + 1) % ${#sinks[@]}))]}
+    --monitor "$focused_monitor" \
-done
+    --custom-message "No audio devices found"
-next=${next:-${sinks[0]}}
+  exit 1
+fi
 
-# Set the next sink and ensure it's not muted
+current_sink_name=$(pactl get-default-sink)
-wpctl set-default "$next"
+current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
-wpctl set-mute "$next" 0
 
+if [ "$current_sink_index" != "null" ]; then
+  next_sink_index=$(((current_sink_index + 1) % sinks_count))
+else
+  next_sink_index=0
+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')
+next_sink_volume=$(echo "$next_sink" | jq -r \
+  '.volume | to_entries[0].value.value_percent | sub("%"; "")')
+next_sink_is_muted=$(echo "$next_sink" | jq -r '.mute')
+
+if [ "$next_sink_is_muted" = "true" ] || [ "$next_sink_volume" -eq 0 ]; then
+  icon_state="muted"
+elif [ "$next_sink_volume" -le 33 ]; then
+  icon_state="low"
+elif [ "$next_sink_volume" -le 66 ]; then
+  icon_state="medium"
+else
+  icon_state="high"
+fi
+
+next_sink_volume_icon="sink-volume-${icon_state}-symbolic"
+
+if [ "$next_sink_name" != "$current_sink_name" ]; then
+  pactl set-default-sink "$next_sink_name"
+fi
+
+swayosd-client \
+  --monitor "$focused_monitor" \
+  --custom-message "$next_sink_description" \
+  --custom-icon "$next_sink_volume_icon"

bin/omarchy-cmd-first-run

@@ -6,7 +6,12 @@ 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
+
-  $OMARCHY_PATH/install/first-run/firewall.sh
+  bash "$OMARCHY_PATH/install/first-run/battery-monitor.sh"
+  bash "$OMARCHY_PATH/install/first-run/firewall.sh"
+  bash "$OMARCHY_PATH/install/first-run/gnome-theme.sh"
   sudo rm -f /etc/sudoers.d/first-run
+
+  bash "$OMARCHY_PATH/install/first-run/wifi.sh"
+  bash "$OMARCHY_PATH/install/first-run/welcome.sh"
 fi

bin/omarchy-cmd-missing

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

bin/omarchy-cmd-present

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for cmd in "$@"; do
+  command -v "$cmd" &>/dev/null || exit 1
+done
+
+exit 0

bin/omarchy-cmd-screenrecord

@@ -8,25 +8,48 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-screenrecording() {
+# Selects region or output
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+SCOPE="$1"
-  notify-send "Screen recording starting..." -t 1000
-  sleep 1
 
-  if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
+# Selects audio inclusion or not
-    wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
+AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
+
+start_screenrecording() {
+  local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
+
+  if lspci | grep -qi 'nvidia'; then
+    wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
   else
-    wl-screenrec -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@"
+    wl-screenrec $AUDIO -f "$filename" --ffmpeg-encoder-options="-c:v libx264 -crf 23 -preset medium -movflags +faststart" "$@" &
   fi
+
+  toggle_screenrecording_indicator
 }
 
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
+stop_screenrecording() {
   pkill -x wl-screenrec
   pkill -x wf-recorder
+
   notify-send "Screen recording saved to $OUTPUT_DIR" -t 2000
-elif [[ "$1" == "output" ]]; then
+
-  screenrecording
+  sleep 0.2 # ensures the process is actually dead before we check
+  toggle_screenrecording_indicator
+}
+
+toggle_screenrecording_indicator() {
+  pkill -RTMIN+8 waybar
+}
+
+screenrecording_active() {
+  pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null
+}
+
+if screenrecording_active; then
+  stop_screenrecording
+elif [[ "$SCOPE" == "output" ]]; then
+  output=$(slurp -o) || exit 1
+  start_screenrecording -g "$output"
 else
   region=$(slurp) || exit 1
-  screenrecording -g "$region"
+  start_screenrecording -g "$region"
 fi

bin/omarchy-cmd-screenrecord-stop

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if pgrep -x wl-screenrec >/dev/null || pgrep -x wf-recorder >/dev/null; then
-  pkill -x wl-screenrec
-  pkill -x wf-recorder
-  notify-send "Screen recording stopped" -t 2000
-fi

bin/omarchy-cmd-screensaver

@@ -1,16 +1,29 @@
 #!/bin/bash
 
+screensaver_in_focus() {
+  hyprctl activewindow -j | jq -e '.class == "Screensaver"' >/dev/null 2>&1
+}
+
+exit_screensaver() {
+  hyprctl keyword cursor:invisible false
+  pkill -x tte 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  exit 0
+}
+
+trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
+
+hyprctl keyword cursor:invisible true
+
 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 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
+    --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 1)) --anchor-canvas c --anchor-text c \
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 0.01; then
+    if read -n 1 -t 3 || ! screensaver_in_focus; then
-      pkill -x tte 2>/dev/null
+      exit_screensaver
-      pkill -f "alacritty --class Screensaver" 2>/dev/null
-      exit 0
     fi
   done
 done

bin/omarchy-cmd-share

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

bin/omarchy-cmd-terminal-cwd

@@ -5,7 +5,7 @@ terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
 shell_pid=$(pgrep -P "$terminal_pid" | head -n1)
 
 if [[ -n $shell_pid ]]; then
-  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null
+  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null || echo "$HOME"
 else
   echo "$HOME"
 fi

bin/omarchy-cmd-tzupdate

@@ -1,7 +1,8 @@
 #!/bin/bash
 
+notify-send "   Updating time and timezone..."
 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"
+notify-send "   Time updated and timezone set to $new_timezone"

bin/omarchy-drive-info

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Drive, like /dev/nvme0, to display information about
+if (($# == 0)); then
+  echo "Usage: omarchy-drive-info [/dev/drive]"
+  exit 1
+else
+  drive="$1"
+fi
+
+# Find the root drive in case we are looking at partitions
+root_drive=$(lsblk -no PKNAME "$drive" 2>/dev/null | tail -n1)
+if [[ -n "$root_drive" ]]; then
+  root_drive="/dev/$root_drive"
+else
+  root_drive="$drive"
+fi
+
+# Get basic disk information
+size=$(lsblk -dno SIZE "$drive" 2>/dev/null)
+model=$(lsblk -dno MODEL "$root_drive" 2>/dev/null)
+
+# Format display string
+display="$drive"
+[[ -n "$size" ]] && display="$display ($size)"
+[[ -n "$model" ]] && display="$display - $model"
+
+echo "$display"

bin/omarchy-drive-select

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Select a drive from a list with info that includes space and brand
+
+if (($# == 0)); then
+  drives=$(lsblk -dpno NAME | grep -E '/dev/(sd|hd|vd|nvme|mmcblk|xv)')
+else
+  drives="$@"
+fi
+
+drives_with_info=""
+while IFS= read -r drive; do
+  [[ -n "$drive" ]] || continue
+  drives_with_info+="$(omarchy-drive-info "$drive")"$'\n'
+done <<<"$drives"
+
+selected_drive="$(printf "%s" "$drives_with_info" | gum choose --header "Select drive")" || exit 1
+printf "%s\n" "$selected_drive" | awk '{print $1}'

bin/omarchy-drive-set-password

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+encrypted_drives=$(blkid -t TYPE=crypto_LUKS -o device)
+
+if [[ -n $encrypted_drives ]]; then
+  if [[ $(wc -l <<<"$encrypted_drives") -eq 1 ]]; then
+    drive_to_change="$encrypted_drives"
+  else
+    drive_to_change="$(omarchy-drive-select "$encrypted_drives")"
+  fi
+
+  if [[ -n $drive_to_change ]]; then
+    echo "Changing full-disk encryption password for $drive_to_change"
+    sudo cryptsetup luksChangeKey --pbkdf argon2id --iter-time 2000 "$drive_to_change"
+  else
+    echo "No drive selected."
+  fi
+else
+  echo "No encrypted drives available."
+  exit 1
+fi

bin/omarchy-font-current

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

bin/omarchy-font-list

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

bin/omarchy-font-set

@@ -4,7 +4,20 @@ font_name="$1"
 
 if [[ -n "$font_name" && "$font_name" != "CNCLD" ]]; then
   if fc-list | grep -iq "$font_name"; then
-    sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    if [[ -f ~/.config/alacritty/alacritty.toml ]]; then
+      sed -i "s/family = \".*\"/family = \"$font_name\"/g" ~/.config/alacritty/alacritty.toml
+    fi
+
+    if [[ -f ~/.config/kitty/kitty.conf ]]; then
+      sed -i "s/^font_family .*/font_family $font_name/g" ~/.config/kitty/kitty.conf
+      pkill -USR1 kitty
+    fi
+
+    if [[ -f ~/.config/ghostty/config ]]; then
+      sed -i "s/font-family = \".*\"/font-family = \"$font_name\"/g" ~/.config/ghostty/config
+      pkill -SIGUSR2 ghostty
+    fi
+
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/waybar/style.css
     sed -i "s/font-family: .*/font-family: '$font_name';/g" ~/.config/swayosd/style.css
     xmlstarlet ed -L \

bin/omarchy-install-chromium-google-account

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

bin/omarchy-install-dev-env

@@ -1,12 +1,12 @@
 #!/bin/bash
 
 if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet>" >&2
+  echo "Usage: omarchy-install-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|phoenix|rust|java|ocaml|dotnet|clojure>" >&2
   exit 1
 fi
 
 install_php() {
-  sudo pacman -Sy php composer php-sqlite --noconfirm
+  sudo pacman -S php composer php-sqlite xdebug --noconfirm
 
   # Install Path for Composer
   if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
@@ -28,22 +28,33 @@ install_php() {
     "pdo_mysql"
   )
 
+  # Enable Xdebug
+  sudo sed -i \
+    -e 's/^;zend_extension=xdebug.so/zend_extension=xdebug.so/' \
+    -e 's/^;xdebug.mode=debug/xdebug.mode=debug/' \
+    /etc/php/conf.d/xdebug.ini
+
   for ext in "${extensions_to_enable[@]}"; do
     sudo sed -i "s/^;extension=${ext}/extension=${ext}/" "$php_ini_path"
   done
 }
 
+install_node() {
+  echo -e "Installing Node.js...\n"
+  mise use --global node@lts
+}
+
 case "$1" in
 ruby)
   echo -e "Installing Ruby on Rails...\n"
+  omarchy-pkg-add libyaml
   mise use --global ruby@latest
   mise settings add idiomatic_version_file_enable_tools ruby
   mise x ruby -- gem install rails --no-document
   echo -e "\nYou can now run: rails new myproject"
   ;;
 node)
-  echo -e "Installing Node.js...\n"
+  install_node
-  mise use --global node@lts
   ;;
 bun)
   echo -e "Installing Bun...\n"
@@ -64,13 +75,14 @@ php)
 laravel)
   echo -e "Installing PHP and Laravel...\n"
   install_php
+  install_node
   composer global require laravel/installer
   echo -e "\nYou can now run: laravel new myproject"
   ;;
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  yay -S symfony-cli --noconfirm
+  omarchy-pkg-add symfony-cli
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)
@@ -108,6 +120,7 @@ java)
 zig)
   echo -e "Installing Zig...\n"
   mise use --global zig@latest
+  mise use -g zls@latest
   ;;
 ocaml)
   echo -e "Installing OCaml...\n"
@@ -120,4 +133,9 @@ dotnet)
   echo -e "Installing .NET...\n"
   mise use --global dotnet@latest
   ;;
+clojure)
+  echo -e "Installing Clojure...\n"
+  omarchy-pkg-add rlwrap
+  mise use --global clojure@latest
+  ;;
 esac

bin/omarchy-install-docker-dbs

@@ -1,16 +1,23 @@
 #!/bin/bash
 
 options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
-choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+
+if [[ "$#" -eq 0 ]]; then
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --header "Select database (return to install, esc to cancel)") || main_menu
+else
+  choices="$@"
+fi
 
 if [[ -n "$choices" ]]; then
   for db in $choices; do
     case $db in
     MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
+    PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres17 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:17 ;;
     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 ;;
     esac
   done
+else
+  echo "No databases selected for installation."
 fi

bin/omarchy-install-dropbox

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-# FIXME: Should not use AUR dependencies when we can avoid it
+echo "Installing all dependencies..."
-echo "Installing all dependencies [from AUR]..."
+omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &

bin/omarchy-install-steam

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
-sudo pacman -Sy
-
 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

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

bin/omarchy-install-vscode

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+echo "Installing VSCode..."
+omarchy-pkg-add visual-studio-code-bin
+
+mkdir -p ~/.vscode
+
+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
+
+setsid gtk-launch code

bin/omarchy-launch-about

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

bin/omarchy-launch-browser

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

bin/omarchy-launch-editor

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

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

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

bin/omarchy-launch-or-focus

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

bin/omarchy-launch-or-focus-webapp

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if (($# == 0)); then
+  echo "Usage: omarchy-launch-or-focus-webapp [window-pattern] [url]"
+  exit 1
+fi
+
+exec omarchy-launch-or-focus "$1" "omarchy-launch-webapp '$2'"

bin/omarchy-launch-screensaver

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

bin/omarchy-launch-webapp

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

bin/omarchy-launch-wifi

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

bin/omarchy-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 "$TERMINAL --class Screensaver"

bin/omarchy-menu

@@ -2,6 +2,21 @@
 
 export PATH="$HOME/.local/share/omarchy/bin:$PATH"
 
+# Set to true when going directly to a submenu, so we can exit directly
+BACK_TO_EXIT=false
+
+back_to() {
+  local parent_menu="$1"
+
+  if [[ "$BACK_TO_EXIT" == "true" ]]; then
+    exit 0
+  elif [[ -n "$parent_menu" ]]; then
+    "$parent_menu"
+  else
+    show_main_menu
+  fi
+}
+
 menu() {
   local prompt="$1"
   local options="$2"
@@ -22,36 +37,40 @@ menu() {
 }
 
 terminal() {
-  alacritty --class Omarchy -e "$@"
+  alacritty --class=Omarchy -e "$@"
 }
 
 present_terminal() {
-  alacritty --class Omarchy -e bash -c "omarchy-show-logo; eval \"$1\"; omarchy-show-done;"
+  omarchy-launch-floating-terminal-with-presentation $1
 }
 
-edit_in_nvim() {
+open_in_editor() {
   notify-send "Editing config file" "$1"
-  alacritty -e nvim "$1"
+  omarchy-launch-editor "$1"
 }
 
 install() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
 }
 
 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3"
 }
 
 install_font() {
-  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+  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 -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
 }
 
 aur_install_and_launch() {
-  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
 }
 
 show_learn_menu() {
@@ -66,41 +85,21 @@ show_learn_menu() {
   esac
 }
 
-show_style_menu() {
+show_trigger_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n󱄄  Screensaver\n  About") in
+  case $(menu "Trigger" "  Capture\n  Share\n󰔎  Toggle") in
-  *Theme*) show_theme_menu ;;
+  *Capture*) show_capture_menu ;;
-  *Font*) show_font_menu ;;
+  *Share*) show_share_menu ;;
-  *Background*) omarchy-theme-bg-next ;;
+  *Toggle*) show_toggle_menu ;;
-  *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
-    show_main_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
-    show_main_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_main_menu ;;
+  *) show_trigger_menu ;;
   esac
 }
 
@@ -114,47 +113,88 @@ show_screenshot_menu() {
 }
 
 show_screenrecord_menu() {
-  case $(menu "Screenrecord" "  Region\n  Display") in
+  case $(menu "Screenrecord" "  Region\n  Region + Audio\n  Display\n  Display + Audio") in
+  *"Region + Audio"*) omarchy-cmd-screenrecord region audio ;;
   *Region*) omarchy-cmd-screenrecord ;;
+  *"Display + Audio"*) omarchy-cmd-screenrecord output audio ;;
   *Display*) omarchy-cmd-screenrecord output ;;
   *) show_capture_menu ;;
   esac
 }
 
+show_share_menu() {
+  case $(menu "Share" "  Clipboard\n  File \n  Folder") in
+  *Clipboard*) terminal bash -c "omarchy-cmd-share clipboard" ;;
+  *File*) terminal bash -c "omarchy-cmd-share file" ;;
+  *Folder*) terminal bash -c "omarchy-cmd-share folder" ;;
+  *) back_to show_trigger_menu ;;
+  esac
+}
+
 show_toggle_menu() {
   case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
   *Screensaver*) omarchy-toggle-screensaver ;;
   *Nightlight*) omarchy-toggle-nightlight ;;
   *Idle*) omarchy-toggle-idle ;;
   *Bar*) omarchy-toggle-waybar ;;
+  *) show_trigger_menu ;;
+  esac
+}
+
+show_style_menu() {
+  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n  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() {
+  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_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n  Defaults\n󰱔  DNS\n  Security\n  Config"
 
   case $(menu "Setup" "$options") in
-  *Audio*) alacritty --class=Wiremix -e wiremix ;;
+  *Audio*) $TERMINAL --class=Wiremix -e wiremix ;;
   *Wifi*)
     rfkill unblock wifi
-    alacritty --class=Impala -e impala
+    omarchy-launch-wifi
     ;;
   *Bluetooth*)
     rfkill unblock bluetooth
     blueberry
     ;;
   *Power*) show_setup_power_menu ;;
-  *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
+  *Monitors*) open_in_editor ~/.config/hypr/monitors.conf ;;
-  *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
+  *Keybindings*) open_in_editor ~/.config/hypr/bindings.conf ;;
-  *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *Input*) open_in_editor ~/.config/hypr/input.conf ;;
+  *Defaults*) open_in_editor ~/.config/uwsm/default ;;
   *DNS*) present_terminal omarchy-setup-dns ;;
+  *Security*) show_setup_security_menu ;;
   *Config*) show_setup_config_menu ;;
-  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
-  *Fido2*) present_terminal omarchy-setup-fido2 ;;
   *) show_main_menu ;;
   esac
 }
@@ -163,7 +203,7 @@ show_setup_power_menu() {
   profile=$(menu "Power Profile" "$(omarchy-powerprofiles-list)" "" "$(powerprofilesctl get)")
 
   if [[ "$profile" == "CNCLD" || -z "$profile" ]]; then
-    show_main_menu
+    back_to show_setup_menu
   else
     powerprofilesctl set "$profile"
   fi
@@ -171,20 +211,28 @@ show_setup_power_menu() {
 
 show_setup_config_menu() {
   case $(menu "Setup" "  Hyprland\n  Hypridle\n  Hyprlock\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar\n󰞅  XCompose") in
-  *Hyprland*) edit_in_nvim ~/.config/hypr/hyprland.conf ;;
+  *Hyprland*) open_in_editor ~/.config/hypr/hyprland.conf ;;
-  *Hypridle*) edit_in_nvim ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
+  *Hypridle*) open_in_editor ~/.config/hypr/hypridle.conf && omarchy-restart-hypridle ;;
-  *Hyprlock*) edit_in_nvim ~/.config/hypr/hyprlock.conf ;;
+  *Hyprlock*) open_in_editor ~/.config/hypr/hyprlock.conf ;;
-  *Hyprsunset*) edit_in_nvim ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
+  *Hyprsunset*) open_in_editor ~/.config/hypr/hyprsunset.conf && omarchy-restart-hyprsunset ;;
-  *Swayosd*) edit_in_nvim ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
+  *Swayosd*) open_in_editor ~/.config/swayosd/config.toml && omarchy-restart-swayosd ;;
-  *Walker*) edit_in_nvim ~/.config/walker/config.toml && omarchy-restart-walker ;;
+  *Walker*) open_in_editor ~/.config/walker/config.toml && omarchy-restart-walker ;;
-  *Waybar*) edit_in_nvim ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
+  *Waybar*) open_in_editor ~/.config/waybar/config.jsonc && omarchy-restart-waybar ;;
-  *XCompose*) edit_in_nvim ~/.XCompose && omarchy-restart-xcompose ;;
+  *XCompose*) open_in_editor ~/.XCompose && omarchy-restart-xcompose ;;
   *) show_main_menu ;;
   esac
 }
 
+show_setup_security_menu() {
+  case $(menu "Setup" "󰈷  Fingerprint\n  Fido2") in
+  *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
+  *Fido2*) present_terminal omarchy-setup-fido2 ;;
+  *) show_setup_menu ;;
+  esac
+}
+
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n  Terminal\n󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
   *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
@@ -193,6 +241,7 @@ 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 ;;
   *Gaming*) show_install_gaming_menu ;;
   *) show_main_menu ;;
@@ -200,32 +249,51 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
+  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
+  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix") in
+  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
-  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
+  *VSCode*) present_terminal omarchy-install-vscode ;;
-  *Cursor*) aur_install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *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() {
-  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
+  ollama_pkg=$(
-  *Claude*) aur_install "Claude Code" "claude-code" ;;
+    (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
-  *Gemini*) install "Gemini" "gemini-cli" ;;
+      (command -v rocminfo &>/dev/null && echo ollama-rocm) ||
-  *Studio*) aur_install "LM Studio" "lmstudio" ;;
+      echo ollama
-  *Ollama*) install "Ollama" "ollama" ;;
+  )
-  *Crush*) aur_install "Crush" "crush-bin" ;;
+
-  *opencode*) aur_install "opencode" "opencode-bin" ;;
+  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" ;;
+  *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
+  *Gemini*) aur_install "Gemini" "gemini-cli" ;;
+  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Ollama*) install "Ollama" $ollama_pkg ;;
+  *Crush*) install "Crush" "crush-bin" ;;
+  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
@@ -234,7 +302,7 @@ show_install_gaming_menu() {
   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" ;;
   *) show_install_menu ;;
   esac
 }
@@ -259,7 +327,7 @@ show_install_font_menu() {
 }
 
 show_install_development_menu() {
-  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml") in
+  case $(menu "Install" "󰫏  Ruby on Rails\n  Docker DB\n  JavaScript\n  Go\n  PHP\n  Python\n  Elixir\n  Zig\n  Rust\n  Java\n  .NET\n  OCaml\n  Clojure") in
   *Rails*) present_terminal "omarchy-install-dev-env ruby" ;;
   *Docker*) present_terminal omarchy-install-docker-dbs ;;
   *JavaScript*) show_install_javascript_menu ;;
@@ -272,6 +340,7 @@ show_install_development_menu() {
   *Java*) present_terminal "omarchy-install-dev-env java" ;;
   *NET*) present_terminal "omarchy-install-dev-env dotnet" ;;
   *OCaml*) present_terminal "omarchy-install-dev-env ocaml" ;;
+  *Clojure*) present_terminal "omarchy-install-dev-env clojure" ;;
   *) show_install_menu ;;
   esac
 }
@@ -315,16 +384,26 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n Branch\n  Config\n󰸌  Extra Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
+  *Branch*) show_update_branch_menu ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
+  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
+  *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
 }
 
+show_update_branch_menu() {
+  case $(menu "Branch" "master\ndev" "" "$(omarchy-version-branch)") in
+  *master*) present_terminal "omarchy-update-branch master" ;;
+  *dev*) present_terminal "omarchy-update-branch dev" ;;
+  *) show_update_menu ;;
+  esac
+}
 show_update_process_menu() {
   case $(menu "Restart" "  Hypridle\n  Hyprsunset\n  Swayosd\n󰌧  Walker\n󰍜  Waybar") in
   *Hypridle*) omarchy-restart-hypridle ;;
@@ -332,7 +411,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
   esac
 }
 
@@ -346,7 +425,24 @@ show_update_config_menu() {
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
+  esac
+}
+
+show_update_hardware_menu() {
+  case $(menu "Restart" "  Audio\n󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *Audio*) present_terminal omarchy-restart-pipewire ;;
+  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
+  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
+  *) show_update_menu ;;
+  esac
+}
+
+show_update_password_menu() {
+  case $(menu "Update Password" "  Drive Encryption\n  User") in
+  *Drive*) present_terminal omarchy-drive-set-password ;;
+  *User*) present_terminal passwd ;;
+  *) show_update_menu ;;
   esac
 }
 
@@ -355,37 +451,39 @@ show_system_menu() {
   *Lock*) omarchy-lock-screen ;;
   *Screensaver*) omarchy-launch-screensaver force ;;
   *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
+  *Relaunch*) omarchy-state clear relaunch-required && sudo systemctl restart sddm ;;
-  *Restart*) systemctl reboot ;;
+  *Restart*) omarchy-state clear re*-required && systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
+  *Shutdown*) omarchy-state clear re*-required && systemctl poweroff ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
 show_main_menu() {
-  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n  Capture\n󰔎  Toggle\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
+  go_to_menu "$(menu "Go" "󰀻  Apps\n󰧑  Learn\n󱓞  Trigger\n  Style\n  Setup\n󰉉  Install\n󰭌  Remove\n  Update\n  About\n  System")"
 }
 
 go_to_menu() {
   case "${1,,}" in
   *apps*) walker -p "Launch…" ;;
   *learn*) show_learn_menu ;;
+  *trigger*) show_trigger_menu ;;
+  *share*) show_share_menu ;;
   *style*) show_style_menu ;;
   *theme*) show_theme_menu ;;
-  *capture*) show_capture_menu ;;
   *screenshot*) show_screenshot_menu ;;
   *screenrecord*) show_screenrecord_menu ;;
-  *toggle*) show_toggle_menu ;;
   *setup*) show_setup_menu ;;
+  *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
+  *about*) omarchy-launch-about ;;
   *system*) show_system_menu ;;
-  *about*) terminal bash -c 'fastfetch; read -n 1 -s' ;;
   esac
 }
 
 if [[ -n "$1" ]]; then
+  BACK_TO_EXIT=true
   go_to_menu "$1"
 else
   show_main_menu

bin/omarchy-menu-keybindings

@@ -3,6 +3,69 @@
 # A script to display Hyprland keybindings defined in your configuration
 # using walker for an interactive search menu.
 
+declare -A KEYCODE_SYM_MAP
+
+build_keymap_cache() {
+  local keymap
+  keymap="$(xkbcli compile-keymap)" || {
+    echo "Failed to compile keymap" >&2
+    return 1
+  }
+
+  while IFS=, read -r code sym; do
+    [[ -z "$code" || -z "$sym" ]] && continue
+    KEYCODE_SYM_MAP["$code"]="$sym"
+  done < <(
+    awk '
+      BEGIN { sec = "" }
+      /xkb_keycodes/ { sec = "codes"; next }
+      /xkb_symbols/  { sec = "syms";  next }
+      sec == "codes" {
+        if (match($0, /<([A-Za-z0-9_]+)>\s*=\s*([0-9]+)\s*;/, m)) code_by_name[m[1]] = m[2]
+      }
+      sec == "syms" {
+        if (match($0, /key\s*<([A-Za-z0-9_]+)>\s*\{\s*\[\s*([^, \]]+)/, m)) sym_by_name[m[1]] = m[2]
+      }
+      END {
+        for (k in code_by_name) {
+          c = code_by_name[k]
+          s = sym_by_name[k]
+          if (c != "" && s != "" && s != "NoSymbol") print c "," s
+        }
+      }
+    ' <<<"$keymap"
+  )
+}
+
+lookup_keycode_cached() {
+  printf '%s\n' "${KEYCODE_SYM_MAP[$1]}"
+}
+
+parse_keycodes() {
+  local start end elapsed
+  [[ "${DEBUG:-0}" == "1" ]] && start=$(date +%s.%N)
+  while IFS= read -r line; do
+    if [[ "$line" =~ code:([0-9]+) ]]; then
+      code="${BASH_REMATCH[1]}"
+      symbol=$(lookup_keycode_cached "$code" "$XKB_KEYMAP_CACHE")
+      echo "${line/code:${code}/$symbol}"
+    else
+      echo "$line"
+    fi
+  done
+
+  if [[ "$DEBUG" == "1" ]]; then
+    end=$(date +%s.%N)
+    # fall back to awk if bc is missing
+    if command -v bc >/dev/null 2>&1; then
+      elapsed=$(echo "$end - $start" | bc)
+    else
+      elapsed=$(awk -v s="$start" -v e="$end" 'BEGIN{printf "%.6f", (e - s)}')
+    fi
+    echo "[DEBUG] parse_keycodes elapsed: ${elapsed}s" >&2
+  fi
+}
+
 # Fetch dynamic keybindings from Hyprland
 #
 # Also do some pre-processing:
@@ -11,30 +74,30 @@
 # - 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/@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,/'
 }
 
 # Parse and format keybindings
@@ -83,7 +146,13 @@ parse_bindings() {
 }'
 }
 
-dynamic_bindings | \
+monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
-  sort -u | \
+menu_height=$((monitor_height * 40 / 100))
-  parse_bindings | \
+
-  walker --dmenu --theme keybindings -p 'Keybindings'
+build_keymap_cache
+
+dynamic_bindings |
+  sort -u |
+  parse_keycodes |
+  parse_bindings |
+  walker --dmenu --theme keybindings -p 'Keybindings' -w 800 -h "$menu_height"

bin/omarchy-migrate

@@ -1,18 +1,27 @@
 #!/bin/bash
 
-set -e
-
 # Where we store an empty file for each migration that has already been performed.
 STATE_DIR="$HOME/.local/state/omarchy/migrations"
 mkdir -p "$STATE_DIR"
 
+# Skipped migrations are tracked separately
+mkdir -p "$STATE_DIR/skipped"
+
 # Run any pending migrations
 for file in ~/.local/share/omarchy/migrations/*.sh; do
   filename=$(basename "$file")
 
-  if [[ ! -f "$STATE_DIR/$filename" ]]; then
+  if [[ ! -f "$STATE_DIR/$filename" && ! -f "$STATE_DIR/skipped/$filename" ]]; then
     echo -e "\e[32m\nRunning migration (${filename%.sh})\e[0m"
-    source $file
+
-    touch "$STATE_DIR/$filename"
+    if bash $file; then
+      touch "$STATE_DIR/$filename"
+    else
+      if gum confirm "Migration ${filename%.sh} failed. Skip and continue?"; then
+        touch "$STATE_DIR/skipped/$filename"
+      else
+        exit 1
+      fi
+    fi
   fi
 done

bin/omarchy-notification-dismiss

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

bin/omarchy-pkg-add

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+sudo pacman -S --noconfirm --needed "$@" || exit 1
+
+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
+    exit 1
+  fi
+done
+
+exit 0

bin/omarchy-pkg-aur-install

@@ -1,16 +1,16 @@
 #!/bin/bash
 
-set -e
-
 fzf_args=(
   --multi
-  --preview 'yay -Sii {1}'
+  --preview 'yay -Siia {1}'
-  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview-label='alt-p: toggle description, alt-b/B: toggle PKGBUILD, 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'
 )
 
@@ -18,7 +18,7 @@ pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
 
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm
+  echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
   sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-drop

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  if pacman -Q "$pkg" &>/dev/null; then
+    sudo pacman -Rns --noconfirm "$pkg"
+  fi
+done

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

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -e
-
 fzf_args=(
   --multi
   --preview 'pacman -Sii {1}'
@@ -14,12 +12,10 @@ fzf_args=(
   --color 'pointer:green,marker:green'
 )
 
-sudo pacman -Sy
 pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
 
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
-  sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-missing

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  if ! pacman -Q "$pkg" &>/dev/null; then
+    exit 0
+  fi
+done
+
+exit 1

bin/omarchy-pkg-pinned

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

bin/omarchy-pkg-present

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for pkg in "$@"; do
+  pacman -Q "$pkg" &>/dev/null || exit 1
+done
+
+exit 0

bin/omarchy-pkg-remove

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

bin/omarchy-refresh-fastfetch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+omarchy-refresh-config fastfetch/config.jsonc

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

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-if [[ "$1" == "-y" ]]; then
+sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
-  sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
+sudo plymouth-set-default-theme omarchy
-  sudo plymouth-set-default-theme -R omarchy
+
+if command -v limine-mkinitcpio &>/dev/null; then
+  sudo limine-mkinitcpio
+else
+  sudo mkinitcpio -P
 fi

bin/omarchy-reset-sudo

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

bin/omarchy-restart-bluetooth

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

bin/omarchy-restart-pipewire

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

bin/omarchy-restart-walker

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 pkill walker
-# FIXME: Reenable the walker service once the memory leak has been fixed
+# FIXME: Just deal with the memory leak for now.
 # See https://github.com/basecamp/omarchy/issues/698
-# setsid uwsm app -- walker --gapplication-service &
+setsid uwsm app -- walker --gapplication-service &
 echo # Always end in success so we don't terminate further running

bin/omarchy-restart-wifi

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

bin/omarchy-setup-dns

@@ -37,8 +37,6 @@ EOF
 DHCP)
   sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
 [Resolve]
-DNS=
-FallbackDNS=
 DNSOverTLS=no
 EOF
   

bin/omarchy-setup-fingerprint

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

bin/omarchy-snapshot

@@ -16,9 +16,15 @@ case "$COMMAND" in
 create)
   DESC="$(omarchy-version)"
 
-  for config in root home; do
+  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}')
+
+  for config in "${CONFIGS[@]}"; do
     sudo snapper -c "$config" create -c number -d "$DESC"
   done
+  echo
   ;;
 restore)
   sudo limine-snapper-restore

bin/omarchy-theme-set

@@ -1,10 +1,7 @@
 #!/bin/bash
 
-# omarchy-theme-set: Set a theme, specified by its name.
+if [[ -z $1 && $1 != "CNCLD" ]]; then
-# Usage: omarchy-theme-set <theme-name>
+  echo "Usage: omarchy-theme-set <theme-name>"
-
-if [[ -z "$1" && "$1" != "CNCLD" ]]; then
-  echo "Usage: omarchy-theme-set <theme-name>" >&2
   exit 1
 fi
 
@@ -16,54 +13,26 @@ THEME_PATH="$THEMES_DIR/$THEME_NAME"
 
 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
-  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR" >&2
+  echo "Theme '$THEME_NAME' does not exist in $THEMES_DIR"
-  exit 2
+  exit 1
 fi
 
 # Update theme symlinks
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"
 
-# Change gnome modes
+# Change background with theme
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+omarchy-theme-bg-next
-  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
-pkill -SIGUSR2 btop
 omarchy-restart-waybar
 omarchy-restart-swayosd
-makoctl reload
 hyprctl reload
+pkill -SIGUSR2 btop
+makoctl reload
 
-# Set new background
+# Change gnome, browser, vscode themes
-omarchy-theme-bg-next
+omarchy-theme-set-terminal
+omarchy-theme-set-gnome
+omarchy-theme-set-eza
+omarchy-theme-set-browser
+omarchy-theme-set-vscode

bin/omarchy-theme-set-browser

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

bin/omarchy-theme-set-eza

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -f ~/.config/omarchy/current/theme/eza.yml ]; then
+  ln -snf ~/.config/omarchy/current/theme/eza.yml ~/.config/eza/theme.yml
+else
+  rm -f ~/.config/eza/theme.yml
+fi

bin/omarchy-theme-set-gnome

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

bin/omarchy-theme-set-terminal

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+case "$TERMINAL" in
+"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
+"kitty") killall -SIGUSR1 kitty ;;
+"ghostty") killall -SIGUSR2 ghostty ;;
+esac

bin/omarchy-theme-set-vscode

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

bin/omarchy-tui-install

@@ -20,13 +20,16 @@ fi
 
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_FILE="$HOME/.local/share/applications/$APP_NAME.desktop"
-ICON_PATH="$ICON_DIR/$APP_NAME.png"
 
-mkdir -p "$ICON_DIR"
+if [[ ! "$ICON_URL" =~ ^https?:// ]] && [ -f "$ICON_URL" ]; then
-
+  ICON_PATH="$ICON_URL"
-if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+else
-  echo "Error: Failed to download icon."
+  ICON_PATH="$ICON_DIR/$APP_NAME.png"
-  return 1
+  mkdir -p "$ICON_DIR"
+  if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+    echo "Error: Failed to download icon."
+    exit 1
+  fi
 fi
 
 if [[ $WINDOW_STYLE == "float" ]]; then
@@ -40,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=alacritty --class $APP_CLASS -e $APP_EXEC
+Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
 Terminal=false
 Type=Application
 Icon=$ICON_PATH

bin/omarchy-tui-remove

@@ -3,10 +3,10 @@
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
-if [ "$#" -ne 1 ]; then
+if [ "$#" -eq 0 ]; then
-  # Find all web apps
+  # Find all TUIs
   while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*alacritty.*-e' "$file"; then
+    if grep -q '^Exec=.*$TERMINAL.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
     fi
   done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
@@ -14,23 +14,28 @@ if [ "$#" -ne 1 ]; then
   if ((${#TUIS[@]})); then
     IFS=$'\n' SORTED_TUIS=($(sort <<<"${TUIS[*]}"))
     unset IFS
-    APP_NAME=$(gum choose --header "Select TUI to remove..." "${SORTED_TUIS[@]}")
+    APP_NAMES_STRING=$(gum choose --no-limit --header "Select TUI to remove..." --selected-prefix="✗ " "${SORTED_TUIS[@]}")
+    # Convert newline-separated string to array
+    APP_NAMES=()
+    while IFS= read -r line; do
+      [[ -n "$line" ]] && APP_NAMES+=("$line")
+    done <<< "$APP_NAMES_STRING"
   else
     echo "No TUIs to remove."
     exit 1
   fi
 else
-  APP_NAME="$1"
+  # Use array to preserve spaces in app names
+  APP_NAMES=("$@")
 fi
 
-if [[ -z "$APP_NAME" ]]; then
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
-  echo "You must provide TUI name."
+  echo "You must provide TUI names."
   exit 1
 fi
 
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
+for APP_NAME in "${APP_NAMES[@]}"; do
-rm "$ICON_DIR/$APP_NAME.png"
+  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
-
+  rm -f "$ICON_DIR/$APP_NAME.png"
-if [ "$#" -ne 1 ]; then
+  echo "Removed $APP_NAME"
-  echo -e "Removed $APP_NAME\n"
+done
-fi

bin/omarchy-update

@@ -4,7 +4,4 @@ set -e
 
 omarchy-snapshot create || [ $? -eq 127 ]
 omarchy-update-git
-omarchy-migrate
+omarchy-update-perform
-omarchy-update-system-pkgs
-omarchy-update-restart
-omarchy-restart-waybar # removes update-available icon

bin/omarchy-update-available

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-# Ensure remote is reachable
+# Get remote tag
-if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then
+latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
-  echo "Error: Unable to reach remote repository."
+if [[ -z "$latest_tag" ]]; then
+  echo "Error: Could not retrieve latest tag."
   exit 1
 fi
 
-latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+# Get local tag
 current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))
+if [[ -z "$current_tag" ]]; then
+  echo "Error: Could not retrieve current tag."
+  exit 1
+fi
 
 if [[ "$current_tag" != "$latest_tag" ]]; then
   echo "Omarchy update available ($latest_tag)"

bin/omarchy-update-available-reset

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Ensure Waybar icon offering the available update is removed
+pkill -RTMIN+7 waybar

bin/omarchy-update-branch

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

bin/omarchy-update-git

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 echo -e "\e[32mUpdate Omarchy\e[0m"
+
 git -C $OMARCHY_PATH pull --autostash
 git -C $OMARCHY_PATH diff --check || git -C $OMARCHY_PATH reset --merge

bin/omarchy-update-perform

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

bin/omarchy-update-system-pkgs

@@ -1,16 +1,24 @@
 #!/bin/bash
 
-echo -e "\e[32m\nUpdate system packages\e[0m"
+# Used in package emergencies if a bad package has been pushed and we can't revoke.
-sudo pacman -Syu --noconfirm
+# Requires manually installing the good package using sudo pacman -U <url>
-echo
+ignored_packages=$(omarchy-pkg-ignored)
 
-if omarchy-pkg-aur-accessible; then
+echo -e "\e[32m\nUpdate system packages\e[0m"
-  echo -e "\e[32m\nUpdate AUR packages\e[0m"
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
-  yay -Syu --noconfirm
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
-  echo
+
-else
+# Update AUR packages if any are installed
-  echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+if pacman -Qem >/dev/null; then
-  echo
+  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"
+    echo
+  else
+    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+    echo
+  fi
 fi
 
 orphans=$(pacman -Qtdq)

bin/omarchy-upload-log

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Upload logs to 0x0.st
+
+LOG_TYPE="${1:-install}"
+TEMP_LOG="/tmp/upload-log.txt"
+SYSTEM_INFO="/tmp/system-info.txt"
+
+# Get system information if fastfetch is available
+if command -v fastfetch >/dev/null 2>&1; then
+  {
+    echo "========================================="
+    echo "SYSTEM INFORMATION"
+    echo "========================================="
+    # Use fastfetch with no logo to get clean output
+    fastfetch --logo none --pipe 2>/dev/null || echo "Failed to get system info"
+    echo ""
+    echo "========================================="
+    echo "LOG CONTENT"
+    echo "========================================="
+    echo ""
+  } >"$SYSTEM_INFO"
+else
+  # Fallback to basic info if fastfetch isn't available
+  {
+    echo "========================================="
+    echo "SYSTEM INFORMATION"
+    echo "========================================="
+    echo "Hostname: $(hostname)"
+    echo "Kernel: $(uname -r)"
+    echo "Date: $(date)"
+    echo ""
+    echo "========================================="
+    echo "LOG CONTENT"
+    echo "========================================="
+    echo ""
+  } >"$SYSTEM_INFO"
+fi
+
+case "$LOG_TYPE" in
+install)
+  ARCHINSTALL_LOG="/var/log/archinstall/install.log"
+  OMARCHY_LOG="/var/log/omarchy-install.log"
+
+  # Combine system info with logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  cat $ARCHINSTALL_LOG $OMARCHY_LOG >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No install logs found"
+    exit 1
+  fi
+
+  echo "Uploading installation log to 0x0.st..."
+  ;;
+
+this-boot)
+  # Combine system info with boot logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  journalctl -b 0 >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No logs found for current boot"
+    exit 1
+  fi
+
+  echo "Uploading current boot logs to 0x0.st..."
+  ;;
+
+last-boot)
+  # Combine system info with previous boot logs
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  journalctl -b -1 >>"$TEMP_LOG" 2>/dev/null
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: No logs found for previous boot"
+    exit 1
+  fi
+
+  echo "Uploading previous boot logs to 0x0.st..."
+  ;;
+
+installed)
+  # System info plus all installed packages
+  cat "$SYSTEM_INFO" >"$TEMP_LOG"
+  {
+    echo ""
+    echo "========================================="
+    echo "INSTALLED PACKAGES (pacman -Q)"
+    echo "========================================="
+    pacman -Q 2>/dev/null || echo "Failed to get package list"
+  } >>"$TEMP_LOG"
+
+  if [ ! -s "$TEMP_LOG" ]; then
+    echo "Error: Failed to gather system information"
+    exit 1
+  fi
+
+  echo "Uploading system information to 0x0.st..."
+  ;;
+
+*)
+  echo "Usage: $0 [install|this-boot|last-boot|system-info]"
+  echo "  install      - Upload installation logs (default)"
+  echo "  this-boot    - Upload logs from current boot"
+  echo "  last-boot    - Upload logs from previous boot"
+  echo "  installed    - Upload system info and installed packages"
+  exit 1
+  ;;
+esac
+
+echo ""
+
+URL=$(curl -sF "file=@$TEMP_LOG" -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

bin/omarchy-version

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