Merge pull request #1540 from basecamp/dev

Omarchy 2.1.1

.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/wiremix.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Audio Settings
-Comment=Using Wiremix
-Exec=alacritty --class=Wiremix --title=Wiremix -e wiremix
-Icon=audio-headphones
-Type=Application
-Terminal=false

applications/xtras/Zoom.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Zoom
-Comment=Zoom Video Conference
-Exec=env QT_SCALE_FACTOR=2 /usr/bin/zoom %U
-Icon=Zoom
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Network;Application;
-StartupWMClass=zoom
-MimeType=x-scheme-handler/zoommtg;x-scheme-handler/zoomus;x-scheme-handler/tel;x-scheme-handler/callto;x-scheme-handler/zoomphonecall;x-scheme-handler/zoomphonesms;x-scheme-handler/zoomcontactcentercall;application/x-zoom
-X-KDE-Protocols=zoommtg;zoomus;tel;callto;zoomphonecall;zoomphonesms;zoomcontactcentercall;

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
-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
+focused_monitor="$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
 
-# Find current audio sink
-current=$(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep '^\s*│\s*\*' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/')
+sinks=$(pactl -f json list sinks)
+sinks_count=$(echo "$sinks" | jq '. | length')
 
-# Find the next sink (looping around in the list)
-for i in "${!sinks[@]}"; do
-  [ "${sinks[$i]}" = "$current" ] && next=${sinks[$(((i + 1) % ${#sinks[@]}))]}
-done
-next=${next:-${sinks[0]}}
+if [ "$sinks_count" -eq 0 ]; then
+  swayosd-client \
+    --monitor "$focused_monitor" \
+    --custom-message "No audio devices found"
+  exit 1
+fi
 
-# Set the next sink and ensure it's not muted
-wpctl set-default "$next"
-wpctl set-mute "$next" 0
+current_sink_name=$(pactl get-default-sink)
+current_sink_index=$(echo "$sinks" | jq -r --arg name "$current_sink_name" 'map(.name) | index($name)')
 
+if [ "$current_sink_index" != "null" ]; then
+  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

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+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
+  sudo rm -f /etc/sudoers.d/first-run
+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,15 +8,21 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
+if [[ $2 == "audio" ]]; then
+  AUDIO="--audio"
+else
+  AUDIO=""
+fi
+
 screenrecording() {
   filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
   notify-send "Screen recording starting..." -t 1000
   sleep 1
 
   if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-    wf-recorder -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@"
+    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
 }
 

bin/omarchy-cmd-screensaver

@@ -1,20 +1,22 @@
 #!/bin/bash
 
-if command -v tte &>/dev/null; then
-  while true; do
+function exit_screensaver {
+  pkill -x tte 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  exit 0
+}
+
+trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
+
+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 \
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-      if read -n 1 -t 0.01; then
-        pkill -x tte 2>/dev/null
-        pkill -f "alacritty --class Screensaver" 2>/dev/null
-        exit 0
+    if read -n 1 -t 3; then
+      exit_screensaver
     fi
   done
-  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi
+done

bin/omarchy-cmd-screenshot

@@ -8,7 +8,7 @@ if [[ ! -d "$OUTPUT_DIR" ]]; then
   exit 1
 fi
 
-pkill slurp || hyprshot -m ${1:-region} --raw |
+pkill slurp || hyprshot -m ${1:-region} --raw --freeze |
   satty --filename - \
     --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
     --early-exit \

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,6 +1,7 @@
 #!/bin/bash
 
+sudo systemctl restart systemd-timesyncd
 sudo tzupdate
 new_timezone=$(timedatectl show -p Timezone --value)
 omarchy-restart-waybar
-notify-send "Timezone has been set to $new_timezone"
+notify-send "Time synced 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-ensure-aur-available

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if ! curl -s --connect-timeout 10 --head -A "omarchy-update" -o /dev/null "https://aur.archlinux.org/"; then
-  gum spin --spinner "globe" --title "The AUR package repository is currently unavailable, please try again later" -- sleep 2 && exit 1
-fi

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-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() {
-  yay -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,11 +28,22 @@ 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"
@@ -42,8 +53,7 @@ ruby)
   echo -e "\nYou can now run: rails new myproject"
   ;;
 node)
-  echo -e "Installing Node.js...\n"
-  mise use --global node@lts
+  install_node
   ;;
 bun)
   echo -e "Installing Bun...\n"
@@ -64,13 +74,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)
@@ -120,4 +131,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=("MariaDB" "MySQL" "Redis" "PostgreSQL" "MongoDB")
-choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
+options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
+
+if [[ "$#" -eq 0 ]]; then
+  choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, 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,8 +1,7 @@
 #!/bin/bash
 
 echo "Installing all dependencies..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+omarchy-pkg-add 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,8 @@
 #!/bin/bash
 
 echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
-sudo pacman -Sy
+sudo sed -i '/^#\s*\[multilib\]/,/^#\s*Include/ s/^#\s*//' /etc/pacman.conf
 
 echo "Now pick dependencies matching your graphics card"
-yay -S steam
+sudo pacman -Syu --noconfirm steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-launch-browser

@@ -1,3 +1,3 @@
 #!/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[@]} $@
+exec setsid uwsm app -- $(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$(xdg-settings get default-web-browser) 2>/dev/null | head -1) ${args[@]} $@

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

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

bin/omarchy-launch-screensaver

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# Exit early if we don't have the tte show
+if ! command -v tte &>/dev/null; then
+  exit 1
+fi
+
 # Exit early if screensave is already running
 pgrep -f "alacritty --class Screensaver" && exit 0
 

bin/omarchy-launch-webapp

@@ -7,4 +7,4 @@ google-chrome* | brave-browser* | microsoft-edge* | opera* | vivaldi*) ;;
 *) 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-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 [[ "$DIRECT_ACCESS" == "true" ]]; then
+    exit 0
+  elif [[ -n "$parent_menu" ]]; then
+    "$parent_menu"
+  else
+    show_main_menu
+  fi
+}
+
 menu() {
   local prompt="$1"
   local options="$2"
@@ -26,7 +41,7 @@ terminal() {
 }
 
 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() {
@@ -35,15 +50,23 @@ edit_in_nvim() {
 }
 
 install() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2"
 }
 
 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; yay -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...'; yay -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'"
+}
+
+aur_install() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2"
+}
+
+aur_install_and_launch() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3"
 }
 
 show_learn_menu() {
@@ -72,7 +95,7 @@ show_style_menu() {
 show_theme_menu() {
   theme=$(menu "Theme" "$(omarchy-theme-list)" "" "$(omarchy-theme-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
+    back_to show_style_menu
   else
     omarchy-theme-set "$theme"
   fi
@@ -81,7 +104,7 @@ show_theme_menu() {
 show_font_menu() {
   theme=$(menu "Font" "$(omarchy-font-list)" "-w 350" "$(omarchy-font-current)")
   if [[ "$theme" == "CNCLD" || -z "$theme" ]]; then
-    show_main_menu
+    back_to show_style_menu
   else
     omarchy-font-set "$theme"
   fi
@@ -106,8 +129,10 @@ 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
@@ -127,16 +152,23 @@ 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  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
 
   case $(menu "Setup" "$options") in
   *Audio*) alacritty --class=Wiremix -e wiremix ;;
-  *Wifi*) alacritty --class=Impala -e bash -c "rfkill unblock wifi; impala" ;;
-  *Bluetooth*) blueberry ;;
+  *Wifi*)
+    rfkill unblock wifi
+    alacritty --class=Impala -e impala
+    ;;
+  *Bluetooth*)
+    rfkill unblock bluetooth
+    blueberry
+    ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
   *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
   *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *DNS*) present_terminal omarchy-setup-dns ;;
   *Config*) show_setup_config_menu ;;
   *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
   *Fido2*) present_terminal omarchy-setup-fido2 ;;
