Merge pull request #1064 from basecamp/dev

Omarchy 2.0
2025-08-25 16:10:15 +02:00 · 2025-08-25 16:10:15 +02:00 · acc1e2f757
commit acc1e2f757
parent cc80782160 51f877ca1f
236 changed files with 2013 additions and 1053 deletions
--- a/applications/About.desktop
+++ b/applications/About.desktop
@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=About
-Comment=System information from Fastfetch
-Exec=alacritty -o "font.size=9" --class=About --title=About -e bash -c 'fastfetch; read -n 1 -s'
-Terminal=false
-Type=Application
-Icon=Arch
-Categories=GTK;
-StartupNotify=false
-
--- a/applications/Activity.desktop
+++ b/applications/Activity.desktop
@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Activity
-Comment=System activity from btop
-Exec=alacritty --class=Activity --title=Activity -e btop
-Terminal=false
-Type=Application
-Icon=Activity
-Categories=GTK;
-StartupNotify=false
-
--- a/applications/Docker.desktop
+++ b/applications/Docker.desktop
@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Docker
-Comment=Manage Docker containers with LazyDocker
-Exec=alacritty --class=Docker --title=Docker -e lazydocker
-Terminal=false
-Type=Application
-Icon=Docker
-Categories=GTK;
-StartupNotify=false
-
--- a/applications/chromium.desktop
+++ b/applications/chromium.desktop
@ -1,221 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chromium
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=متصفح الشبكة
-GenericName[bg]=Уеб браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlížeč
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[ml]=വെബ് ബ്രൌസര്‍
-GenericName[mr]=वेब ब्राऊजर
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=Веб-браузер
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=இணைய உலாவி
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_HK]=網頁瀏覽器
-GenericName[zh_TW]=網頁瀏覽器
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
-GenericName[sk]=WWW prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[te]=మహాతల అన్వేషి
-GenericName[vi]=Bộ duyệt Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=الدخول إلى الإنترنت
-Comment[bg]=Достъп до интернет
-Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
-Comment[ca]=Accedeix a Internet
-Comment[cs]=Přístup k internetu
-Comment[da]=Få adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=Πρόσβαση στο Διαδίκτυο
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
-Comment[he]=גישה אל האינטרנט
-Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=インターネットにアクセス
-Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
-Comment[ko]=인터넷 연결
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piekļūt internetam
-Comment[ml]=ഇന്റര്‍‌നെറ്റ് ആക്‌സസ് ചെയ്യുക
-Comment[mr]=इंटरनेटमध्ये प्रवेश करा
-Comment[nb]=Gå til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesaţi Internetul
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prístup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=Приступите Интернету
-Comment[sv]=Gå ut på Internet
-Comment[ta]=இணையத்தை அணுகுதல்
-Comment[te]=ఇంటర్నెట్‌ను ఆక్సెస్ చెయ్యండి
-Comment[th]=เข้าถึงอินเทอร์เน็ต
-Comment[tr]=İnternet'e erişin
-Comment[uk]=Доступ до Інтернету
-Comment[vi]=Truy cập Internet
-Comment[zh_CN]=访问互联网
-Comment[zh_HK]=連線到網際網路
-Comment[zh_TW]=連線到網際網路
-Exec=/usr/bin/chromium --ozone-platform=wayland %U
-StartupNotify=true
-Terminal=false
-Icon=chromium
-Type=Application
-Categories=Network;WebBrowser;
-MimeType=application/pdf;application/rdf+xml;application/rss+xml;application/xhtml+xml;application/xhtml_xml;application/xml;image/gif;image/jpeg;image/png;image/webp;text/html;text/xml;x-scheme-handler/http;x-scheme-handler/https;
-Actions=new-window;new-private-window;
-
-[Desktop Action new-window]
-Name=New Window
-Name[am]=አዲስ መስኮት
-Name[ar]=نافذة جديدة
-Name[bg]=Нов прозорец
-Name[bn]=নতুন উইন্ডো
-Name[ca]=Finestra nova
-Name[cs]=Nové okno
-Name[da]=Nyt vindue
-Name[de]=Neues Fenster
-Name[el]=Νέο Παράθυρο
-Name[en_GB]=New Window
-Name[es]=Nueva ventana
-Name[et]=Uus aken
-Name[fa]=پنجره جدید
-Name[fi]=Uusi ikkuna
-Name[fil]=New Window
-Name[fr]=Nouvelle fenêtre
-Name[gu]=નવી વિંડો
-Name[hi]=नई विंडो
-Name[hr]=Novi prozor
-Name[hu]=Új ablak
-Name[id]=Jendela Baru
-Name[it]=Nuova finestra
-Name[iw]=חלון חדש
-Name[ja]=新規ウインドウ
-Name[kn]=ಹೊಸ ವಿಂಡೊ
-Name[ko]=새 창
-Name[lt]=Naujas langas
-Name[lv]=Jauns logs
-Name[ml]=പുതിയ വിന്‍ഡോ
-Name[mr]=नवीन विंडो
-Name[nl]=Nieuw venster
-Name[no]=Nytt vindu
-Name[pl]=Nowe okno
-Name[pt]=Nova janela
-Name[pt_BR]=Nova janela
-Name[ro]=Fereastră nouă
-Name[ru]=Новое окно
-Name[sk]=Nové okno
-Name[sl]=Novo okno
-Name[sr]=Нови прозор
-Name[sv]=Nytt fönster
-Name[sw]=Dirisha Jipya
-Name[ta]=புதிய சாளரம்
-Name[te]=క్రొత్త విండో
-Name[th]=หน้าต่างใหม่
-Name[tr]=Yeni Pencere
-Name[uk]=Нове вікно
-Name[vi]=Cửa sổ Mới
-Name[zh_CN]=新建窗口
-Name[zh_TW]=開新視窗
-Exec=/usr/bin/chromium --ozone-platform=wayland --new-window
-
-[Desktop Action new-private-window]
-Name=New Incognito Window
-Name[ar]=نافذة جديدة للتصفح المتخفي
-Name[bg]=Нов прозорец „инкогнито“
-Name[bn]=নতুন ছদ্মবেশী উইন্ডো
-Name[ca]=Finestra d'incògnit nova
-Name[cs]=Nové anonymní okno
-Name[da]=Nyt inkognitovindue
-Name[de]=Neues Inkognito-Fenster
-Name[el]=Νέο παράθυρο για ανώνυμη περιήγηση
-Name[en_GB]=New Incognito window
-Name[es]=Nueva ventana de incógnito
-Name[et]=Uus inkognito aken
-Name[fa]=پنجره جدید حالت ناشناس
-Name[fi]=Uusi incognito-ikkuna
-Name[fil]=Bagong Incognito window
-Name[fr]=Nouvelle fenêtre de navigation privée
-Name[gu]=નવી છુપી વિંડો
-Name[hi]=नई गुप्त विंडो
-Name[hr]=Novi anoniman prozor
-Name[hu]=Új Inkognitóablak
-Name[id]=Jendela Penyamaran baru
-Name[it]=Nuova finestra di navigazione in incognito
-Name[iw]=חלון חדש לגלישה בסתר
-Name[ja]=新しいシークレット ウィンドウ
-Name[kn]=ಹೊಸ ಅಜ್ಞಾತ ವಿಂಡೋ
-Name[ko]=새 시크릿 창
-Name[lt]=Naujas inkognito langas
-Name[lv]=Jauns inkognito režīma logs
-Name[ml]=പുതിയ വേഷ പ്രച്ഛന്ന വിന്‍ഡോ
-Name[mr]=नवीन गुप्त विंडो
-Name[nl]=Nieuw incognitovenster
-Name[no]=Nytt inkognitovindu
-Name[pl]=Nowe okno incognito
-Name[pt]=Nova janela de navegação anónima
-Name[pt_BR]=Nova janela anônima
-Name[ro]=Fereastră nouă incognito
-Name[ru]=Новое окно в режиме инкогнито
-Name[sk]=Nové okno inkognito
-Name[sl]=Novo okno brez beleženja zgodovine
-Name[sr]=Нови прозор за прегледање без архивирања
-Name[sv]=Nytt inkognitofönster
-Name[ta]=புதிய மறைநிலைச் சாளரம்
-Name[te]=క్రొత్త అజ్ఞాత విండో
-Name[th]=หน้าต่างใหม่ที่ไม่ระบุตัวตน
-Name[tr]=Yeni Gizli pencere
-Name[uk]=Нове вікно в режимі анонімного перегляду
-Name[vi]=Cửa sổ ẩn danh mới
-Name[zh_CN]=新建隐身窗口
-Name[zh_TW]=新增無痕式視窗
-Exec=/usr/bin/chromium --ozone-platform=wayland --new-window --incognito
--- a/applications/hidden/btop.desktop
+++ b/applications/hidden/btop.desktop
--- a/applications/hidden/dropbox.desktop
+++ b/applications/hidden/dropbox.desktop
--- a/applications/icons/Activity.png
+++ b/applications/icons/Activity.png
--- a/applications/icons/Arch.png
+++ b/applications/icons/Arch.png
--- a/applications/icons/Docker.png
+++ b/applications/icons/Docker.png
--- a/applications/xtras/typora.desktop
+++ b/applications/xtras/typora.desktop
--- a/applications/wiremix.desktop
+++ b/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
--- a/applications/xtras/Zoom.desktop
+++ b/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;
--- a/bin/omarchy-cmd-audio-switch
+++ b/bin/omarchy-cmd-audio-switch
@ -0,0 +1,19 @@
+#!/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
+
+# Find current audio sink
+current=$(wpctl status | sed -n '/Sinks:/,/Sources:/p' | grep '^\s*│\s*\*' | sed -E 's/^[^0-9]*([0-9]+)\..*/\1/')
+
+# 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]}}
+
+# Set the next sink and ensure it's not muted
+wpctl set-default "$next"
+wpctl set-mute "$next" 0
+
--- a/bin/omarchy-cmd-close-all-windows
+++ b/bin/omarchy-cmd-close-all-windows
@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Close all open windows
+hyprctl clients -j | \
+  jq -r ".[].address" | \
+  xargs -I{} hyprctl dispatch closewindow address:{}
+
+# Move to first workspace
+hyprctl dispatch workspace 1
--- a/bin/omarchy-cmd-first-run
+++ b/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
--- a/bin/omarchy-cmd-screenrecord
+++ b/bin/omarchy-cmd-screenrecord
@ -13,7 +13,7 @@ screenrecording() {
  notify-send "Screen recording starting..." -t 1000
  sleep 1

-  if lspci | grep -qi 'nvidia'; then
+  if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
    wf-recorder -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" "$@"
--- a/bin/omarchy-cmd-screenrecord-stop
+++ b/bin/omarchy-cmd-screenrecord-stop
@ -0,0 +1,7 @@
+#!/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
--- a/bin/omarchy-cmd-screensaver
+++ b/bin/omarchy-cmd-screensaver
@ -1,20 +1,16 @@
 #!/bin/bash

-if command -v tte &>/dev/null; then
-  while true; do
-    effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
-    tte -i ~/.local/share/omarchy/logo.txt \
-      --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
-      "$effect" &
+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 tte >/dev/null; do
-      if read -n 1 -t 0.01; then
-        pkill tte 2>/dev/null
-        pkill -f "alacritty --class Screensaver" 2>/dev/null
-        exit 0
-      fi
-    done
+  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
+    fi
  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi
+done
--- a/bin/omarchy-cmd-terminal-cwd
+++ b/bin/omarchy-cmd-terminal-cwd
@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Go from current active terminal to its child shell process and run cwd there
+terminal_pid=$(hyprctl activewindow | awk '/pid:/ {print $2}')
+shell_pid=$(pgrep -P "$terminal_pid" | head -n1)
+
+if [[ -n $shell_pid ]]; then
+  readlink -f "/proc/$shell_pid/cwd" 2>/dev/null
+else
+  echo "$HOME"
+fi
--- a/bin/omarchy-cmd-tzupdate
+++ b/bin/omarchy-cmd-tzupdate
@ -1,5 +1,7 @@
 #!/bin/bash

+sudo systemctl restart systemd-timesyncd
 sudo tzupdate
 new_timezone=$(timedatectl show -p Timezone --value)
-notify-send "Timezone has been set to $new_timezone"
+omarchy-restart-waybar
+notify-send "Time synced and timezone set to $new_timezone"
--- a/bin/omarchy-font-set
+++ b/bin/omarchy-font-set
@ -5,8 +5,8 @@ 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
-    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
+    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 \
      -u '//match[@target="pattern"][test/string="monospace"]/edit[@name="family"]/string' \
      -v "$font_name" \
--- a/bin/omarchy-install-dev-env
+++ b/bin/omarchy-install-dev-env
@ -1,12 +1,12 @@
 #!/bin/bash

 if [[ -z "$1" ]]; then
-  echo "Usage: omarchy-instal-dev-env <ruby|node|bun|go|laravel|symfony|php|python|elixir|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>" >&2
  exit 1
 fi

 install_php() {
-  yay -Sy php composer php-sqlite --noconfirm
+  sudo pacman -Sy php composer php-sqlite --noconfirm

  # Install Path for Composer
  if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then
@ -77,7 +77,7 @@ python)
  echo -e "Installing Python...\n"
  mise use --global python@latest
  echo -e "\nInstalling uv...\n"
-  wget -qO- https://astral.sh/uv/install.sh | sh
+  curl -fsSL https://astral.sh/uv/install.sh | sh
  ;;
 elixir)
  echo -e "Installing Elixir...\n"