@@ -148,7 +180,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
@@ -169,8 +201,9 @@ show_setup_config_menu() {
 }
 
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\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󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
+  *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
   *TUI*) present_terminal omarchy-tui-install ;;
   *Service*) show_install_service_menu ;;
@@ -184,41 +217,50 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
+  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\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" ;;
   *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_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  ollama_pkg=$(
+    (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
+      (command -v rocminfo &>/dev/null && echo ollama-rocm) ||
+      echo ollama
+  )
+
+  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" ;;
-  *Gemini*) install "Gemini" "gemini-cli-bin" ;;
+  *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
+  *Gemini*) aur_install "Gemini" "gemini-cli" ;;
   *Studio*) install "LM Studio" "lmstudio" ;;
-  *Ollama*) install "Ollama" "ollama" ;;
+  *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode-bin" ;;
+  *opencode*) install "opencode" "opencode" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
-  *RetroArch*) install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
-  *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *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" ;;
   *) show_install_menu ;;
   esac
 }
@@ -243,7 +285,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 ;;
@@ -256,6 +298,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
 }
@@ -299,12 +342,14 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" "󰣇  Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Password\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
+  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
+  *Password*) show_update_password_menu ;;
   *) show_main_menu ;;
   esac
 }
@@ -316,7 +361,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_main_menu ;;
+  *) show_update_menu ;;
   esac
 }
 
@@ -330,7 +375,23 @@ 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" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
+  *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
 }
 
@@ -342,7 +403,7 @@ show_system_menu() {
   *Relaunch*) uwsm stop ;;
   *Restart*) systemctl reboot ;;
   *Shutdown*) systemctl poweroff ;;
-  *) show_main_menu ;;
+  *) back_to show_main_menu ;;
   esac
 }
 
@@ -361,15 +422,17 @@ go_to_menu() {
   *screenrecord*) show_screenrecord_menu ;;
   *toggle*) show_toggle_menu ;;
   *setup*) show_setup_menu ;;
+  *power*) show_setup_power_menu ;;
   *install*) show_install_menu ;;
   *remove*) show_remove_menu ;;
   *update*) show_update_menu ;;
+  *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;;
   *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

@@ -83,7 +83,11 @@ parse_bindings() {
 }'
 }
 
+monitor_height=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true) | .height')
+menu_height=$((monitor_height * 40 / 100))
+
 dynamic_bindings | \
   sort -u | \
   parse_bindings | \
-  walker --dmenu --theme keybindings -p 'Keybindings'
+  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
+
+    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-pkg-add

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

bin/omarchy-pkg-aur-accessible

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+curl -sf --connect-timeout 30 --retry 3 --retry-delay 3 -A "omarchy-update" \
+  "https://aur.archlinux.org/rpc/?v=5&type=info&arg=base" >/dev/null

bin/omarchy-pkg-aur-install

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+fzf_args=(
+  --multi
+  --preview 'yay -Sii {1}'
+  --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
+  --preview-label-pos='bottom'
+  --preview-window 'down:65%:wrap'
+  --bind 'alt-p:toggle-preview'
+  --bind 'alt-d:preview-half-page-down,alt-u:preview-half-page-up'
+  --bind 'alt-k:preview-up,alt-j:preview-down'
+  --color 'pointer:green,marker:green'
+)
+
+pkg_names=$(yay -Slqa | fzf "${fzf_args[@]}")
+
+if [[ -n "$pkg_names" ]]; then
+  # Convert newline-separated selections to space-separated for yay
+  echo "$pkg_names" | tr '\n' ' ' | xargs yay -S --noconfirm
+  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,10 +1,8 @@
 #!/bin/bash
 