@ -85,6 +85,18 @@ elixir)
  mise use --global elixir@latest
  mise x elixir -- mix local.hex --force
  ;;
+phoenix)
+  echo -e "Installing Phoenix Framework...\n"
+  # Ensure Erlang/Elixir first
+  mise use --global erlang@latest
+  mise use --global elixir@latest
+  # Hex & Rebar
+  mise x elixir -- mix local.hex --force
+  mise x elixir -- mix local.rebar --force
+  # Phoenix project (phx_new)
+  mise x elixir -- mix archive.install hex phx_new --force
+  echo -e "\nYou can now run: mix phx.new my_app"
+  ;;
 rust)
  echo -e "Installing Rust...\n"
  bash -c "$(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs)" -- -y
--- a/bin/omarchy-install-docker-dbs
+++ b/bin/omarchy-install-docker-dbs
@ -1,6 +1,6 @@
 #!/bin/bash

-options=("MariaDB" "MySQL" "Redis" "PostgreSQL")
+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 [[ -n "$choices" ]]; then
@ -10,6 +10,7 @@ if [[ -n "$choices" ]]; then
    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 ;;
    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
 fi
--- a/bin/omarchy-install-dropbox
+++ b/bin/omarchy-install-dropbox
@ -1,6 +1,7 @@
 #!/bin/bash

-echo "Installing all dependencies..."
+# FIXME: Should not use AUR dependencies when we can avoid it
+echo "Installing all dependencies [from AUR]..."
 yay -S --noconfirm --needed \
  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox

--- a/bin/omarchy-install-steam
+++ b/bin/omarchy-install-steam
@ -5,5 +5,5 @@ sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
 sudo pacman -Sy

 echo "Now pick dependencies matching your graphics card"
-yay -S steam
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &
--- a/bin/omarchy-install-tailscale
+++ b/bin/omarchy-install-tailscale
@ -1,8 +1,13 @@
 #!/bin/bash

 curl -fsSL https://tailscale.com/install.sh | sh
+curl -fsSL https://neuralink.com/tsui/install.sh | bash

 echo -e "\nStarting Tailscale..."
 sudo tailscale up --accept-routes

-omarchy-webapp-install "Tailscale" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
+echo -e "\nAdd tsui to sudoers..."
+echo "$USER ALL=(ALL) NOPASSWD: $(which tsui)" | sudo tee /etc/sudoers.d/tsui
+
+omarchy-tui-install "Tailscale" "sudo tsui" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
+omarchy-webapp-install "Tailscale Admin Console" "https://login.tailscale.com/admin/machines" https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/tailscale-light.png
--- a/bin/omarchy-launch-browser
+++ b/bin/omarchy-launch-browser
@ -0,0 +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[@]} $@
--- a/bin/omarchy-launch-screensaver
+++ b/bin/omarchy-launch-screensaver
@ -1,8 +1,18 @@
 #!/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

+# Allow screensaver to be turned off but also force started
+if [[ -f ~/.local/state/omarchy/toggles/screensaver-off ]] && [[ $1 != "force" ]]; then
+  exit 1
+fi
+
 focused=$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')

 for m in $(hyprctl monitors -j | jq -r '.[] | .name'); do
--- a/bin/omarchy-launch-webapp
+++ b/bin/omarchy-launch-webapp
@ -0,0 +1,10 @@
+#!/bin/bash
+
+browser=$(xdg-settings get default-web-browser)
+
+case $browser in
+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}"
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@ -22,7 +22,7 @@ menu() {
 }

 terminal() {
-  alacritty --class Omarchy -e $1
+  alacritty --class Omarchy -e "$@"
 }

 present_terminal() {
@ -34,39 +34,45 @@ edit_in_nvim() {
  alacritty -e nvim "$1"
 }

-open_web() {
-  setsid chromium --new-window --app="$1" &
-}
-
 install() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --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 -Sy --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 -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+}
+
+aur_install() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2"
+}
+
+aur_install_and_launch() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
 }

 show_learn_menu() {
  case $(menu "Learn" "  Keybindings\n  Omarchy\n  Hyprland\n󰣇  Arch\n  Neovim\n󱆃  Bash") in
  *Keybindings*) omarchy-menu-keybindings ;;
-  *Omarchy*) open_web "https://manuals.omamix.org/2/the-omarchy-manual" ;;
-  *Hyprland*) open_web "https://wiki.hypr.land/" ;;
-  *Arch*) open_web "https://wiki.archlinux.org/title/Main_page" ;;
-  *Bash*) open_web "https://devhints.io/bash" ;;
-  *Neovim*) open_web "https://www.lazyvim.org/keymaps" ;;
+  *Omarchy*) omarchy-launch-webapp "https://learn.omacom.io/2/the-omarchy-manual" ;;
+  *Hyprland*) omarchy-launch-webapp "https://wiki.hypr.land/" ;;
+  *Arch*) omarchy-launch-webapp "https://wiki.archlinux.org/title/Main_page" ;;
+  *Bash*) omarchy-launch-webapp "https://devhints.io/bash" ;;
+  *Neovim*) omarchy-launch-webapp "https://www.lazyvim.org/keymaps" ;;
  *) show_main_menu ;;
  esac
 }

 show_style_menu() {
-  case $(menu "Style" "󰸌  Theme\n  Font\n  Background") in
+  case $(menu "Style" "󰸌  Theme\n  Font\n  Background\n󱄄  Screensaver\n  About") in
  *Theme*) show_theme_menu ;;
  *Font*) show_font_menu ;;
  *Background*) omarchy-theme-bg-next ;;
+  *Screensaver*) edit_in_nvim ~/.config/omarchy/branding/screensaver.txt ;;
+  *About*) edit_in_nvim ~/.config/omarchy/branding/about.txt ;;
  *) show_main_menu ;;
  esac
 }
@ -117,10 +123,10 @@ show_screenrecord_menu() {

 show_toggle_menu() {
  case $(menu "Toggle" "󱄄  Screensaver\n󰔎  Nightlight\n󱫖  Idle Lock\n󰍜  Top Bar") in
-  *Screensaver*) omarchy-launch-screensaver ;;
+  *Screensaver*) omarchy-toggle-screensaver ;;
  *Nightlight*) omarchy-toggle-nightlight ;;
  *Idle*) omarchy-toggle-idle ;;
-  *Bar*) pkill -SIGUSR1 waybar ;;
+  *Bar*) omarchy-toggle-waybar ;;
  *) show_main_menu ;;
  esac
 }
@ -129,16 +135,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 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 ;;
@ -171,9 +184,11 @@ show_setup_config_menu() {
 }

 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n  Web App\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 ;;
  *Style*) show_install_style_menu ;;
  *Development*) show_install_development_menu ;;
@ -193,9 +208,9 @@ show_install_service_menu() {
 }

 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix") in
+  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix") in
  *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) aur_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" ;;
  *Helix*) install "Helix" "helix" ;;
@ -204,21 +219,21 @@ show_install_editor_menu() {
 }

 show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
-  *Claude*) install "Claude Code" "claude-code" ;;
-  *Gemini*) install "Gemini" "gemini-cli-bin" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
+  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
+  *Claude*) aur_install "Claude Code" "claude-code" ;;
+  *Gemini*) install "Gemini" "gemini-cli" ;;
+  *Studio*) aur_install "LM Studio" "lmstudio" ;;
  *Ollama*) install "Ollama" "ollama" ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode-bin" ;;
+  *Crush*) aur_install "Crush" "crush-bin" ;;
+  *opencode*) aur_install "opencode" "opencode-bin" ;;
  *) 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" ;;
+  *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" ;;
  *) show_install_menu ;;
  esac
@ -251,7 +266,7 @@ show_install_development_menu() {
  *Go*) present_terminal "omarchy-install-dev-env go" ;;
  *PHP*) show_install_php_menu ;;
  *Python*) present_terminal "omarchy-install-dev-env python" ;;
-  *Elixir*) present_terminal "omarchy-install-dev-env elixir" ;;
+  *Elixir*) show_install_elixir_menu ;;
  *Zig*) present_terminal "omarchy-install-dev-env zig" ;;
  *Rust*) present_terminal "omarchy-install-dev-env rust" ;;
  *Java*) present_terminal "omarchy-install-dev-env java" ;;
@ -279,10 +294,19 @@ show_install_php_menu() {
  esac
 }

+show_install_elixir_menu() {
+  case $(menu "Install" "  Elixir\n  Phoenix") in
+  *Elixir*) present_terminal "omarchy-install-dev-env elixir" ;;
+  *Phoenix*) present_terminal "omarchy-install-dev-env phoenix" ;;
+  *) show_install_development_menu ;;
+  esac
+}
+
 show_remove_menu() {
-  case $(menu "Remove" "󰣇  Package\n  Web App\n󰸌  Theme\n󰈷  Fingerprint\n  Fido2") in
+  case $(menu "Remove" "󰣇  Package\n  Web App\n  TUI\n󰸌  Theme\n󰈷  Fingerprint\n  Fido2") in
  *Package*) terminal omarchy-pkg-remove ;;
  *Web*) present_terminal omarchy-webapp-remove ;;
+  *TUI*) present_terminal omarchy-tui-remove ;;
  *Theme*) present_terminal omarchy-theme-remove ;;
  *Fingerprint*) present_terminal "omarchy-setup-fingerprint --remove" ;;
  *Fido2*) present_terminal "omarchy-setup-fido2 --remove" ;;
@ -327,8 +351,9 @@ show_update_config_menu() {
 }

 show_system_menu() {
-  case $(menu "System" "  Lock\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
+  case $(menu "System" "  Lock\n󱄄  Screensaver\n󰤄  Suspend\n  Relaunch\n󰜉  Restart\n󰐥  Shutdown") in
  *Lock*) omarchy-lock-screen ;;
+  *Screensaver*) omarchy-launch-screensaver force ;;
  *Suspend*) systemctl suspend ;;
  *Relaunch*) uwsm stop ;;
  *Restart*) systemctl reboot ;;
@ -356,7 +381,7 @@ go_to_menu() {
  *remove*) show_remove_menu ;;
  *update*) show_update_menu ;;
  *system*) show_system_menu ;;
-  *about*) gtk-launch About.desktop ;;
+  *about*) terminal bash -c 'fastfetch; read -n 1 -s' ;;
  esac
 }

--- a/bin/omarchy-menu-keybindings
+++ b/bin/omarchy-menu-keybindings
@ -31,7 +31,10 @@ dynamic_bindings() {
        -e 's/^65,/SUPER SHIFT,/' \
        -e 's/^68,/SUPER 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/^76,/SUPER CTRL ALT,/' \
+        -e 's/^77,/SUPER SHIFT CTRL ALT,/'
 }

 # Parse and format keybindings
--- a/bin/omarchy-pkg-aur-accessible
+++ b/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
--- a/bin/omarchy-pkg-aur-install
+++ b/bin/omarchy-pkg-aur-install
@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+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 -Sy --noconfirm
+  sudo updatedb
+  omarchy-show-done
+fi
--- a/bin/omarchy-pkg-install
+++ b/bin/omarchy-pkg-install
@ -1,18 +1,25 @@
 #!/bin/bash