-set -e
-
 fzf_args=(
   --multi
-  --preview 'yay -Sii {1}'
+  --preview 'pacman -Sii {1}'
   --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
@@ -14,11 +12,10 @@ fzf_args=(
   --color 'pointer:green,marker:green'
 )
 
-pkg_names=$(yay -Slq | fzf "${fzf_args[@]}")
+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 yay -Sy --noconfirm
-  sudo updatedb
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -S --noconfirm
   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

@@ -16,7 +16,6 @@ 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 yay -Rns --noconfirm
-  sudo updatedb
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Rns --noconfirm
   omarchy-show-done
 fi

bin/omarchy-refresh-applications

@@ -10,9 +10,4 @@ mkdir -p ~/.local/share/applications
 cp ~/.local/share/omarchy/applications/*.desktop ~/.local/share/applications/
 cp ~/.local/share/omarchy/applications/hidden/*.desktop ~/.local/share/applications/
 
-# Only copy xtras if user is not in bare mode
-if [[ ! -f ~/.local/state/omarchy/bare.mode ]] && [ -z "$OMARCHY_BARE" ]; then
-  cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
-fi
-
 update-desktop-database ~/.local/share/applications

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,6 @@
 #!/bin/bash
 
-if [[ "$1" == "-y" ]] || gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
+if [[ "$1" == "-y" ]]; then
   sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
   sudo plymouth-set-default-theme -R omarchy
 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,4 @@
+#!/bin/bash
+
+rfkill unblock bluetooth
+rfkill list bluetooth

bin/omarchy-restart-wifi

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+rfkill unblock wifi
+rfkill list wifi

bin/omarchy-setup-dns

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

bin/omarchy-setup-fido2

@@ -1,39 +1,127 @@
 #!/bin/bash
 
-if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your Fido2 device from sudo authentication.\n\e[0m"
-  yay -Rns --noconfirm libfido2 pam-u2f
-  sudo rm -rf /etc/fido2
-  sudo sed -i '\|^auth[[:space:]]\+sufficient[[:space:]]\+pam_u2f\.so[[:space:]]\+cue[[:space:]]\+authfile=/etc/fido2/fido2$|d' /etc/pam.d/sudo
-  echo -e "\e[32m\nYou've successfully removed the fido2 device setup.\e[0m"
-else
-  echo -e "\e[32mLet's setup your Fido2 device for sudo authentication.\n\e[0m"
-  yay -S --noconfirm --needed libfido2 pam-u2f
+set -e
 
-  tokens=$(fido2-token -L)
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
 
+print_success() {
+  echo -e "${GREEN}$1${NC}"
+}
+
+print_error() {
+  echo -e "${RED}$1${NC}"
+}
+
+print_info() {
+  echo -e "${YELLOW}$1${NC}"
+}
+
+check_fido2_hardware() {
+  tokens=$(fido2-token -L 2>/dev/null)
   if [ -z "$tokens" ]; then
-    echo -e "\e[31m\nNo fido2 device detected. Plug it in, you may have to unlock it as well\e[0m"
-  else
-    # Create the pamu2fcfg file
-    if [ ! -f /etc/fido2/fido2 ]; then
-      sudo mkdir -p /etc/fido2
-      echo -e "\e[32m\nLet's setup your device by confirming on the device now.\e[0m"
-      pamu2fcfg >/tmp/fido2 # This needs to run as the user
-      if [ $? -ne 0 ]; then
-        echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-        exit 1
-      fi
-      sudo mv /tmp/fido2 /etc/fido2/fido2
+    print_error "\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well)."
+    return 1
   fi
+  return 0
+}
 
-    # Add fido2 auth as an option for sudo
+setup_pam_config() {
+  # Configure sudo
   if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
+    print_info "Configuring sudo for FIDO2 authentication..."
     sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
   fi
 
-    if ! sudo echo -e "\e[32m\nPerfect! Now you can use your fido2 device for sudo.\e[0m"; then
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+  # Configure polkit
+  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_u2f.so' /etc/pam.d/polkit-1; then
+    print_info "Configuring polkit for FIDO2 authentication..."
+    sudo sed -i '1i auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/polkit-1
+  elif [ ! -f /etc/pam.d/polkit-1 ]; then
+    print_info "Creating polkit configuration with FIDO2 authentication..."
+    sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      sufficient pam_u2f.so cue authfile=/etc/fido2/fido2
+auth      required pam_unix.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
   fi
+}
+
+remove_pam_config() {
+  # Remove from sudo
+  if grep -q pam_u2f.so /etc/pam.d/sudo; then
+    print_info "Removing FIDO2 authentication from sudo..."
+    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/sudo
+  fi
+
+  # Remove from polkit
+  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_u2f.so' /etc/pam.d/polkit-1; then
+    print_info "Removing FIDO2 authentication from polkit..."
+    sudo sed -i '/pam_u2f\.so/d' /etc/pam.d/polkit-1
+  fi
+}
+
+if [[ "--remove" == "$1" ]]; then
+  print_success "Removing FIDO2 device from authentication.\n"
+
+  # Remove PAM configuration
+  remove_pam_config
+
+  # Remove FIDO2 configuration
+  if [ -d /etc/fido2 ]; then
+    print_info "Removing FIDO2 configuration..."
+    sudo rm -rf /etc/fido2
+  fi
+
+  # Uninstall packages
+  print_info "Removing FIDO2 packages..."
+  sudo pacman -Rns --noconfirm libfido2 pam-u2f
+
+  print_success "FIDO2 authentication has been completely removed."
+else
+  print_success "Setting up FIDO2 device for authentication.\n"
+
+  # Install required packages
+  print_info "Installing required packages..."
+  sudo pacman -S --noconfirm --needed libfido2 pam-u2f
+
+  if ! check_fido2_hardware; then
+    exit 1
+  fi
+
+  # Create the pamu2fcfg file
+  if [ ! -f /etc/fido2/fido2 ]; then
+    sudo mkdir -p /etc/fido2
+    print_success "\nLet's setup your device by confirming on the device now."
+    print_info "Touch your FIDO2 key when it lights up...\n"
+
+    if pamu2fcfg >/tmp/fido2; then
+      sudo mv /tmp/fido2 /etc/fido2/fido2
+      print_success "FIDO2 device registered successfully!"
+    else
+      print_error "\nFIDO2 registration failed. Please try again."
+      exit 1
+    fi
+  else
+    print_info "FIDO2 device already registered."
+  fi
+
+  # Configure PAM
+  setup_pam_config
+
+  # Test with sudo
+  print_info "\nTesting FIDO2 authentication with sudo..."
+  print_info "Touch your FIDO2 key when prompted.\n"
+
+  if sudo echo "FIDO2 authentication test successful"; then
+    print_success "\nPerfect! FIDO2 authentication is now configured."
+    print_info "You can use your FIDO2 key for sudo and polkit authentication."
+  else
+    print_error "\nVerification failed. You may want to check your configuration."
   fi
 fi

bin/omarchy-setup-fingerprint

@@ -1,45 +1,112 @@
 #!/bin/bash
 
-if [[ "--remove" == "$1" ]]; then
-  echo -e "\e[32mLet's remove your fingerprint scanner from authentication.\n\e[0m"
-  yay -Rns --noconfirm fprintd
-  sudo rm -rf /etc/pam.d/polkit-1
-  sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
-  echo -e "\e[32mYou've successfully removed the fingerprint setup.\e[0m"
-else
-  echo -e "\e[32mLet's setup your fingerprint scanner for authentication.\n\e[0m"
-  yay -S --noconfirm --needed fprintd usbutils
+set -e
 
-  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan'; then
-    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-  else
-    # Add fingerprint authentication as an option for sudo
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+print_success() {
+  echo -e "${GREEN}$1${NC}"
+}
+
+print_error() {
+  echo -e "${RED}$1${NC}"
+}
+
+print_info() {
+  echo -e "${YELLOW}$1${NC}"
+}
+
+check_fingerprint_hardware() {
+  if ! lsusb | grep -Eiq 'fingerprint|synaptics|goodix|elan|validity'; then
+    print_error "\nNo fingerprint sensor detected."
+    return 1
+  fi
+  return 0
+}
+
+setup_pam_config() {
+  # Configure sudo
   if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    print_info "Configuring sudo for fingerprint authentication..."
     sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
   fi
 
-    # Add fingerprint authentication as an option for hyprpolkitagent
-    if [ ! -f /etc/pam.d/polkit-1 ] || ! grep -q pam_fprintd.so /etc/pam.d/polkit-1; then
+  # Configure polkit
+  if [ -f /etc/pam.d/polkit-1 ] && ! grep -q 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+    print_info "Configuring polkit for fingerprint authentication..."
+    sudo sed -i '1i auth      sufficient pam_fprintd.so' /etc/pam.d/polkit-1
+  elif [ ! -f /etc/pam.d/polkit-1 ]; then
+    print_info "Creating polkit configuration with fingerprint authentication..."
     sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+auth      sufficient pam_fprintd.so
 auth      required pam_unix.so
-auth      optional pam_fprintd.so
 
 account   required pam_unix.so
 password  required pam_unix.so
 session   required pam_unix.so
 EOF
   fi
+}
 
-    # Enroll the first finger
-    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-    sudo fprintd-enroll $USER
-
-    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-    if fprintd-verify; then
-      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-    else
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+remove_pam_config() {
+  # Remove from sudo
+  if grep -q pam_fprintd.so /etc/pam.d/sudo; then
+    print_info "Removing fingerprint authentication from sudo..."
+    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/sudo
   fi
+
+  # Remove from polkit
+  if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
+    print_info "Removing fingerprint authentication from polkit..."
+    sudo sed -i '/pam_fprintd\.so/d' /etc/pam.d/polkit-1
+  fi
+}
+
+if [[ "--remove" == "$1" ]]; then
+  print_success "Removing fingerprint scanner from authentication.\n"
+
+  # Remove PAM configuration
+  remove_pam_config
+
+  # Uninstall packages
+  print_info "Removing fingerprint packages..."
+  sudo pacman -Rns --noconfirm fprintd
+
+  print_success "Fingerprint authentication has been completely removed."
+else
+  print_success "Setting up fingerprint scanner for authentication.\n"
+
+  # Install required packages
+  print_info "Installing required packages..."
+  sudo pacman -S --noconfirm --needed fprintd usbutils
+
+  if ! check_fingerprint_hardware; then
+    exit 1
+  fi
+
+  # Configure PAM
+  setup_pam_config
+
+  # 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"
+
+  if sudo fprintd-enroll "$USER"; then
+    print_success "\nFingerprint enrolled successfully!"
+
+    # Verify
+    print_info "\nNow let's verify that it's working correctly.\n"
+    if fprintd-verify; then
+      print_success "\nPerfect! Fingerprint authentication is now configured."
+      print_info "You can use your fingerprint for sudo, polkit, and lock screen (Super + Escape)."
+    else
+      print_error "\nVerification failed. You may want to try enrolling again."
+    fi
+  else
+    print_error "\nEnrollment failed. Please try again."
+    exit 1
   fi
 fi

bin/omarchy-snapshot

@@ -8,13 +8,23 @@ if [[ -z $COMMAND ]]; then
   exit 1
 fi
 
+if ! command -v snapper &>/dev/null; then
+  exit 127 # omarchy-update can use this to just ignore if snapper is not available
+fi
+
 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-status-daemon

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# Status indicator daemon for waybar
-# Calls individual status scripts and caches results
-
-STATE_DIR="/tmp/omarchy-status"
-DAEMON_PID_FILE="$STATE_DIR/daemon.pid"
-SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
-
-mkdir -p "$STATE_DIR"
-
-# Update all status files by calling individual scripts
-update_all_status_files() {
-  "$SCRIPT_DIR/omarchy-status-dnd" > "$STATE_DIR/dnd"
-  "$SCRIPT_DIR/omarchy-status-nightlight" > "$STATE_DIR/nightlight"
-  "$SCRIPT_DIR/omarchy-status-recording" > "$STATE_DIR/recording"
-  "$SCRIPT_DIR/omarchy-status-idle" > "$STATE_DIR/idle"
-}
-
-# Generate hash for change detection
-get_status_hash() {
-  echo "$(pgrep -c "mako|hyprsunset|wl-screenrec|wf-recorder|obs|hypridle" 2>/dev/null)$(makoctl mode 2>/dev/null | grep -c 'do-not-disturb')$(hyprctl hyprsunset temperature 2>/dev/null)"
-}
-
-# Start background monitoring daemon
-start_daemon() {
-  if [ -f "$DAEMON_PID_FILE" ] && kill -0 $(cat "$DAEMON_PID_FILE") 2>/dev/null; then
-    return 0
-  fi
-
-  {
-    last_hash=""
-    while true; do
-      current_hash=$(get_status_hash)
-      
-      if [ "$current_hash" != "$last_hash" ]; then
-        update_all_status_files
-        last_hash="$current_hash"
-      fi
-      
-      sleep 0.5
-    done
-  } &
-  
-  echo $! > "$DAEMON_PID_FILE"
-}
-
-# Main execution
-MODULE="$1"
-
-if [ -z "$MODULE" ]; then
-  echo "Usage: $0 [dnd|nightlight|recording|idle]"
-  exit 1
-fi
-
-start_daemon
-
-# Return cached status for requested module
-if [ -f "$STATE_DIR/$MODULE" ]; then
-  cat "$STATE_DIR/$MODULE"
-else
-  update_all_status_files
-  cat "$STATE_DIR/$MODULE" 2>/dev/null || echo '{"text": "", "tooltip": "", "class": "hidden"}'
-fi

bin/omarchy-status-dnd

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# DND status indicator
-
-if makoctl mode 2>/dev/null | grep -q 'do-not-disturb'; then
-  echo '{"text": "󰂛", "tooltip": "Notifications silenced", "class": "status-dnd"}'
-else
-  echo '{"text": "", "tooltip": "", "class": "hidden"}'
-fi

bin/omarchy-status-idle

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# Idle lock status indicator
-
-if command -v hypridle >/dev/null 2>&1 && ! pgrep -x hypridle >/dev/null 2>&1; then
-  echo '{"text": "󱫖", "tooltip": "Idle lock disabled", "class": "status-idle"}'
-else
-  echo '{"text": "", "tooltip": "", "class": "hidden"}'
-fi

bin/omarchy-status-nightlight

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# Nightlight status indicator
-
-if pgrep -x hyprsunset >/dev/null 2>&1; then
-  temp=$(hyprctl hyprsunset temperature 2>/dev/null | grep -oE '[0-9]+')
-  if [ -n "$temp" ] && [ "$temp" -lt 6000 ]; then
-    echo '{"text": "󰔎", "tooltip": "Night light active", "class": "status-nightlight"}'
-  else
-    echo '{"text": "", "tooltip": "", "class": "hidden"}'
-  fi
-else
-  echo '{"text": "", "tooltip": "", "class": "hidden"}'
-fi

bin/omarchy-status-recording

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Recording status indicator
-
-if pgrep -x wl-screenrec >/dev/null 2>&1 || \
-   pgrep -x wf-recorder >/dev/null 2>&1 || \
-   pgrep -x obs >/dev/null 2>&1 || \
-   pgrep -f "ffmpeg.*(x11grab|gdigrab|avfoundation)" >/dev/null 2>&1; then
-  echo '{"text": "󰻂", "tooltip": "Screen recording active", "class": "status-recording"}'
-else
-  echo '{"text": "", "tooltip": "", "class": "hidden"}'
-fi

bin/omarchy-theme-set

@@ -40,11 +40,19 @@ else
 fi
 
 # Change Chromium colors
-if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
+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
+  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

bin/omarchy-tui-remove

@@ -3,8 +3,8 @@
 ICON_DIR="$HOME/.local/share/applications/icons"
 DESKTOP_DIR="$HOME/.local/share/applications/"
 
-if [ "$#" -ne 1 ]; then
-  # Find all web apps
+if [ "$#" -eq 0 ]; then
+  # Find all TUIs
   while IFS= read -r -d '' file; do
     if grep -q '^Exec=.*alacritty.*-e' "$file"; then
       TUIS+=("$(basename "${file%.desktop}")")
@@ -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
-  echo "You must provide TUI name."
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
+  echo "You must provide TUI names."
   exit 1
 fi
 
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi
+for APP_NAME in "${APP_NAMES[@]}"; do
+  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+  rm -f "$ICON_DIR/$APP_NAME.png"
+  echo "Removed $APP_NAME"
+done

bin/omarchy-update

@@ -2,7 +2,7 @@
 
 set -e
 
-omarchy-snapshot create
+omarchy-snapshot create || [ $? -eq 127 ]
 omarchy-update-git
 omarchy-migrate
 omarchy-update-system-pkgs

bin/omarchy-update-available

@@ -1,13 +1,18 @@
 #!/bin/bash
 
-# Ensure remote is reachable
-if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then
-  echo "Error: Unable to reach remote repository."
+# Get remote tag
+latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+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-restart

@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# Check for kernel package updates since last boot
-boot_time=$(date -d "$(uptime -s)" '+%Y-%m-%d %H:%M')
-recent_kernel_updates=$(awk -v boot_time="$boot_time" '$0 >="["boot_time' /var/log/pacman.log | grep -E "\[ALPM\] (upgraded|installed) (linux|linux-zen|linux-lts|linux-hardened)\b" || true)
-if [ -n "$recent_kernel_updates" ]; then
+if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
   gum confirm "Linux kernel has been updated. Reboot?" && omarchy-state clear re*-required && sudo reboot now
 
 elif [ -f "$HOME/.local/state/omarchy/reboot-required" ]; then

bin/omarchy-update-system-pkgs

@@ -1,5 +1,31 @@
 #!/bin/bash
 
+# 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"
-yay -Syu --noconfirm
-echo
+[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+
+# 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"
+    echo
+  else
+    echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+    echo
+  fi
+fi
+
+orphans=$(pacman -Qtdq)
+if [[ -n $orphans ]]; then
+  echo -e "\e[32m\nRemove orphan system packages\e[0m"
+  for pkg in $orphans; do
+    sudo pacman -Rs --noconfirm "$pkg" || true
+  done
+  echo
+fi

bin/omarchy-version-branch

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD)

bin/omarchy-webapp-remove

@@ -3,7 +3,7 @@
 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
   while IFS= read -r -d '' file; do
     if grep -q '^Exec=.*omarchy-launch-webapp.*' "$file"; then
@@ -14,23 +14,28 @@ if [ "$#" -ne 1 ]; then
   if ((${#WEB_APPS[@]})); then
     IFS=$'\n' SORTED_WEB_APPS=($(sort <<<"${WEB_APPS[*]}"))
     unset IFS
-    APP_NAME=$(gum choose --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
+    APP_NAMES_STRING=$(gum choose --no-limit --header "Select web app to remove..." --selected-prefix="✗ " "${SORTED_WEB_APPS[@]}")
+    # 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 web apps 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
-  echo "You must provide web app name."
+if [[ ${#APP_NAMES[@]} -eq 0 ]]; then
+  echo "You must provide web app names."
   exit 1
 fi
 
-rm "$DESKTOP_DIR/$APP_NAME.desktop"
-rm "$ICON_DIR/$APP_NAME.png"
-
-if [ "$#" -ne 1 ]; then
-  echo -e "Removed $APP_NAME\n"
-fi
+for APP_NAME in "${APP_NAMES[@]}"; do
+  rm -f "$DESKTOP_DIR/$APP_NAME.desktop"
+  rm -f "$ICON_DIR/$APP_NAME.png"
+  echo "Removed $APP_NAME"
+done

boot.sh

@@ -14,7 +14,7 @@ ansi_art='                 ▄▄▄
 clear
 echo -e "\n$ansi_art\n"
 
-sudo pacman -Sy --noconfirm --needed git
+sudo pacman -Syu --noconfirm --needed git
 
 # Use custom repo if specified, otherwise default to basecamp/omarchy
 OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
@@ -23,8 +23,9 @@ echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
 rm -rf ~/.local/share/omarchy/
 git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
 
-# Use custom branch if instructed
-if [[ -n "$OMARCHY_REF" ]]; then
+# Use custom branch if instructed, otherwise default to master
+OMARCHY_REF="${OMARCHY_REF:-master}"
+if [[ $OMARCHY_REF != "master" ]]; then
   echo -e "\eUsing branch: $OMARCHY_REF"
   cd ~/.local/share/omarchy
   git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"

config/alacritty/alacritty.toml

@@ -13,7 +13,6 @@ size = 9
 padding.x = 14
 padding.y = 14
 decorations = "None"
-opacity = 0.98
 
 [keyboard]
 bindings = [

config/chromium/Default/Preferences

@@ -0,0 +1,15 @@
+{
+  "extensions": {
+    "theme": {
+      "id": "",
+      "use_system": false,
+      "use_custom": false
+    }
+  },
+  "browser": {
+    "theme": {
+      "color_scheme": 2,
+      "user_color": 2
+    }
+  }
+}

config/fastfetch/config.jsonc

@@ -63,41 +63,20 @@
       "format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
     },
     {
-      "type": "os",
-      "key": "󰣇 OS",
-      "keyColor": "yellow"
+      "type": "command",
+      "key": "\ue900 OS",
+      "keyColor": "blue",
+      "text": "version=$(omarchy-version); echo \"Omarchy $version\""
+    },
+    {
+      "type": "command",
+      "key": "│ ├󰘬",
+      "keyColor": "blue",
+      "text": "branch=$(omarchy-version-branch); echo \"$branch\""
     },
     {
       "type": "kernel",
       "key": "│ ├",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "packages",
-      "key": "│ ├󰏖",
-      "keyColor": "yellow"
-    },
-    {
-      "type": "shell",
-      "key": "└ └",
-      "keyColor": "yellow"
-    },
-    "break",
-    {
-      "type": "command",
-      "key": "│ ├Ø",
-      "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
-    },
-    {
-      "type": "command",
-      "key": "│ ├󰸌",
-      "keyColor": "blue",
-      "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\""
-    },
-    {
-      "type": "de",
-      "key": " DE",
       "keyColor": "blue"
     },
     {
@@ -105,29 +84,35 @@
       "key": "│ ├",
       "keyColor": "blue"
     },
+    {
+      "type": "de",
+      "key": " DE",
+      "keyColor": "blue"
+    },
+    {
+      "type": "terminal",
+      "key": "│ ├",
+      "keyColor": "blue"
+    },
+    {
+      "type": "packages",
+      "key": "│ ├󰏖",
+      "keyColor": "blue"
+    },
     {
       "type": "wmtheme",
       "key": "│ ├󰉼",
       "keyColor": "blue"
     },
     {
-      "type": "icons",
-      "key": "│ ├󰀻",
-      "keyColor": "blue"
-    },
-    {
-      "type": "cursor",
-      "key": "│ ├",
-      "keyColor": "blue"
+      "type": "command",
+      "key": "│ ├󰸌",
+      "keyColor": "blue",
+      "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\""
     },
     {
       "type": "terminalfont",
-      "key": "│ ├",
-      "keyColor": "blue"
-    },
-    {
-      "type": "terminal",
-      "key": "└ └",
+      "key": "└ └",
       "keyColor": "blue"
     },
     {
@@ -141,13 +126,13 @@
     },
     {
       "type": "command",
-      "key": "  OS Age ",
+      "key": "󱦟 OS Age",
       "keyColor": "magenta",
       "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
     },
     {
       "type": "uptime",
-      "key": "  Uptime ",
+      "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
     {

config/hypr/bindings.conf

@@ -2,7 +2,7 @@
 $terminal = uwsm app -- alacritty
 $browser = omarchy-launch-browser
 
-bindd = SUPER, return, Terminal, exec, $terminal --working-directory $(omarchy-cmd-terminal-cwd)
+bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
 bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
 bindd = SUPER, B, Browser, exec, $browser
 bindd = SUPER, M, Music, exec, uwsm app -- spotify
@@ -25,5 +25,5 @@ bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/"
 bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 
 # Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, Space
+# unbind = SUPER, SPACE
 # bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu

config/hypr/hypridle.conf

@@ -2,7 +2,7 @@ general {
     lock_cmd = omarchy-lock-screen                         # lock screen and 1password
     before_sleep_cmd = loginctl lock-session               # lock before suspend.
     after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
-    on_unlock_cmd = omarchy-restart-waybar                 # prevent stacking of waybar when waking
+    inhibit_sleep = 3                                      # wait until screen is locked
 }
 
 listener {

config/hypr/input.conf

@@ -9,6 +9,9 @@ input {
   repeat_rate = 40
   repeat_delay = 600
 
+  # Start with numlock on by default
+  numlock_by_default = true
+
   # Increase sensitity for mouse/trackpack (default: 0)
   # sensitivity = 0.35
 

config/waybar/config.jsonc

@@ -4,15 +4,8 @@
   "position": "top",
   "spacing": 0,
   "height": 26,
-  "modules-left": [
-    "custom/omarchy",
-    "hyprland/workspaces"
-  ],
-  "modules-center": [
-    "group/status-cluster",
-    "clock",
-    "custom/update"
-  ],
+  "modules-left": ["custom/omarchy", "hyprland/workspaces"],
+  "modules-center": ["clock", "custom/update"],
   "modules-right": [
     "group/tray-expander",
     "bluetooth",
@@ -46,14 +39,14 @@
     }
   },
   "custom/omarchy": {
-    "format": "",
+    "format": "<span font='omarchy'>\ue900</span>",
     "on-click": "omarchy-menu",
     "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
   },
   "custom/update": {
     "format": "",
     "exec": "omarchy-update-available",
-    "on-click": "alacritty --class Omarchy --title Omarchy -e omarchy-update",
+    "on-click": "omarchy-launch-floating-terminal-with-presentation omarchy-update",
     "tooltip-format": "Omarchy update available",
     "interval": 3600
   },
@@ -64,22 +57,22 @@
     "on-click": "alacritty -e btop"
   },
   "clock": {
-    "format": "{:%A %H:%M}",
-    "format-alt": "{:%d %B W%V %Y}",
+    "format": "{:L%A %H:%M}",
+    "format-alt": "{:L%d %B W%V %Y}",
     "tooltip": false,
     "on-click-right": "omarchy-cmd-tzupdate"
   },
   "network": {
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
-    "format" : "{icon}",
-    "format-wifi" : "{icon}",
-    "format-ethernet" : "󰀂",
-    "format-disconnected" : "󰖪",
+    "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
+    "format": "{icon}",
+    "format-wifi": "{icon}",
+    "format-ethernet": "󰀂",
+    "format-disconnected": "󰖪",
     "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-disconnected": "Disconnected",
     "interval": 3,
-    "nospacing": 1,
+    "spacing": 1,
     "on-click": "alacritty --class=Impala -e impala"
   },
   "battery": {
@@ -88,17 +81,14 @@
     "format-charging": "{icon}",
     "format-plugged": "",
     "format-icons": {
-      "charging": [
-        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
-      ],
-      "default": [
-        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
-      ]
+      "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"],
+      "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
     },
     "format-full": "󰂅",
     "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
     "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
     "interval": 5,
+    "on-click": "omarchy-menu power",
     "states": {
       "warning": 20,
       "critical": 10
@@ -128,43 +118,7 @@
       "transition-duration": 600,
       "children-class": "tray-group-item"
     },
-    "modules": [
-      "custom/expand-icon",
-    "tray"
-    ]
-  },
-  "group/status-cluster": {
-    "orientation": "inherit",
-    "modules": [
-      "custom/status-dnd",
-      "custom/status-nightlight", 
-      "custom/status-recording",
-      "custom/status-idle"
-    ]
-  },
-  "custom/status-dnd": {
-    "exec": "omarchy-status-daemon dnd",
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "makoctl mode -t do-not-disturb"
-  },
-  "custom/status-nightlight": {
-    "exec": "omarchy-status-daemon nightlight", 
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "omarchy-toggle-nightlight"
-  },
-  "custom/status-recording": {
-    "exec": "omarchy-status-daemon recording",
-    "return-type": "json", 
-    "interval": 1,
-    "on-click": "omarchy-cmd-screenrecord-stop"
-  },
-  "custom/status-idle": {
-    "exec": "omarchy-status-daemon idle",
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "omarchy-toggle-idle"
+    "modules": ["custom/expand-icon", "tray"]
   },
   "custom/expand-icon": {
     "format": " ",

config/waybar/style.css

@@ -58,30 +58,6 @@ tooltip {
   margin-left: 8.75px;
 }
 
-#group-status-cluster {
-  margin-right: 8.75px;
-}
-
-#custom-status-dnd,
-#custom-status-nightlight, 
-#custom-status-recording,
-#custom-status-idle {
-  min-width: 12px;
-  margin: 0 2px;
-  font-size: 10px;
-}
-
-#custom-status-dnd.status-dnd,
-#custom-status-nightlight.status-nightlight,
-#custom-status-idle.status-idle {
-  opacity: 1;
-}
-
-#custom-status-recording.status-recording {
-  color: #a55555;
-  opacity: 1;
-}
-
 .hidden {
   opacity: 0;
 }

default/bash/aliases

@@ -24,12 +24,12 @@ alias ...='cd ../..'
 alias ....='cd ../../..'
 
 # Tools
-alias g='git'
 alias d='docker'
 alias r='rails'
 n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }
 
 # Git
+alias g='git'
 alias gcm='git commit -m'
 alias gcam='git commit -a -m'
 alias gcad='git commit -a --amend'

default/bash/functions

@@ -65,4 +65,3 @@ img2png() {
     -define png:exclude-chunk=all \
     "${1%.*}.png"
 }
-

default/hypr/apps.conf

@@ -1,11 +1,12 @@
 # App-specific tweaks
-source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
-source = ~/.local/share/omarchy/default/hypr/apps/chromium.conf
+source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
+source = ~/.local/share/omarchy/default/hypr/apps/bitwarden.conf
+source = ~/.local/share/omarchy/default/hypr/apps/browser.conf
 source = ~/.local/share/omarchy/default/hypr/apps/hyprshot.conf
+source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
+source = ~/.local/share/omarchy/default/hypr/apps/pip.conf
+source = ~/.local/share/omarchy/default/hypr/apps/qemu.conf
 source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf
 source = ~/.local/share/omarchy/default/hypr/apps/steam.conf
 source = ~/.local/share/omarchy/default/hypr/apps/system.conf
 source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
-source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
-source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
-source = ~/.local/share/omarchy/default/hypr/apps/zoom.conf

default/hypr/apps/bitwarden.conf

@@ -0,0 +1 @@
+windowrule = noscreenshare, class:^(Bitwarden)$

default/hypr/apps/browser.conf

@@ -0,0 +1,13 @@
+# Browser types
+windowrule = tag +chromium-based-browser, class:([cC]hrom(e|ium)|[bB]rave-browser|Microsoft-edge|Vivaldi-stable)
+windowrule = tag +firefox-based-browser, class:([fF]irefox|zen|librewolf)
+
+# Force chromium-based browsers into a tile to deal with --app bug
+windowrule = tile, tag:chromium-based-browser
+
+# Only a subtle opacity change, but not for video sites
+windowrule = opacity 1 0.97, tag:chromium-based-browser
+windowrule = opacity 1 0.97, tag:firefox-based-browser
+
+# Some video sites should never have opacity applied to them
+windowrule = opacity 1.0 1.0, initialTitle:((?i)(?:[a-z0-9-]+\.)*youtube\.com_/|app\.zoom\.us_/wc/home)

default/hypr/apps/chromium.conf

@@ -1,6 +0,0 @@
-# Force chromium into a tile to deal with --app bug
-windowrule = tile, class:^(Chromium)$
-
-# Only slight opacity when unfocused
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable|Brave-browser|brave-browser)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube

default/hypr/apps/jetbrains.conf

@@ -1,10 +1,6 @@
 # Fixing popup size issue
 windowrule = size 50% 50%, class:(.*jetbrains.*)$, title:^$,floating:1
 
-# Fix tooltips (always have a title of `win.<id>`)
-windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^(win.*)$
-windowrule = nofocus, class:^(.*jetbrains.*)$, title:^(win.*)$
-
 # Fix tab dragging (always have a single space character as their title)
 windowrule = noinitialfocus, class:^(.*jetbrains.*)$, title:^\\s$
 windowrule = nofocus, class:^(.*jetbrains.*)$, title:^\\s$

default/hypr/apps/qemu.conf

@@ -0,0 +1 @@
+windowrule = opacity 1 1, class:qemu

default/hypr/apps/retroarch.conf

@@ -1,3 +1,4 @@
 windowrule = fullscreen, class:com.libretro.RetroArch
 windowrule = opacity 1 1, class:com.libretro.RetroArch
+windowrule = idleinhibit fullscreen, class:com.libretro.RetroArch
 

default/hypr/apps/steam.conf

@@ -4,3 +4,4 @@ windowrule = center, class:steam, title:Steam
 windowrule = opacity 1 1, class:steam
 windowrule = size 1100 700, class:steam, title:Steam
 windowrule = size 460 800, class:steam, title:Friends List
+windowrule = idleinhibit fullscreen, class:steam

default/hypr/apps/system.conf

@@ -4,7 +4,7 @@ windowrule = center, tag:floating-window
 windowrule = size 800 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), title:^(Open.*Files?|Save.*Files?|All Files|Save)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors|org.gnome.Nautilus), title:^(Open.*Files?|Open Folder|Save.*Files?|Save.*As|Save|All Files)
 
 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver

default/hypr/apps/zoom.conf

@@ -1,2 +0,0 @@
-windowrule = opacity 1 1, class:Zoom Workplace
-

default/hypr/autostart.conf

@@ -6,7 +6,4 @@ 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 = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
-
-# FIXME: Reenable the walker service once the memory leak has been fixed
-# See https://github.com/basecamp/omarchy/issues/698
-# exec-once = uwsm app -- walker --gapplication-service
+exec-once = omarchy-cmd-first-run

default/hypr/bindings/tiling.conf

@@ -39,8 +39,8 @@ bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
 bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
 
 # Tab between workspaces
-bind = SUPER, TAB, workspace, e+1
-bind = SUPER SHIFT, TAB, workspace, e-1
+bindd = SUPER, TAB, Next workspace, workspace, e+1
+bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
 
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, left, Swap window to the left, swapwindow, l
@@ -55,10 +55,10 @@ bindd = ALT, Tab, Reveal active window on top, bringactivetotop
 bindd = ALT SHIFT, Tab, Reveal active window on top, bringactivetotop
 
 # Resize active window
-bindd = SUPER, minus, Expand window left, resizeactive, -100 0
-bindd = SUPER, equal, Shrink window left, resizeactive, 100 0
-bindd = SUPER SHIFT, minus, Shrink window up, resizeactive, 0 -100
-bindd = SUPER SHIFT, equal, Expand window down, resizeactive, 0 100
+bindd = SUPER, code:20, Expand window left, resizeactive, -100 0    # - key
+bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0     # = key
+bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100
+bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100
 
 # Scroll through existing workspaces with SUPER + scroll
 bindd = SUPER, mouse_down, Scroll active workspace forward, workspace, e+1

default/hypr/bindings/utilities.conf

@@ -1,13 +1,13 @@
 # Menus
 bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
-bindd = SUPER CTRL, E, Show clipboard, exec, walker -m Emojis
+bindd = SUPER CTRL, E, Emoji picker, exec, walker -m Emojis
 bindd = SUPER ALT, SPACE, Omarchy menu, exec, omarchy-menu
 bindd = SUPER, ESCAPE, Power menu, exec, omarchy-menu system
 bindld = , XF86PowerOff, Power menu, exec, omarchy-menu system
 bindd = SUPER, K, Show key bindings, exec, omarchy-menu-keybindings
 
 # Aesthetics
-bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, pkill -SIGUSR1 waybar
+bindd = SUPER SHIFT, SPACE, Toggle top bar, exec, omarchy-toggle-waybar
 bindd = SUPER CTRL, SPACE, Next background in theme, exec, omarchy-theme-bg-next
 bindd = SUPER SHIFT CTRL, SPACE, Pick new theme, exec, omarchy-menu theme
 
@@ -33,8 +33,10 @@ bindd = SHIFT, PRINT, Screenshot of window, exec, omarchy-cmd-screenshot window
 bindd = CTRL, PRINT, Screenshot of display, exec, omarchy-cmd-screenshot output
 
 # Screen recordings
-bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord
+bindd = ALT, PRINT, Screen record a region, exec, omarchy-cmd-screenrecord region
+bindd = ALT SHIFT, PRINT, Screen record a region with audio, exec, omarchy-cmd-screenrecord region audio
 bindd = CTRL ALT, PRINT, Screen record display, exec, omarchy-cmd-screenrecord output
+bindd = CTRL ALT SHIFT, PRINT, Screen record display with audio, exec, omarchy-cmd-screenrecord output audio
 
 # Color picker
 bindd = SUPER, PRINT, Color picker, exec, pkill hyprpicker || hyprpicker -a

default/hypr/envs.conf

@@ -10,6 +10,11 @@ env = SDL_VIDEODRIVER,wayland
 env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,wayland
 env = OZONE_PLATFORM,wayland
+env = XDG_SESSION_TYPE,wayland
+
+# Allow better support for screen sharing (Google Meet, Discord, etc)
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
 
 xwayland {
   force_zero_scaling = true

default/mako/core.ini

@@ -0,0 +1,16 @@
+anchor=top-right
+default-timeout=5000
+width=420
+height=110
+
+[app-name=Spotify]
+invisible=1
+
+[mode=do-not-disturb]
+invisible=true
+
+[mode=do-not-disturb app-name=notify-send]
+invisible=false
+
+[urgency=critical]
+default-timeout=0

default/pacman/mirrorlist

@@ -0,0 +1,3 @@
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch

default/pacman/pacman.conf

@@ -0,0 +1,30 @@
+# See the pacman.conf(5) manpage for option and repository directives
+
+[options]
+Color
+ILoveCandy
+VerbosePkgLists
+HoldPkg = pacman glibc
+Architecture = auto
+CheckSpace
+ParallelDownloads = 5
+DownloadUser = alpm
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+
+# pacman searches repositories in the order defined here
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# [multilib]
+# Include = /etc/pacman.d/mirrorlist
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/$arch

install.sh

@@ -1,121 +1,60 @@
 #!/bin/bash
 
 # Exit immediately if a command exits with a non-zero status
-set -e
+set -eE
 
-export PATH="$HOME/.local/share/omarchy/bin:$PATH"
-OMARCHY_INSTALL=~/.local/share/omarchy/install
+OMARCHY_PATH="$HOME/.local/share/omarchy"
+OMARCHY_INSTALL="$OMARCHY_PATH/install"
+export PATH="$OMARCHY_PATH/bin:$PATH"
 
-# Give people a chance to retry running the installation
-catch_errors() {
-  echo -e "\n\e[31mOmarchy installation failed!\e[0m"
-  echo "The failing command was: \`$BASH_COMMAND\` (exit code: $?)"
-  echo
-  echo "Get help from the community via QR code or at https://discord.gg/tXFUdasqhY"
-  echo "                                 "
-  echo "    █▀▀▀▀▀█ ▄ ▄ ▀▄▄▄█ █▀▀▀▀▀█    "
-  echo "    █ ███ █ ▄▄▄▄▀▄▀▄▀ █ ███ █    "
-  echo "    █ ▀▀▀ █ ▄█  ▄█▄▄▀ █ ▀▀▀ █    "
-  echo "    ▀▀▀▀▀▀▀ ▀▄█ █ █ █ ▀▀▀▀▀▀▀    "
-  echo "    ▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █     "
-  echo "    █▄█ ▄▄▀▄▄ ▀ ▄ ▀█▄▄▄▄ ▀ ▀█    "
-  echo "    ▄ ▄▀█ ▀▄▀▀▀▄ ▄█▀▄█▀▄▀▄▀█▀    "
-  echo "    █ ▄▄█▄▀▄█ ▄▄▄  ▀ ▄▀██▀ ▀█    "
-  echo "    ▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀      "
-  echo "    █▀▀▀▀▀█ ▀█  ▄▀▀ █ ▀ █▄▀██    "
-  echo "    █ ███ █ █▀▄▄▀ █▀███▀█▄██▄    "
-  echo "    █ ▀▀▀ █ ██  ▀ █▄█ ▄▄▄█▀ █    "
-  echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
-  echo "                                 "
-
-  if [[ -n $OMARCHY_BARE ]]; then
-    echo "You can retry by running: OMARCHY_BARE=true bash ~/.local/share/omarchy/install.sh"
-  else
-    echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
-  fi
-}
-
-trap catch_errors ERR
-
-show_logo() {
-  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  echo
-}
-
-show_subtext() {
-  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
-  echo
-}
-
-# Install prerequisites
-source $OMARCHY_INSTALL/preflight/chroot.sh
-source $OMARCHY_INSTALL/preflight/mirrorlist.sh
-source $OMARCHY_INSTALL/preflight/gum.sh
+# Preparation
+source $OMARCHY_INSTALL/preflight/show-env.sh
+source $OMARCHY_INSTALL/preflight/trap-errors.sh
 source $OMARCHY_INSTALL/preflight/guard.sh
-source $OMARCHY_INSTALL/preflight/aur.sh
-source $OMARCHY_INSTALL/preflight/tte.sh
+source $OMARCHY_INSTALL/preflight/chroot.sh
+source $OMARCHY_INSTALL/preflight/pacman.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
+source $OMARCHY_INSTALL/preflight/first-run-mode.sh
+
+# Packaging
+source $OMARCHY_INSTALL/packages.sh
+source $OMARCHY_INSTALL/packaging/fonts.sh
+source $OMARCHY_INSTALL/packaging/lazyvim.sh
+source $OMARCHY_INSTALL/packaging/webapps.sh
+source $OMARCHY_INSTALL/packaging/tuis.sh
 
 # Configuration
 source $OMARCHY_INSTALL/config/config.sh
+source $OMARCHY_INSTALL/config/theme.sh
 source $OMARCHY_INSTALL/config/branding.sh
-source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
-source $OMARCHY_INSTALL/config/fix-fkeys.sh
-source $OMARCHY_INSTALL/config/network.sh
-source $OMARCHY_INSTALL/config/power.sh
-source $OMARCHY_INSTALL/config/usb-autosuspend.sh
+source $OMARCHY_INSTALL/config/git.sh
+source $OMARCHY_INSTALL/config/gpg.sh
 source $OMARCHY_INSTALL/config/timezones.sh
-source $OMARCHY_INSTALL/config/nvidia.sh
 source $OMARCHY_INSTALL/config/increase-sudo-tries.sh
-source $OMARCHY_INSTALL/config/ignore-power-button.sh
+source $OMARCHY_INSTALL/config/increase-lockout-limit.sh
+source $OMARCHY_INSTALL/config/ssh-flakiness.sh
+source $OMARCHY_INSTALL/config/detect-keyboard-layout.sh
+source $OMARCHY_INSTALL/config/xcompose.sh
+source $OMARCHY_INSTALL/config/mise-ruby.sh
+source $OMARCHY_INSTALL/config/docker.sh
+source $OMARCHY_INSTALL/config/mimetypes.sh
+source $OMARCHY_INSTALL/config/localdb.sh
+source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
+source $OMARCHY_INSTALL/config/hardware/network.sh
+source $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
+source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
+source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
+source $OMARCHY_INSTALL/config/hardware/printer.sh
+source $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
+source $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
+source $OMARCHY_INSTALL/config/hardware/nvidia.sh
+source $OMARCHY_INSTALL/config/hardware/intel.sh
+source $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Development
-source $OMARCHY_INSTALL/development/terminal.sh
-source $OMARCHY_INSTALL/development/development.sh
-source $OMARCHY_INSTALL/development/nvim.sh
-source $OMARCHY_INSTALL/development/ruby.sh
-source $OMARCHY_INSTALL/development/docker.sh
-source $OMARCHY_INSTALL/development/firewall.sh
-
-# Desktop
-source $OMARCHY_INSTALL/desktop/desktop.sh
-source $OMARCHY_INSTALL/desktop/hyprlandia.sh
-source $OMARCHY_INSTALL/desktop/theme.sh
-source $OMARCHY_INSTALL/desktop/bluetooth.sh
-source $OMARCHY_INSTALL/desktop/asdcontrol.sh
-source $OMARCHY_INSTALL/desktop/fonts.sh
-source $OMARCHY_INSTALL/desktop/printer.sh
-
-# Apps
-source $OMARCHY_INSTALL/apps/webapps.sh
-source $OMARCHY_INSTALL/apps/tuis.sh
-source $OMARCHY_INSTALL/apps/xtras.sh
-source $OMARCHY_INSTALL/apps/mimetypes.sh
-
-# Updates
-sudo updatedb
-
-# Update system packages if we have a network connection
-if ping -c5 omarchy.org &>/dev/null; then
-  yay -Syu --noconfirm
-fi
-
-# Reboot
-show_logo laseretch 920
-show_subtext "You're done! So we're ready to reboot now..."
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-  echo
-  read -n 1 -s -r -p "Remove the USB installer then press any key to reboot..."
-  echo
-fi
-
-sleep 2
-reboot
+# Finishing
+source $OMARCHY_INSTALL/reboot.sh

install/apps/tuis.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-if [ -z "$OMARCHY_BARE" ]; then
-  omarchy-tui-install "Disk Usage" "bash -c 'dust; read -n 1 -s'" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/qdirstat.png
-  omarchy-tui-install "Docker" "lazydocker" tile https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/docker.png
-fi

install/apps/webapps.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -z "$OMARCHY_BARE" ]; then
-  omarchy-webapp-install "HEY" https://app.hey.com https://www.hey.com/assets/images/general/hey.png
-  omarchy-webapp-install "Basecamp" https://launchpad.37signals.com https://basecamp.com/assets/images/general/basecamp.png
-  omarchy-webapp-install "WhatsApp" https://web.whatsapp.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/whatsapp.png
-  omarchy-webapp-install "Google Photos" https://photos.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-photos.png
-  omarchy-webapp-install "Google Contacts" https://contacts.google.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-contacts.png
-  omarchy-webapp-install "Google Messages" https://messages.google.com/web/conversations https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/google-messages.png
-  omarchy-webapp-install "ChatGPT" https://chatgpt.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/chatgpt.png
-  omarchy-webapp-install "YouTube" https://youtube.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/youtube.png
-  omarchy-webapp-install "GitHub" https://github.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/github-light.png
-  omarchy-webapp-install "X" https://x.com/ https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/x-light.png
-  omarchy-webapp-install "Figma" https://figma.com/ https://www.veryicon.com/download/png/application/app-icon-7/figma-1?s=256
-  omarchy-webapp-install "Discord" https://discord.com/channels/@me https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/discord.png
-fi