+set -e
+
 fzf_args=(
  --multi
-  --preview 'echo "alt-p: toggle description, alt-j/k: scroll, F11: maximize"; echo; 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'
  --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_name=$(yay -Slq | fzf "${fzf_args[@]}")
+sudo pacman -Sy
+pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")

-if [[ -n "$pkg_name" ]]; then
-  yay -Sy --noconfirm "$pkg_name"
+if [[ -n "$pkg_names" ]]; then
+  # Convert newline-separated selections to space-separated for yay
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm
  sudo updatedb
  omarchy-show-done
 fi
--- a/bin/omarchy-pkg-remove
+++ b/bin/omarchy-pkg-remove
@ -2,17 +2,21 @@

 fzf_args=(
  --multi
-  --preview 'echo "alt-p: toggle description, alt-j/k: scroll, F11: maximize"; echo; yay -Qi {1}'
+  --preview 'yay -Qi {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:red,marker:red'
 )

-pkg_name=$(yay -Qqe | fzf "${fzf_args[@]}")
+pkg_names=$(yay -Qqe | fzf "${fzf_args[@]}")

-if [[ -n "$pkg_name" ]]; then
-  yay -Rns --noconfirm "$pkg_name"
+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
--- a/bin/omarchy-refresh-applications
+++ b/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
--- a/bin/omarchy-refresh-plymouth
+++ b/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
--- a/bin/omarchy-reset-sudo
+++ b/bin/omarchy-reset-sudo
@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Resetting sudo lockout for user: $USER"
+su -c "faillock --reset --user $USER"
--- a/bin/omarchy-restart-walker
+++ b/bin/omarchy-restart-walker
@ -1,4 +1,7 @@
 #!/bin/bash

 pkill walker
-setsid uwsm app -- walker --gapplication-service &
+# FIXME: Reenable the walker service once the memory leak has been fixed
+# See https://github.com/basecamp/omarchy/issues/698
+# setsid uwsm app -- walker --gapplication-service &
+echo # Always end in success so we don't terminate further running
--- a/bin/omarchy-setup-dns
+++ b/bin/omarchy-setup-dns
@ -0,0 +1,89 @@
+#!/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]
+DNS=
+FallbackDNS=
+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
+
--- a/bin/omarchy-setup-fido2
+++ b/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
+    print_error "\nNo FIDO2 device detected. Please plug it in (you may need to unlock it as well)."
+    return 1
+  fi
+  return 0
+}
+
+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
+
+  # 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

-    # Add fido2 auth as an option for sudo
-    if ! grep -q pam_u2f.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_u2f.so cue authfile=/etc/fido2/fido2' /etc/pam.d/sudo
-    fi
+  # Configure PAM
+  setup_pam_config

-    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"
-    fi
+  # 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
--- a/bin/omarchy-setup-fingerprint
+++ b/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'; then
-    echo -e "\e[31m\nNo fingerprint sensor detected.\e[0m"
-  else
-    # Add fingerprint authentication as an option for sudo
-    if ! grep -q pam_fprintd.so /etc/pam.d/sudo; then
-      sudo sed -i '1i auth    sufficient pam_fprintd.so' /etc/pam.d/sudo
-    fi
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color

-    # 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
-      sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'
+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
+
+  # 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
+  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
+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

-    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+  # 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
-      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+      print_success "\nPerfect! Fingerprint authentication is now configured."
+      print_info "You can use your fingerprint for sudo, polkit, and lock screen (Super + Escape)."
    else
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+      print_error "\nVerification failed. You may want to try enrolling again."
    fi
+  else
+    print_error "\nEnrollment failed. Please try again."
+    exit 1
  fi
 fi
--- a/bin/omarchy-snapshot
+++ b/bin/omarchy-snapshot
@ -0,0 +1,26 @@
+#!/bin/bash
+
+COMMAND="$1"
+OMARCHY_PATH=${OMARCHY_PATH:-$HOME/.local/share/omarchy}
+
+if [[ -z $COMMAND ]]; then
+  echo "Usage: omarchy-snapshot <create|restore>" >&2
+  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
+    sudo snapper -c "$config" create -c number -d "$DESC"
+  done
+  ;;
+restore)
+  sudo limine-snapper-restore
+  ;;
+esac
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@ -39,6 +39,22 @@ 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"

--- a/bin/omarchy-toggle-screensaver
+++ b/bin/omarchy-toggle-screensaver
@ -0,0 +1,12 @@
+#!/bin/bash
+
+STATE_FILE=~/.local/state/omarchy/toggles/screensaver-off
+
+if [[ -f $STATE_FILE ]]; then
+  rm -f $STATE_FILE
+  notify-send "󱄄   Screensaver enabled"
+else
+  mkdir -p "$(dirname $STATE_FILE)"
+  touch $STATE_FILE
+  notify-send "󱄄   Screensaver disabled"
+fi
--- a/bin/omarchy-toggle-waybar
+++ b/bin/omarchy-toggle-waybar
@ -0,0 +1,7 @@
+#!/bin/bash
+
+if pgrep -x waybar >/dev/null; then
+  pkill -x waybar
+else
+  uwsm app -- waybar >/dev/null 2>&1 &
+fi
--- a/bin/omarchy-tui-install
+++ b/bin/omarchy-tui-install
@ -0,0 +1,54 @@
+#!/bin/bash
+
+if [ "$#" -ne 4 ]; then
+  echo -e "\e[32mLet's create a TUI shortcut you can start with the app launcher.\n\e[0m"
+  APP_NAME=$(gum input --prompt "Name> " --placeholder "My TUI")
+  APP_EXEC=$(gum input --prompt "Launch Command> " --placeholder "lazydocker or bash -c 'dust; read -n 1 -s'")
+  WINDOW_STYLE=$(gum choose --header "Window style" float tile)
+  ICON_URL=$(gum input --prompt "Icon URL> " --placeholder "See https://dashboardicons.com (must use PNG!)")
+else
+  APP_NAME="$1"
+  APP_EXEC="$2"
+  WINDOW_STYLE="$3"
+  ICON_URL="$4"
+fi
+
+if [[ -z "$APP_NAME" || -z "$APP_EXEC" || -z "$ICON_URL" ]]; then
+  echo "You must set app name, app command, and icon URL!"
+  exit 1
+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 ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then
+  echo "Error: Failed to download icon."
+  return 1
+fi
+
+if [[ $WINDOW_STYLE == "float" ]]; then
+  APP_CLASS="TUI.float"
+else
+  APP_CLASS="TUI.tile"
+fi
+
+cat >"$DESKTOP_FILE" <<EOF
+[Desktop Entry]
+Version=1.0
+Name=$APP_NAME
+Comment=$APP_NAME
+Exec=alacritty --class $APP_CLASS -e $APP_EXEC
+Terminal=false
+Type=Application
+Icon=$ICON_PATH
+StartupNotify=true
+EOF
+
+chmod +x "$DESKTOP_FILE"
+
+if [ "$#" -ne 4 ]; then
+  echo -e "You can now find $APP_NAME using the app launcher (SUPER + SPACE)\n"
+fi
--- a/bin/omarchy-tui-remove
+++ b/bin/omarchy-tui-remove
@ -0,0 +1,36 @@
+#!/bin/bash
+
+ICON_DIR="$HOME/.local/share/applications/icons"
+DESKTOP_DIR="$HOME/.local/share/applications/"
+
+if [ "$#" -ne 1 ]; then
+  # Find all web apps
+  while IFS= read -r -d '' file; do
+    if grep -q '^Exec=.*alacritty.*-e' "$file"; then
+      TUIS+=("$(basename "${file%.desktop}")")
+    fi
+  done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
+
+  if ((${#TUIS[@]})); then
+    IFS=$'\n' SORTED_TUIS=($(sort <<<"${TUIS[*]}"))
+    unset IFS
+    APP_NAME=$(gum choose --header "Select TUI to remove..." "${SORTED_TUIS[@]}")
+  else
+    echo "No TUIs to remove."
+    exit 1
+  fi
+else
+  APP_NAME="$1"
+fi
+
+if [[ -z "$APP_NAME" ]]; then
+  echo "You must provide TUI name."
+  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
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@ -2,6 +2,7 @@

 set -e

+omarchy-snapshot create || [ $? -eq 127 ]
 omarchy-update-git
 omarchy-migrate
 omarchy-update-system-pkgs
--- a/bin/omarchy-update-available
+++ b/bin/omarchy-update-available
@ -1,15 +1,13 @@
 #!/bin/bash

-omarchy_path="$HOME/.local/share/omarchy"
-
 # Ensure remote is reachable
-if ! git -C "$omarchy_path" ls-remote &>/dev/null; then
+if ! git -C "$OMARCHY_PATH" ls-remote &>/dev/null; then
  echo "Error: Unable to reach remote repository."
  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)
-current_tag=$(git -C "$omarchy_path" describe --tags $(git -C "$omarchy_path" rev-list --tags --max-count=1))
+latest_tag=$(git -C "$OMARCHY_PATH" ls-remote --tags origin | grep -v "{}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -n 1)
+current_tag=$(git -C "$OMARCHY_PATH" describe --tags $(git -C "$OMARCHY_PATH" rev-list --tags --max-count=1))

 if [[ "$current_tag" != "$latest_tag" ]]; then
  echo "Omarchy update available ($latest_tag)"
--- a/bin/omarchy-update-restart
+++ b/bin/omarchy-update-restart
@ -1,9 +1,21 @@
 #!/bin/bash

 if [ "$(uname -r | sed 's/-arch/\.arch/')" != "$(pacman -Q linux | awk '{print $2}')" ]; then
-  gum confirm "New Linux kernel requires reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
+  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
  gum confirm "Updates require reboot. Ready?" && omarchy-state clear re*-required && sudo reboot now
+
 elif [ -f "$HOME/.local/state/omarchy/relaunch-required" ]; then
-  gum confirm "Updates require Hyprland relaunch. Ready?" && omarchy-state clear relaunch-required && uwsm stop
+  gum confirm "Updates require Hyprland relaunch. Ready?" && omarchy-state clear re*-required && uwsm stop
 fi
+
+for file in "$HOME"/.local/state/omarchy/restart-*-required; do
+  if [ -f "$file" ]; then
+    filename=$(basename "$file")
+    service=$(echo "$filename" | sed 's/restart-\(.*\)-required/\1/')
+    echo "Restarting $service"
+    omarchy-state clear "$filename"
+    omarchy-restart-"$service"
+  fi
+done
--- a/bin/omarchy-update-system-pkgs
+++ b/bin/omarchy-update-system-pkgs
@ -1,5 +1,23 @@
 #!/bin/bash

 echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm --ignore uwsm
+sudo pacman -Syu --noconfirm
 echo
+
+if omarchy-pkg-aur-accessible; then
+  echo -e "\e[32m\nUpdate AUR packages\e[0m"
+  yay -Syu --noconfirm
+  echo
+else
+  echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+  echo
+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
--- a/bin/omarchy-webapp-install
+++ b/bin/omarchy-webapp-install
@ -32,7 +32,7 @@ cat >"$DESKTOP_FILE" <<EOF
 Version=1.0
 Name=$APP_NAME
 Comment=$APP_NAME
-Exec=chromium --new-window --ozone-platform=wayland --app="$APP_URL" --name="$APP_NAME" --class="$APP_NAME"
+Exec=omarchy-launch-webapp $APP_URL
 Terminal=false
 Type=Application
 Icon=$ICON_PATH
--- a/bin/omarchy-webapp-remove
+++ b/bin/omarchy-webapp-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
  while IFS= read -r -d '' file; do
-    if grep -q '^Exec=.*chromium.*--app' "$file"; then
+    if grep -q '^Exec=.*omarchy-launch-webapp.*' "$file"; then
      WEB_APPS+=("$(basename "${file%.desktop}")")
    fi
  done < <(find "$DESKTOP_DIR" -name '*.desktop' -print0)
@ -14,23 +14,22 @@ 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=$(gum choose --no-limit --header "Select web app to remove..." "${SORTED_WEB_APPS[@]}")
  else
    echo "No web apps to remove."
    exit 1
  fi
 else
-  APP_NAME="$1"
+  APP_NAMES="$*"
 fi

-if [[ -z "$APP_NAME" ]]; then
-  echo "You must provide web app name."
+if [[ -z "$APP_NAMES" ]]; 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
--- a/boot.sh
+++ b/boot.sh
@ -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}"
--- a/config/brave-flags.conf
+++ b/config/brave-flags.conf
@ -0,0 +1,3 @@
+--ozone-platform=wayland
+--ozone-platform-hint=wayland
+--enable-features=TouchpadOverscrollHistoryNavigation
--- a/config/chromium/Default/Preferences
+++ b/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
+    }
+  }
+}
--- a/config/fastfetch/config.jsonc
+++ b/config/fastfetch/config.jsonc
@ -1,9 +1,13 @@
 {
  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
  "logo": {
+    "type": "file",
+    "source": "~/.config/omarchy/branding/about.txt",
+    "color": { "1": "green" },
    "padding": {
-      "top": 5,
-      "right": 6
+      "top": 2,
+      "right": 6,
+      "left": 2
    }
  },
  "modules": [
@ -81,9 +85,15 @@
    "break",
    {
      "type": "command",
-      "key": "│ ├Ø",
+      "key": "Ø Omarchy",
      "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
+      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"$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",
--- a/config/fcitx5/conf/xcb.conf
+++ b/config/fcitx5/conf/xcb.conf
@ -0,0 +1 @@
+Allow Overriding System XKB Settings=False
--- a/config/hypr/bindings.conf
+++ b/config/hypr/bindings.conf
@ -1,9 +1,8 @@
 # Application bindings
 $terminal = uwsm app -- alacritty
-$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
-$webapp = $browser --app
+$browser = omarchy-launch-browser

-bindd = SUPER, return, Terminal, exec, $terminal
+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
@ -14,15 +13,16 @@ bindd = SUPER, G, Signal, exec, uwsm app -- signal-desktop
 bindd = SUPER, O, Obsidian, exec, uwsm app -- obsidian -disable-gpu
 bindd = SUPER, slash, Passwords, exec, uwsm app -- 1password

-bindd = SUPER, A, ChatGPT, exec, $webapp="https://chatgpt.com"
-bindd = SUPER SHIFT, A, Grok, exec, $webapp="https://grok.com"
-bindd = SUPER, C, Calendar, exec, $webapp="https://app.hey.com/calendar/weeks/"
-bindd = SUPER, E, Email, exec, $webapp="https://app.hey.com"
-bindd = SUPER, Y, YouTube, exec, $webapp="https://youtube.com/"
-bindd = SUPER SHIFT, G, WhatsApp, exec, $webapp="https://web.whatsapp.com/"
-bindd = SUPER ALT, G, Google Messages, exec, $webapp="https://messages.google.com/web/conversations"
-bindd = SUPER, X, X, exec, $webapp="https://x.com/"
-bindd = SUPER SHIFT, X, X Post, exec, $webapp="https://x.com/compose/post"
+# If your web app url contains #, type it as ## to prevent hyperland treat it as comments
+bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
+bindd = SUPER SHIFT, A, Grok, exec, omarchy-launch-webapp "https://grok.com"
+bindd = SUPER, C, Calendar, exec, omarchy-launch-webapp "https://app.hey.com/calendar/weeks/"
+bindd = SUPER, E, Email, exec, omarchy-launch-webapp "https://app.hey.com"
+bindd = SUPER, Y, YouTube, exec, omarchy-launch-webapp "https://youtube.com/"
+bindd = SUPER SHIFT, G, WhatsApp, exec, omarchy-launch-webapp "https://web.whatsapp.com/"
+bindd = SUPER ALT, G, Google Messages, exec, omarchy-launch-webapp "https://messages.google.com/web/conversations"
+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
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@ -3,13 +3,13 @@ general {
    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
 }

-# FIXME: Scrensaver depends on tte being installed
-# listener {
-#     timeout = 150                                             # 2.5min
-#     on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
-# }
+listener {
+    timeout = 150                                             # 2.5min
+    on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
+}

 listener {
    timeout = 300                      # 5min
--- a/config/hypr/input.conf
+++ b/config/hypr/input.conf
@ -2,7 +2,7 @@
 # See https://wiki.hypr.land/Configuring/Variables/#input
 input {
  # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
-  # kb_layout = us,dk
+  # kb_layout = us,dk,eu
  kb_options = compose:caps # ,grp:alts_toggle

  # Change speed of keyboard repeat
--- a/config/omarchy.ttf
+++ b/config/omarchy.ttf
--- a/config/starship.toml
+++ b/config/starship.toml
@ -0,0 +1,32 @@
+add_newline = true
+command_timeout = 200
+format = "[$directory$git_branch$git_status]($style)$character"
+
+[character]
+error_symbol = "[✗](bold cyan)"
+success_symbol = "[❯](bold cyan)"
+
+[directory]
+truncation_length = 2
+truncation_symbol = "…/"
+repo_root_style = "bold cyan"
+repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) "
+
+[git_branch]
+format = "[$branch]($style) "
+style = "italic cyan"
+
+[git_status]
+format     = '[$all_status]($style)'
+style      = "cyan"
+ahead      = "⇡${count} "
+diverged   = "⇕⇡${ahead_count}⇣${behind_count} "
+behind     = "⇣${count} "
+conflicted = " "
+up_to_date = " "
+untracked  = "? "
+modified   = " "
+stashed    = ""
+staged     = ""
+renamed    = ""
+deleted    = ""
--- a/config/uwsm/env
+++ b/config/uwsm/env
@ -1,5 +1,6 @@
 export OMARCHY_PATH=$HOME/.local/share/omarchy
 export PATH=$OMARCHY_PATH/bin/:$PATH
+export TERMINAL=alacritty

 if command -v mise &> /dev/null; then
  eval "$(mise activate bash)"
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@ -4,12 +4,14 @@ theme_base = []
 theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
 hotreload_theme = true
 force_keyboard_focus = true
+timeout = 60

 [keys.ai]
 run_last_response = ["ctrl e"]

 [list]
 max_entries = 200
+cycle = true

 [search]
 placeholder = " Search..."
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@ -4,14 +4,8 @@
  "position": "top",
  "spacing": 0,
  "height": 26,
-  "modules-left": [
-    "custom/omarchy",
-    "hyprland/workspaces"
-  ],
-  "modules-center": [
-    "clock",
-    "custom/update"
-  ],
+  "modules-left": ["custom/omarchy", "hyprland/workspaces"],
+  "modules-center": ["clock", "custom/update"],
  "modules-right": [
    "group/tray-expander",
    "bluetooth",
@ -45,7 +39,7 @@
    }
  },
  "custom/omarchy": {
-    "format": "",
+    "format": "<span font='omarchy'>\ue900</span>",
    "on-click": "omarchy-menu",
    "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
  },
@ -56,6 +50,7 @@
    "tooltip-format": "Omarchy update available",
    "interval": 3600
  },
+
  "cpu": {
    "interval": 5,
    "format": "󰍛",
@ -68,11 +63,11 @@
    "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",
@ -83,15 +78,11 @@
  "battery": {
    "format": "{capacity}% {icon}",
    "format-discharging": "{icon}",
-    "format-charging":    "{icon}",
-    "format-plugged":     "",
+    "format-charging": "{icon}",
+    "format-plugged": "",
    "format-icons": {
-      "charging": [
-        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
-      ],
-      "default": [
-        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
-      ]
+      "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"],
+      "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
    },
    "format-full": "󰂅",
    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
@ -126,10 +117,7 @@
      "transition-duration": 600,
      "children-class": "tray-group-item"
    },
-    "modules": [
-      "custom/expand-icon",
-    "tray"
-    ]
+    "modules": ["custom/expand-icon", "tray"]
  },
  "custom/expand-icon": {
    "format": " ",
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@ -36,8 +36,8 @@
 #network,
 #bluetooth,
 #pulseaudio,
-#clock,
-#custom-omarchy {
+#custom-omarchy,
+#custom-update {
  min-width: 12px;
  margin: 0 7.5px;
 }
@ -49,3 +49,15 @@
 tooltip {
  padding: 2px;
 }
+
+#custom-update {
+  font-size: 10px;
+}
+
+#clock {
+  margin-left: 8.75px;
+}
+
+.hidden {
+  opacity: 0;
+}
--- a/default/bash/aliases
+++ b/default/bash/aliases
@ -11,7 +11,7 @@ zd() {
  elif [ -d "$1" ]; then
    builtin cd "$1"
  else
-    z "$@" && printf " \U000F17A9 " && pwd || echo "Error: Directory not found"
+    z "$@" && printf "\U000F17A9 " && pwd || echo "Error: Directory not found"
  fi
 }
 open() {
--- a/default/bash/functions
+++ b/default/bash/functions
@ -31,6 +31,7 @@ format-drive() {
      sudo parted -s "$1" mklabel gpt
      sudo parted -s "$1" mkpart primary ext4 1MiB 100%
      sudo mkfs.ext4 -L "$2" "$([[ $1 == *"nvme"* ]] && echo "${1}p1" || echo "${1}1")"
+      sudo chmod -R 777 "/run/media/$USER/$2"
      echo "Drive $1 formatted and labeled '$2'."
    fi
  fi
@ -46,7 +47,22 @@ transcode-video-4K() {
  ffmpeg -i $1 -c:v libx265 -preset slow -crf 24 -c:a aac -b:a 192k ${1%.*}-optimized.mp4
 }

-# Transcode PNG to JPG image that's great for shrinking wallpapers
-transcode-png2jpg() {
+# Transcode any image to JPG image that's great for shrinking wallpapers
+img2jpg() {
  magick $1 -quality 95 -strip ${1%.*}.jpg
 }
+
+# Transcode any image to JPG image that's great for sharing online without being too big
+img2jpg-small() {
+  magick $1 -resize 1080x\> -quality 95 -strip ${1%.*}.jpg
+}
+
+# Transcode any image to compressed-but-lossless PNG
+img2png() {
+  magick "$1" -strip -define png:compression-filter=5 \
+    -define png:compression-level=9 \
+    -define png:compression-strategy=1 \
+    -define png:exclude-chunk=all \
+    "${1%.*}.png"
+}
+
--- a/default/bash/init
+++ b/default/bash/init
@ -2,6 +2,10 @@ if command -v mise &> /dev/null; then
  eval "$(mise activate bash)"
 fi

+if command -v starship &> /dev/null; then
+  eval "$(starship init bash)"
+fi
+
 if command -v zoxide &> /dev/null; then
  eval "$(zoxide init bash)"
 fi
--- a/default/hypr/apps.conf
+++ b/default/hypr/apps.conf
@ -7,3 +7,4 @@ 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
--- a/default/hypr/apps/chromium.conf
+++ b/default/hypr/apps/chromium.conf
@ -2,5 +2,5 @@
 windowrule = tile, class:^(Chromium)$

 # Only slight opacity when unfocused
-windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
+windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable|Brave-browser|brave-browser)$
+windowrule = opacity 1 1, initialTitle:(youtube.com_/|app.zoom.us_/wc/home)
--- a/default/hypr/apps/jetbrains.conf
+++ b/default/hypr/apps/jetbrains.conf
@ -0,0 +1,10 @@
+# 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$
--- a/default/hypr/apps/system.conf
+++ b/default/hypr/apps/system.conf
@ -1,15 +1,10 @@
-# Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy|About)$
-windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 620 470, class:Omarchy
-windowrule = size 700 520, class:About
+# Floating windows
+windowrule = float, tag:floating-window
+windowrule = center, tag:floating-window
+windowrule = size 800 600, tag:floating-window

-# Float and center file pickers
-windowrule = tag +picker, class:(xdg-desktop-portal-gtk|sublime_text)
-windowrule = float, tag:picker, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = center, tag:picker, title:^(Open.*Files?|Save.*Files?|All Files|Save)
-windowrule = size 800 600, tag:picker
+windowrule = tag +floating-window, class:(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty|Omarchy|About|TUI.float)
+windowrule = tag +floating-window, class:(xdg-desktop-portal-gtk|sublime_text|DesktopEditors), title:^(Open.*Files?|Save.*Files?|Save.*As|All Files|Save)

 # Fullscreen screensaver
 windowrule = fullscreen, class:Screensaver
--- a/default/hypr/apps/walker.conf
+++ b/default/hypr/apps/walker.conf
@ -1,2 +1,2 @@
-# Application-sepcific animation
+# Application-specific animation
 layerrule = noanim, walker
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@ -4,6 +4,6 @@ exec-once = uwsm app -- waybar
 exec-once = uwsm app -- fcitx5
 exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm app -- swayosd-server
-exec-once = uwsm app -- walker --gapplication-service
 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).+'
+exec-once = omarchy-cmd-first-run
--- a/default/hypr/bindings.conf
+++ b/default/hypr/bindings.conf
@ -9,7 +9,7 @@ bindd = SUPER, T, Top, exec, $terminal -e btop
 bindd = SUPER, D, Lazy Docker, exec, $terminal -e lazydocker
 bindd = SUPER, G, Messenger, exec, $messenger
 bindd = SUPER, O, Obsidian, exec, obsidian -disable-gpu
-bindd = SUPER, slash, Pasword manager, exec, $passwordManager
+bindd = SUPER, slash, Password manager, exec, $passwordManager

 source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
 source = ~/.local/share/omarchy/default/hypr/bindings/tiling.conf
--- a/default/hypr/bindings/media.conf
+++ b/default/hypr/bindings/media.conf
@ -9,8 +9,17 @@ bindeld = ,XF86AudioMicMute, Mute microphone, exec, $osdclient --input-volume mu
 bindeld = ,XF86MonBrightnessUp, Brightness up, exec, $osdclient --brightness raise
 bindeld = ,XF86MonBrightnessDown, Brightness down, exec, $osdclient --brightness lower

+# Precise 1% multimedia adjustments with Alt modifier
+bindeld = ALT, XF86AudioRaiseVolume, Volume up precise, exec, $osdclient --output-volume +1
+bindeld = ALT, XF86AudioLowerVolume, Volume down precise, exec, $osdclient --output-volume -1
+bindeld = ALT, XF86MonBrightnessUp, Brightness up precise, exec, $osdclient --brightness +1
+bindeld = ALT, XF86MonBrightnessDown, Brightness down precise, exec, $osdclient --brightness -1
+
 # Requires playerctl
 bindld = , XF86AudioNext, Next track, exec, $osdclient --playerctl next
 bindld = , XF86AudioPause, Pause, exec, $osdclient --playerctl play-pause
 bindld = , XF86AudioPlay, Play, exec, $osdclient --playerctl play-pause
 bindld = , XF86AudioPrev, Previous track, exec, $osdclient --playerctl previous
+
+# Switch audio output with Super + Mute
+bindld = SUPER, XF86AudioMute, Switch audio output, exec, omarchy-cmd-audio-switch
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@ -1,5 +1,6 @@
-# Close window
+# Close windows
 bindd = SUPER, W, Close active window, killactive,
+bindd = CTRL ALT, DELETE, Close all Windows, exec, omarchy-cmd-close-all-windows

 # Control tiling
 bindd = SUPER, J, Toggle split, togglesplit, # dwindle
@ -37,6 +38,10 @@ bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 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
+
 # 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
 bindd = SUPER SHIFT, right, Swap window to the right, swapwindow, r
@ -45,13 +50,15 @@ bindd = SUPER SHIFT, down, Swap window down, swapwindow, d

 # Cycle through applications on active workspace
 bindd = ALT, Tab, Cycle to next window, cyclenext
+bindd = ALT SHIFT, Tab, Cycle to prev window, cyclenext, prev
 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
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@ -1,7 +1,9 @@
 # Menus
 bindd = SUPER, SPACE, Launch apps, exec, walker -p "Start…"
+bindd = SUPER CTRL, E, Show clipboard, 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
--- a/default/systemd/resolved.conf
+++ b/default/systemd/resolved.conf
@ -1,4 +0,0 @@
-[Resolve]
-DNS=1.1.1.1
-FallbackDNS=8.8.8.8
-DNSStubListener=yes
--- a/default/walker/themes/omarchy-default.css
+++ b/default/walker/themes/omarchy-default.css
@ -1,5 +1,3 @@
-@import url("file://~/.config/omarchy/current/theme/walker.css");
-
 /* Reset all elements */
 #window,
 #box,
@ -168,3 +166,4 @@ scrollbar {
  opacity: 0;
 }

+@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/icon.txt
+++ b/icon.txt
@ -0,0 +1,26 @@
+██████████████████████████████████████████████████████
+██████████████████████████████████████████████████████
+████                     ████                     ████
+████                     ████                     ████
+████    █████████████████████         ████████    ████
+████    █████████████████████         ████████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████████████                              ████    ████
+████████████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ████                              ████    ████
+████    ██████████████████████████████████████    ████
+████    ██████████████████████████████████████    ████
+████                     ████                     ████
+████                     ████                     ████
+█████████████████████████████     ████████████████████
+█████████████████████████████     ████████████████████
--- a/install.sh
+++ b/install.sh
@ -1,87 +1,72 @@
 #!/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

-# Give people a chance to retry running the installation
-catch_errors() {
-  echo -e "\n\e[31mOmarchy installation failed!\e[0m"
-  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
-  echo "Get help from the community: https://discord.gg/tXFUdasqhY"
-}
-
-trap catch_errors ERR
-
-show_logo() {
-  clear
-  # tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  cat <~/.local/share/omarchy/logo.txt
-  echo
-}
-
-show_subtext() {
-  echo "$1" # | tte --frame-rate ${3:-640} ${2:-wipe}
-  echo
-}
-
-# Install prerequisites
+# 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/presentation.sh
+source $OMARCHY_INSTALL/preflight/chroot.sh
+source $OMARCHY_INSTALL/preflight/repositories.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/asdcontrol.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
-show_logo beams 240
-show_subtext "Let's install Omarchy! [1/5]"
-source $OMARCHY_INSTALL/config/identification.sh
 source $OMARCHY_INSTALL/config/config.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/theme.sh
+source $OMARCHY_INSTALL/config/branding.sh
+source $OMARCHY_INSTALL/config/git.sh
+source $OMARCHY_INSTALL/config/gpg.sh
 source $OMARCHY_INSTALL/config/timezones.sh
-source $OMARCHY_INSTALL/config/login.sh
-source $OMARCHY_INSTALL/config/nvidia.sh
+source $OMARCHY_INSTALL/config/increase-sudo-tries.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/hardware/network.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

-# Development
-show_logo decrypt 920
-show_subtext "Installing terminal tools [2/5]"
-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
-show_logo slice 60
-show_subtext "Installing desktop tools [3/5]"
-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
-show_logo expand
-show_subtext "Installing default applications [4/5]"
-source $OMARCHY_INSTALL/apps/webapps.sh
-source $OMARCHY_INSTALL/apps/xtras.sh
-source $OMARCHY_INSTALL/apps/mimetypes.sh
+# Login
+source $OMARCHY_INSTALL/login/plymouth.sh
+source $OMARCHY_INSTALL/login/limine-snapper.sh
+source $OMARCHY_INSTALL/login/alt-bootloaders.sh

 # Updates
-show_logo highlight
-show_subtext "Updating system packages [5/5]"
 sudo updatedb
-yay -Syu --noconfirm --ignore uwsm
+
+# Update system packages
+sudo pacman -Syu --noconfirm

 # Reboot
-show_logo laseretch 920
-show_subtext "You're done! So we'll be rebooting now..."
-sleep 2
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
+echo
+echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
+
+if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
+  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
+  echo -e "\nRemember to remove USB installer!\n\n"
+fi
+
+sleep 5
 reboot
--- a/install/apps/webapps.sh
+++ b/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
--- a/install/apps/xtras.sh
+++ b/install/apps/xtras.sh
@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [ -z "$OMARCHY_BARE" ]; then
-  yay -S --noconfirm --needed \
-    gnome-calculator gnome-keyring signal-desktop \
-    obsidian-bin libreoffice obs-studio kdenlive \
-    xournalpp localsend-bin
-
-  # Packages known to be flaky or having key signing issues are run one-by-one
-  for pkg in pinta typora spotify zoom; do
-    yay -S --noconfirm --needed "$pkg" ||
-      echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
-  done
-
-  yay -S --noconfirm --needed 1password-beta 1password-cli ||
-    echo -e "\e[31mFailed to install 1password. Continuing without!\e[0m"
-fi
-
-# Copy over Omarchy applications
-source omarchy-refresh-applications || true
--- a/install/config/branding.sh
+++ b/install/config/branding.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Allow the user to change the branding for fastfetch and screensaver
+mkdir -p ~/.config/omarchy/branding
+cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt
+cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt
--- a/install/config/config.sh
+++ b/install/config/config.sh
@ -1,59 +1,8 @@
 #!/bin/bash

 # Copy over Omarchy configs
+mkdir -p ~/.config
 cp -R ~/.local/share/omarchy/config/* ~/.config/

 # Use default bashrc from Omarchy
 cp ~/.local/share/omarchy/default/bashrc ~/.bashrc
-
-# Ensure application directory exists for update-desktop-database
-mkdir -p ~/.local/share/applications
-
-# If bare install, allow a way for its exclusions to not get added in updates
-if [ -n "$OMARCHY_BARE" ]; then
-  mkdir -p ~/.local/state/omarchy
-  touch ~/.local/state/omarchy/bare.mode
-fi
-
-# Setup GPG configuration with multiple keyservers for better reliability
-sudo mkdir -p /etc/gnupg
-sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
-sudo chmod 644 /etc/gnupg/dirmngr.conf
-sudo gpgconf --kill dirmngr || true
-sudo gpgconf --launch dirmngr || true
-
-# Increase lockout limit to 10 and decrease timeout to 2 minutes
-sudo sed -i 's|^\(auth\s\+required\s\+pam_faillock.so\)\s\+preauth.*$|\1 preauth silent deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
-sudo sed -i 's|^\(auth\s\+\[default=die\]\s\+pam_faillock.so\)\s\+authfail.*$|\1 authfail deny=10 unlock_time=120|' "/etc/pam.d/system-auth"
-
-# Set Cloudflare as primary DNS (with Google as backup)
-sudo cp ~/.local/share/omarchy/default/systemd/resolved.conf /etc/systemd/
-
-# Solve common flakiness with SSH
-echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf
-
-# Set common git aliases
-git config --global alias.co checkout
-git config --global alias.br branch
-git config --global alias.ci commit
-git config --global alias.st status
-git config --global pull.rebase true
-git config --global init.defaultBranch master
-
-# Set identification from install inputs
-if [[ -n "${OMARCHY_USER_NAME//[[:space:]]/}" ]]; then
-  git config --global user.name "$OMARCHY_USER_NAME"
-fi
-
-if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
-  git config --global user.email "$OMARCHY_USER_EMAIL"
-fi
-
-# Set default XCompose that is triggered with CapsLock
-tee ~/.XCompose >/dev/null <<EOF
-include "%H/.local/share/omarchy/default/xcompose"
-
-# Identification
-<Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
-<Multi_key> <space> <e> : "$OMARCHY_USER_EMAIL"
-EOF
--- a/install/config/detect-keyboard-layout.sh
+++ b/install/config/detect-keyboard-layout.sh
@ -1,5 +1,6 @@
 #!/bin/bash

+# Copy over the keyboard layout that's been set in Arch during install to Hyprland
 conf="/etc/vconsole.conf"
 hyprconf="$HOME/.config/hypr/hyprland.conf"

--- a/install/config/docker.sh
+++ b/install/config/docker.sh
@ -0,0 +1,34 @@
+#!/bin/bash
+
+# Configure Docker daemon:
+# - limit log size to avoid running out of disk
+# - use host's DNS resolver
+sudo mkdir -p /etc/docker
+sudo tee /etc/docker/daemon.json >/dev/null <<'EOF'
+{
+    "log-driver": "json-file",
+    "log-opts": { "max-size": "10m", "max-file": "5" },
+    "dns": ["172.17.0.1"],
+    "bip": "172.17.0.1/16"
+}
+EOF
+
+# Expose systemd-resolved to our Docker network
+sudo mkdir -p /etc/systemd/resolved.conf.d
+echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+sudo systemctl restart systemd-resolved
+
+# Start Docker automatically
+sudo systemctl enable docker
+
+# Give this user privileged Docker access
+sudo usermod -aG docker ${USER}
+
+# Prevent Docker from preventing boot for network-online.target
+sudo mkdir -p /etc/systemd/system/docker.service.d
+sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'
+[Unit]
+DefaultDependencies=no
+EOF
+
+sudo systemctl daemon-reload
--- a/install/config/git.sh
+++ b/install/config/git.sh
@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Set common git aliases
+git config --global alias.co checkout
+git config --global alias.br branch
+git config --global alias.ci commit
+git config --global alias.st status
+git config --global pull.rebase true
+git config --global init.defaultBranch master
+
+# Set identification from install inputs
+if [[ -n "${OMARCHY_USER_NAME//[[:space:]]/}" ]]; then
+  git config --global user.name "$OMARCHY_USER_NAME"
+fi
+
+if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
+  git config --global user.email "$OMARCHY_USER_EMAIL"
+fi
--- a/install/config/gpg.sh
+++ b/install/config/gpg.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Setup GPG configuration with multiple keyservers for better reliability
+sudo mkdir -p /etc/gnupg
+sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
+sudo chmod 644 /etc/gnupg/dirmngr.conf
+sudo gpgconf --kill dirmngr || true
+sudo gpgconf --launch dirmngr || true
--- a/install/config/hardware/bluetooth.sh
+++ b/install/config/hardware/bluetooth.sh
@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Turn on bluetooth by default
+chrootable_systemctl_enable bluetooth.service
--- a/install/config/hardware/fix-fkeys.sh
+++ b/install/config/hardware/fix-fkeys.sh
@ -1,8 +1,6 @@
 #!/bin/bash

+# Ensure that F-keys on Apple-like keyboards (such as Lofree Flow84) are always F-keys
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
  echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
-
-  # Rely on install/login.sh to do the rebuild
-  # sudo mkinitcpio -P
 fi
--- a/install/config/hardware/ignore-power-button.sh
+++ b/install/config/hardware/ignore-power-button.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Disable shutting system down on power button to bind it to power menu afterwards
+sudo sed -i 's/.*HandlePowerKey=.*/HandlePowerKey=ignore/' /etc/systemd/logind.conf
+
--- a/install/config/hardware/network.sh
+++ b/install/config/hardware/network.sh
@ -3,8 +3,8 @@
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
 if ! command -v iwctl &>/dev/null; then
-  yay -S --noconfirm --needed iwd
-  sudo systemctl enable --now iwd.service
+  sudo pacman -S --noconfirm --needed iwd
+  chrootable_systemctl_enable iwd.service
 fi

 # Prevent systemd-networkd-wait-online timeout on boot
--- a/install/config/hardware/nvidia.sh
+++ b/install/config/hardware/nvidia.sh
@ -12,9 +12,6 @@

 # --- GPU Detection ---
 if [ -n "$(lspci | grep -i 'nvidia')" ]; then
-  show_logo
-  show_subtext "Install NVIDIA drivers..."
-
  # --- Driver Selection ---
  # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
  if echo "$(lspci | grep -i 'nvidia')" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
@ -53,7 +50,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
    "qt6-wayland"
  )

-  yay -S --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
+  sudo pacman -S --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"

  # Configure modprobe for early KMS
  echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null
--- a/install/config/hardware/printer.sh
+++ b/install/config/hardware/printer.sh
@ -1,16 +1,15 @@
 #!/bin/bash

-sudo pacman -S --noconfirm cups cups-pdf cups-filters cups-browsed system-config-printer avahi nss-mdns
-sudo systemctl enable --now cups.service
+chrootable_systemctl_enable cups.service

 # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
 sudo mkdir -p /etc/systemd/resolved.conf.d
 echo -e "[Resolve]\nMulticastDNS=no" | sudo tee /etc/systemd/resolved.conf.d/10-disable-multicast.conf
-sudo systemctl enable --now avahi-daemon.service
+chrootable_systemctl_enable avahi-daemon.service

 # Enable automatically adding remote printers
 if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
  echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
 fi

-sudo systemctl enable --now cups-browsed.service
+chrootable_systemctl_enable cups-browsed.service
--- a/install/config/hardware/usb-autosuspend.sh
+++ b/install/config/hardware/usb-autosuspend.sh
@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Disable USB autosuspend to prevent peripheral disconnection issues
+if [[ ! -f /etc/modprobe.d/disable-usb-autosuspend.conf ]]; then
+  echo "options usbcore autosuspend=-1" | sudo tee /etc/modprobe.d/disable-usb-autosuspend.conf
+fi
--- a/Show More
+++ b/Show More