Prepare for a first-run flow

Will fill in with the first stuff you should do after getting setup. Teaching you how to do the basic commands.
2025-07-27 12:19:24 +00:00 · 2025-07-15 21:23:48 -07:00
219 changed files with 1209 additions and 2464 deletions
--- a/applications/blueberry.desktop
+++ b/applications/blueberry.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bluetooth
+Comment=Configure Bluetooth settings
+Icon=bluetooth
+Exec=env GTK_THEME=Adwaita-dark blueberry
+Terminal=false
+Type=Application
+Categories=GTK;GNOME;Settings;HardwareSettings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+StartupNotify=true
+NotShowIn=GNOME;KDE;Unity;
--- a/applications/mpv.desktop
+++ b/applications/mpv.desktop
@ -1,51 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Media Player
-Name[ar]=مشغل وسائط mpv
-Name[ca]=Reproductor multimèdia mpv
-Name[cs]=mpv přehrávač
-Name[da]=mpv-medieafspiller
-Name[fr]=Lecteur multimédia mpv
-Name[it]=Lettore multimediale mpv
-Name[ja]=mpv メディアプレイヤー
-Name[pl]=Odtwarzacz mpv
-Name[ru]=Проигрыватель mpv
-Name[tr]=mpv Ortam Oynatıcı
-Name[zh_CN]=mpv 媒体播放器
-Name[zh_TW]=mpv 媒體播放器
-GenericName=Multimedia player
-GenericName[ar]=مُشَغِّل وسائط متعددة
-GenericName[cs]=Multimediální přehrávač
-GenericName[da]=Multimedieafspiller
-GenericName[fr]=Lecteur multimédia
-GenericName[it]=Lettore multimediale
-GenericName[ja]=マルチメディアプレイヤー
-GenericName[ru]=Мультимедийный проигрыватель
-GenericName[tr]=Çoklu ortam oynatıcı
-GenericName[zh_CN]=多媒体播放器
-GenericName[zh_TW]=多媒體播放器
-Comment=Play movies and songs
-Comment[ar]=شَغِّل الأفلام والأغاني
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[cs]=Přehrává filmy a hudbu
-Comment[da]=Afspil film og sange
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lire des vidéos et des musiques
-Comment[ja]=映画や音楽を再生する
-Comment[it]=Riproduci video e canzoni
-Comment[pl]=Odtwarzaj filmy i muzykę
-Comment[ru]=Воспроизведение фильмов и музыки
-Comment[tr]=Filmleri ve şarkıları oynatın
-Comment[zh_CN]=播放电影和歌曲
-Comment[zh_TW]=播放電影和歌曲
-Icon=mpv
-TryExec=mpv
-Exec=mpv --player-operation-mode=pseudo-gui -- %U
-Terminal=false
-Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u;audio/vnd.wave;video/vnd.avi;
-X-KDE-Protocols=appending,file,ftp,hls,http,https,mms,mpv,rtmp,rtmps,rtmpt,rtmpts,rtp,rtsp,rtsps,sftp,srt,srtp,webdav,webdavs
-StartupWMClass=mpv
-Keywords=mpv;media;player;video;audio;tv;
-Keywords[ar]=mpv;إم بي في;ام بي في;وسائط;مشغل;فيديو;مرئية;صوتي;تلفاز;
--- a/applications/nvim.desktop
+++ b/applications/nvim.desktop
@ -2,7 +2,7 @@
 Name=Neovim
 GenericName=Text Editor
 Comment=Edit text files
-Exec=alacritty --class=nvim --title=nvim -e nvim -- %F
+Exec=alacritty -e nvim -- %F
 Terminal=false
 Type=Application
 Keywords=Text;editor;
--- a/applications/org.pulseaudio.pavucontrol.desktop
+++ b/applications/org.pulseaudio.pavucontrol.desktop
@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Volume Control
+Comment=Adjust the volume level
+Exec=env GTK_THEME=Adwaita-dark pavucontrol
+Icon=multimedia-volume-control
+StartupNotify=true
+Type=Application
+Categories=AudioVideo;Audio;Mixer;GTK;Settings;X-XFCE-SettingsDialog;X-XFCE-HardwareSettings;
+Keywords=pavucontrol;PulseAudio;Microphone;Volume;Fade;Balance;Headset;Speakers;Headphones;Audio;Mixer;Output;Input;Devices;Playback;Recording;System Sounds;Sound Card;Settings;Preferences;
--- 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-card
-Type=Application
-Terminal=false
--- a/bin/omarchy
+++ b/bin/omarchy
@ -5,7 +5,17 @@ PATH="$PATH:$HOME/.local/share/omarchy/bin"

 show_ascii_art() {
  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
+  cat <<'EOF'
+ ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
+███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
+███    ███ ███   ███   ███ ▀███████████ ▀▀███▀▀▀▀▀   ███        ▀▀███▀▀▀▀███▀  ▄██   ███
+███    ███ ███   ███   ███   ███    ███ ▀███████████ ███    █▄    ███    ███   ███   ███
+███    ███ ███   ███   ███   ███    ███   ███    ███ ███    ███   ███    ███   ███   ███
+ ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
+                                          ███    ███                                    
+EOF
  echo "                                                                                 $OMARCHY_VERSION"
 }

@ -25,13 +35,12 @@ main_menu() {

 update_menu() {
  show_ascii_art
-  local menu=("Omarchy" "Waybar" "Walker" "Plymouth" "SwayOSD" "Desktop apps" "Back")
+  local menu=("Omarchy" "Waybar" "Wofi" "Plymouth" "Desktop apps" "Back")
  local commands=(
    "omarchy-update"
    "omarchy-refresh-waybar"
-    "omarchy-refresh-walker"
+    "omarchy-refresh-wofi"
    "omarchy-refresh-plymouth"
-    "omarchy-refresh-swayosd"
    "omarchy-refresh-applications"
    "main_menu"
  )
@ -53,9 +62,8 @@ update_menu() {

 theme_menu() {
  show_ascii_art
-  local menu=("Pick" "Install" "Remove" "Back")
+  local menu=("Install" "Remove" "Back")
  local commands=(
-    "omarchy-theme-menu"
    "install_theme_prompt"
    "remove_theme_prompt"
    "main_menu"
@ -96,13 +104,9 @@ remove_theme_prompt() {

 setup_menu() {
  show_ascii_art
-  local menu=("Dropbox" "Steam" "Docker DBs" "Fingerprint sensor" "Fido2 device" "Back")
+  local menu=("Fingerprint sensor" "Back")
  local commands=(
-    "omarchy-setup-dropbox"
-    "omarchy-setup-steam"
-    "setup_docker_dbs"
-    "omarchy-setup-fingerprint"
-    "omarchy-setup-fido2"
+    "omarchy-fingerprint-setup"
    "main_menu"
  )
  local choice
@ -121,27 +125,8 @@ setup_menu() {
  done
 }

-setup_docker_dbs() {
-  options=("MariaDB" "MySQL" "Redis" "PostgreSQL")
-  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
-    for db in $choices; do
-      case $db in
-      MySQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:3306:3306" --name=mysql8 -e MYSQL_ROOT_PASSWORD= -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:8.4 ;;
-      PostgreSQL) sudo docker run -d --restart unless-stopped -p "127.0.0.1:5432:5432" --name=postgres16 -e POSTGRES_HOST_AUTH_METHOD=trust postgres:16 ;;
-      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 ;;
-      esac
-    done
-  fi
-
-  main_menu
-}
-
 open_manual() {
-  setsid chromium --new-window --ozone-platform=wayland --app="https://manuals.omamix.org/2/the-omarchy-manual" >/dev/null 2>&1 &
-  clear
+  xdg-open "https://manuals.omamix.org/2/the-omarchy-manual"
 }

 ack_command() {
@ -149,3 +134,4 @@ ack_command() {
 }

 main_menu
+
--- a/bin/omarchy-cmd-apple-display-brightness
+++ b/bin/omarchy-cmd-apple-display-brightness
--- a/bin/omarchy-cmd-screenrecord
+++ b/bin/omarchy-cmd-screenrecord
@ -1,34 +0,0 @@
-#!/bin/bash
-
-# Set recorder based on GPU
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENRECORD_DIR:-${XDG_VIDEOS_DIR:-$HOME/Videos}}"
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screen recording directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-screenrecording() {
-  filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
-  notify-send "Screen recording starting..." -t 1000
-  sleep 1
-
-  if lspci | grep -qi 'nvidia'; 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" "$@"
-  fi
-}
-
-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 saved to $OUTPUT_DIR" -t 2000
-elif [[ "$1" == "output" ]]; then
-  screenrecording
-else
-  region=$(slurp) || exit 1
-  screenrecording -g "$region"
-fi
--- a/bin/omarchy-cmd-screenshot
+++ b/bin/omarchy-cmd-screenshot
@ -1,17 +0,0 @@
-#!/bin/bash
-
-[[ -f ~/.config/user-dirs.dirs ]] && source ~/.config/user-dirs.dirs
-OUTPUT_DIR="${OMARCHY_SCREENSHOT_DIR:-${XDG_PICTURES_DIR:-$HOME/Pictures}}"
-
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  notify-send "Screenshot directory does not exist: $OUTPUT_DIR" -u critical -t 3000
-  exit 1
-fi
-
-pkill slurp || hyprshot -m ${1:-region} --raw |
-  satty --filename - \
-    --output-filename "$OUTPUT_DIR/screenshot-$(date +'%Y-%m-%d_%H-%M-%S').png" \
-    --early-exit \
-    --actions-on-enter save-to-clipboard \
-    --save-after-copy \
-    --copy-command 'wl-copy'
--- a/bin/omarchy-cmd-tzupdate
+++ b/bin/omarchy-cmd-tzupdate
@ -1,5 +0,0 @@
-#!/bin/bash
-
-sudo tzupdate
-new_timezone=$(timedatectl show -p Timezone --value)
-notify-send "Timezone has been set to $new_timezone"
--- a/bin/omarchy-dev-add-migration
+++ b/bin/omarchy-dev-add-migration
@ -1,6 +1,5 @@
 #!/bin/bash

-cd ~/.local/share/omarchy
 migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
 touch $migration_file
 nvim $migration_file
--- a/bin/omarchy-dev-config-link
+++ b/bin/omarchy-dev-config-link
@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Link all the key config files to omarchy's internal versions for quicker testing
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprland.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hypridle.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/
+ln -nsf ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/
+ln -nsf ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/
--- a/bin/omarchy-fingerprint-setup
+++ b/bin/omarchy-fingerprint-setup
@ -0,0 +1,36 @@
+#!/bin/bash
+
+yay -S --noconfirm --needed fprintd usbutils
+
+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
+
+  # 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'
+auth      required pam_unix.so
+auth      optional pam_fprintd.so
+
+account   required pam_unix.so
+password  required pam_unix.so
+session   required pam_unix.so
+EOF
+  fi
+
+  # Enroll the first finger
+  echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
+  sudo fprintd-enroll $USER
+
+  echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
+
+  if fprintd-verify; then
+    echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
+  else
+    echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
+  fi
+fi
--- a/bin/omarchy-first-run
+++ b/bin/omarchy-first-run
@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ ! -f ~/.local/state/omarchy/first-run.marker ]]; then
+  chromium --new-window --app=file://$HOME/.local/share/omarchy/first-run/index.html
+  mkdir -p ~/.local/state/omarchy
+  touch ~/.local/state/omarchy/first-run.marker
+fi
--- a/bin/omarchy-menu-power
+++ b/bin/omarchy-menu-power
@ -1,21 +0,0 @@
-#!/bin/bash
-
-show_power_menu() {
-  # The first characters are invisible sort keys.
-  local menu_options="\u200B Lock
-\u200C󰤄 Suspend
-\u200D Relaunch
-\u2060󰜉 Restart
-\u2063󰐥 Shutdown"
-  local selection=$(echo -e "$menu_options" | walker --dmenu --theme dmenu_150)
-
-  case "$selection" in
-  *Lock*) hyprlock ;;
-  *Suspend*) systemctl suspend ;;
-  *Relaunch*) uwsm stop ;;
-  *Restart*) systemctl reboot ;;
-  *Shutdown*) systemctl poweroff ;;
-  esac
-}
-
-show_power_menu
--- a/bin/omarchy-power-menu
+++ b/bin/omarchy-power-menu
@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Power menu for Omarchy
+# Provides power off, restart, and sleep options
+
+# Function to show power menu. The first characters are invisible sort keys.
+show_power_menu() {
+  local menu_options="\u200B Lock
+\u200C󰤄 Suspend
+\u200D Relaunch
+\u2060󰜉 Restart
+\u2063󰐥 Shutdown"
+  local selection=$(echo -e "$menu_options" | wofi --show dmenu --prompt "Power Options" --width 150 --height 195 -O alphabetical --style ~/.local/share/omarchy/default/wofi/select.css)
+
+  case "$selection" in
+  *Lock*) hyprlock ;;
+  *Suspend*) systemctl suspend ;;
+  *Relaunch*) uwsm stop ;;
+  *Restart*) systemctl reboot ;;
+  *Shutdown*) systemctl poweroff ;;
+  esac
+}
+
+# Main execution
+show_power_menu
--- a/bin/omarchy-refresh-applications
+++ b/bin/omarchy-refresh-applications
@ -10,8 +10,7 @@ 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
+if [ -z "$OMARCHY_BARE" ]; then
  cp ~/.local/share/omarchy/applications/xtras/*.desktop ~/.local/share/applications/
 fi

--- a/bin/omarchy-refresh-hyprlock
+++ b/bin/omarchy-refresh-hyprlock
@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Overwrite local Hyprlock settings with the latest in Omarchy, but create a backup if it differs
-cp -f ~/.config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/ 2>/dev/null
-
-if cmp -s ~/.config/hypr/hyprlock.conf.bak ~/.config/hypr/hyprlock.conf; then
-  rm ~/.config/hypr/hyprlock.conf.bak
-else
-  echo -e "\e[31mExisting .config/hypr/hyprlock.conf replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
--- 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 gum confirm "Refresh Plymouth theme? This will replace your current startup screen with Omarchy defaults."; then
  sudo cp ~/.local/share/omarchy/default/plymouth/* /usr/share/plymouth/themes/omarchy/
  sudo plymouth-set-default-theme -R omarchy
 fi
--- a/bin/omarchy-refresh-swayosd
+++ b/bin/omarchy-refresh-swayosd
@ -1,13 +0,0 @@
-#!/bin/bash
-
-cp -f ~/.config/swayosd/config.toml ~/.config/swayosd/config.toml.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/swayosd/config.toml ~/.config/swayosd/ 3>/dev/null
-
-if cmp -s ~/.config/swayosd/config.toml.bak ~/.config/swayosd/config.toml; then
-  rm ~/.config/swayosd//config.toml.bak
-else
-  echo -e "\e[31mExisting .config/swayosd/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
-
-pkill swayosd-server
-setsid uwsm app -- swayosd-server &>/dev/null &
--- a/bin/omarchy-refresh-walker
+++ b/bin/omarchy-refresh-walker
@ -1,13 +0,0 @@
-#!/bin/bash
-
-cp -f ~/.config/walker/config.toml ~/.config/walker/config.toml.bak 2>/dev/null
-cp -f ~/.local/share/omarchy/config/walker/config.toml ~/.config/walker/ 2>/dev/null
-
-if cmp -s ~/.config/walker/config.toml.bak ~/.config/walker/config.toml; then
-  rm ~/.config/walker/config.toml.bak
-else
-  echo -e "\e[31mExisting .config/walker/config.toml replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
-
-pkill walker
-uwsm app -- walker --gapplication-service &
--- a/bin/omarchy-refresh-waybar
+++ b/bin/omarchy-refresh-waybar
@ -1,25 +1,11 @@
 #!/bin/bash

-# Backup existing settings
-cp -f ~/.config/waybar/config.jsonc ~/.config/waybar/config.jsonc.bak 2>/dev/null
-cp -f ~/.config/waybar/style.css ~/.config/waybar/style.css.bak 2>/dev/null
+if gum confirm "Refresh Waybar config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/waybar/config ~/.config/waybar/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null

-# Overwrite local waybar settings with the latest in Omarchy
-cp -f ~/.local/share/omarchy/config/waybar/config.jsonc ~/.config/waybar/ 2>/dev/null
-cp -f ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/ 2>/dev/null
-
-# Remove identical backup files
-if cmp -s ~/.config/waybar/config.jsonc.bak ~/.config/waybar/config.jsonc; then
-  rm ~/.config/waybar/config.jsonc.bak
-else
-  echo -e "\e[31mExisting .config/waybar/config.jsonc replaced with new Omarchy default, but a .bak file was made.\e[0m"
+  # Restart waybar
+  pkill waybar &>/dev/null
+  setsid waybar &>/dev/null &
 fi
-
-if cmp -s ~/.config/waybar/style.css.bak ~/.config/waybar/style.css; then
-  rm ~/.config/waybar/style.css.bak
-else
-  echo -e "\e[31mExisting .config/waybar/style.css replaced with new Omarchy default, but a .bak file was made.\e[0m"
-fi
-
-# Restart waybar
-pkill -SIGUSR2 waybar
--- a/bin/omarchy-refresh-wofi
+++ b/bin/omarchy-refresh-wofi
@ -0,0 +1,7 @@
+#!/bin/bash
+
+if gum confirm "Refresh Wofi config? This will replace your current settings with Omarchy defaults."; then
+  # Overwrite local waybar settings with the latest in Omarchy
+  cp -f ~/.local/share/omarchy/config/wofi/config ~/.config/wofi/ 2>/dev/null
+  cp -f ~/.local/share/omarchy/config/wofi/style.css ~/.config/wofi/ 2>/dev/null
+fi
--- a/bin/omarchy-setup-dropbox
+++ b/bin/omarchy-setup-dropbox
@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Installing all dependencies..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
-
-echo "Starting Dropbox..."
-uwsm app -- dropbox-cli start &>/dev/null &
-echo "See Dropbox icon behind   hover tray in top right and right-click for setup."
--- a/bin/omarchy-setup-fido2
+++ b/bin/omarchy-setup-fido2
@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  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
-  yay -S --noconfirm --needed libfido2 pam-u2f
-
-  tokens=$(fido2-token -L)
-
-  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
-      sudo mv /tmp/fido2 /etc/fido2/fido2
-    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
-
-    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
-  fi
-fi
--- a/bin/omarchy-setup-fingerprint
+++ b/bin/omarchy-setup-fingerprint
@ -1,43 +0,0 @@
-#!/bin/bash
-
-if [[ "--remove" == "$1" ]]; then
-  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
-  yay -S --noconfirm --needed fprintd usbutils
-
-  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
-
-    # 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'
-auth      required pam_unix.so
-auth      optional pam_fprintd.so
-
-account   required pam_unix.so
-password  required pam_unix.so
-session   required pam_unix.so
-EOF
-    fi
-
-    # Enroll the first finger
-    echo -e "\e[32m\nLet's setup your right index finger as the first fingerprint.\nKeep moving the finger around on sensor until the process completes.\n\e[0m"
-    sudo fprintd-enroll $USER
-
-    echo -e "\e[32m\nNow let's verify that it's working correctly.\e[0m\n"
-
-    if fprintd-verify; then
-      echo -e "\e[32m\nPerfect! Now you can use your fingerprint on the lock screen (Super + Escape).\e[0m"
-    else
-      echo -e "\e[31m\nSomething went wrong. Maybe try again?\e[0m"
-    fi
-  fi
-fi
--- a/bin/omarchy-setup-steam
+++ b/bin/omarchy-setup-steam
@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "Adding multilib repository for 32-bit compatibility"
-sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
-sudo pacman -Sy
-
-echo "Now pick dependencies matching your graphics card"
-yay -S steam
-gtk-launch steam >/dev/null 2>&1 &
--- a/bin/omarchy-show-keybindings
+++ b/bin/omarchy-show-keybindings
@ -1,13 +1,15 @@
 #!/bin/bash

 # A script to display Hyprland keybindings defined in your configuration
-# using walker for an interactive search menu.
+# using wofi for an interactive search menu.

 USER_HYPRLAND_CONF="$HOME/.config/hypr/hyprland.conf"
+OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf $HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf $HOME/.local/share/omarchy/default/hypr/bindings.conf $HOME/.local/share/omarchy/default/hypr/media.conf"
+
 OMARCHY_BINDINGS_CONF="$HOME/.local/share/omarchy/default/hypr/bindings.conf \
 $HOME/.local/share/omarchy/default/hypr/bindings/tiling.conf \
 $HOME/.local/share/omarchy/default/hypr/bindings/utilities.conf \
-$HOME/.local/share/omarchy/default/hypr/bindings/media.conf"
+$HOME/.local/share/omarchy/default/hypr/media.conf"

 # Process the configuration file to extract and format keybindings
 # 1. `grep` finds all lines starting with 'bind' (allowing for leading spaces).
@ -51,14 +53,7 @@ grep -h '^[[:space:]]*bind' $USER_HYPRLAND_CONF $OMARCHY_BINDINGS_CONF |
    gsub(/[ \t]+/, " ", key_combo);  # Collapse multiple spaces to one

    if (action != "") {
-        # Escape XML entities
-        gsub(/&/, "\\&amp;", action);
-        gsub(/</, "\\&lt;", action);
-        gsub(/>/, "\\&gt;", action);
-        gsub(/"/, "\\&quot;", action);
-        gsub(/'"'"'/, "\\&apos;", action);
-        
        printf "%-35s → %s\n", key_combo, action;
    }
 }' |
-  walker --dmenu --theme keybindings -p 'Keybindings'
+  flock --nonblock /tmp/.wofi.lock -c "wofi -dmenu -i --width 60% --height 70% -p 'Hyprland Keybindings' -O alphabetical  --style=\"$HOME/.local/share/omarchy/default/wofi/search.css\""
--- a/bin/omarchy-theme-bg-next
+++ b/bin/omarchy-theme-bg-next
@ -2,47 +2,36 @@

 # Cycles through the background images available

-BACKGROUNDS_DIR="$HOME/.config/omarchy/current/theme/backgrounds/"
+BACKGROUNDS_DIR="$HOME/.config/omarchy/current/backgrounds/"
 CURRENT_BACKGROUND_LINK="$HOME/.config/omarchy/current/background"

-mapfile -d '' -t BACKGROUNDS < <(find "$BACKGROUNDS_DIR" -type f -print0 | sort -z)
+BACKGROUNDS=($(find "$BACKGROUNDS_DIR" -type f | sort))
 TOTAL=${#BACKGROUNDS[@]}

-if [[ $TOTAL -eq 0 ]]; then
-  notify-send "No background was found for theme" -t 2000
-  pkill -x swaybg
-  setsid uwsm app -- swaybg --color '#000000' >/dev/null 2>&1 &
-else
-  # Get current background from symlink
-  if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
+# Get current background from symlink
+if [[ -L "$CURRENT_BACKGROUND_LINK" ]]; then
  CURRENT_BACKGROUND=$(readlink "$CURRENT_BACKGROUND_LINK")
-  else
+else
  # Default to first background if no symlink exists
-    CURRENT_BACKGROUND=""
-  fi
+  CURRENT_BACKGROUND=${BACKGROUNDS[0]}
+fi

-  # Find current background index
-  INDEX=-1
-  for i in "${!BACKGROUNDS[@]}"; do
+# Find current background index
+INDEX=0
+for i in "${!BACKGROUNDS[@]}"; do
  if [[ "${BACKGROUNDS[$i]}" == "$CURRENT_BACKGROUND" ]]; then
    INDEX=$i
    break
  fi
-  done
+done

-  # Get next background (wrap around)
-  if [[ $INDEX -eq -1 ]]; then
-    # Use the first background when no match was found
-    NEW_BACKGROUND="${BACKGROUNDS[0]}"
-  else
-    NEXT_INDEX=$(((INDEX + 1) % TOTAL))
-    NEW_BACKGROUND="${BACKGROUNDS[$NEXT_INDEX]}"
-  fi
+# Get next background (wrap around)
+NEXT_INDEX=$(((INDEX + 1) % TOTAL))
+NEW_BACKGROUND=${BACKGROUNDS[$NEXT_INDEX]}

-  # Set new background symlink
-  ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"
+# Set new background symlink
+ln -nsf "$NEW_BACKGROUND" "$CURRENT_BACKGROUND_LINK"

-  # Relaunch swaybg
-  pkill -x swaybg
-  setsid uwsm app -- swaybg -i "$CURRENT_BACKGROUND_LINK" -m fill >/dev/null 2>&1 &
-fi
+# Relaunch swaybg
+pkill -x swaybg
+setsid swaybg -i "$NEW_BACKGROUND" -m fill >/dev/null 2>&2 &
--- a/bin/omarchy-theme-install
+++ b/bin/omarchy-theme-install
@ -10,8 +10,11 @@ fi

 REPO_URL="$1"
 THEMES_DIR="$HOME/.config/omarchy/themes"
-THEME_NAME=$(basename "$REPO_URL" .git | sed -E 's/^omarchy-//; s/-theme$//')
+THEME_NAME=$(basename "$REPO_URL" .git)
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+THEME_BACKGROUND_PATH="$THEME_PATH/backgrounds"
+BACKGROUNDS_PATH="$HOME/.config/omarchy/backgrounds"
+BACKGROUNDS_THEME_PATH="$BACKGROUNDS_PATH/$THEME_NAME"

 # Remove existing theme if present
 if [ -d "$THEME_PATH" ]; then
@ -24,5 +27,12 @@ if ! git clone "$REPO_URL" "$THEME_PATH"; then
  exit 1
 fi

+# Copy backgrounds if present
+if [ -d $THEME_BACKGROUND_PATH ]; then
+  mkdir -p $BACKGROUNDS_THEME_PATH
+  cp $THEME_BACKGROUND_PATH/* $BACKGROUNDS_THEME_PATH/
+fi
+
 # Apply the new theme with omarchy-theme-set
 omarchy-theme-set $THEME_NAME
+
--- a/bin/omarchy-theme-menu
+++ b/bin/omarchy-theme-menu
@ -18,8 +18,14 @@ mapfile -t themes < <(
  done | sort
 )

-# Show Walker menu
-selection=$(printf '%s\n' "${themes[@]}" | walker --dmenu --theme dmenu_250 2>/dev/null)
+# Show Wofi menu (with markup support)
+selection=$(printf '%s\n' "${themes[@]}" | wofi \
+  --show dmenu \
+  --allow-markup \
+  --width 150 \
+  --height 300 \
+  -O alphabetical \
+  --style ~/.local/share/omarchy/default/wofi/select.css)

 # Remove any Pango markup before converting back to filename
 clean_selection=$(echo "$selection" | sed -E 's/<[^>]+>//g')
@ -29,3 +35,4 @@ selected_theme=$(echo "$clean_selection" | tr '[:upper:]' '[:lower:]' | tr ' ' '

 # Apply the selected theme
 "$HOME/.local/share/omarchy/bin/omarchy-theme-set" "$selected_theme"
+
--- a/bin/omarchy-theme-next
+++ b/bin/omarchy-theme-next
@ -30,5 +30,5 @@ NEXT_INDEX=$(((INDEX + 1) % TOTAL))
 NEW_THEME=${THEMES[$NEXT_INDEX]}
 NEW_THEME_NAME=$(basename "$NEW_THEME")

-"$HOME/.local/share/omarchy/bin/omarchy-theme-set" $NEW_THEME_NAME
+omarchy-theme-set $NEW_THEME_NAME
 notify-send "Theme changed to $NEW_THEME_NAME" -t 2000
--- a/bin/omarchy-theme-set
+++ b/bin/omarchy-theme-set
@ -13,6 +13,7 @@ CURRENT_THEME_DIR="$HOME/.config/omarchy/current/theme"

 THEME_NAME="$1"
 THEME_PATH="$THEMES_DIR/$THEME_NAME"
+BACKGROUND_PATH="$HOME/.config/omarchy/backgrounds/$THEME_NAME"

 # Check if the theme entered exists
 if [[ ! -d "$THEME_PATH" ]]; then
@ -21,27 +22,21 @@ if [[ ! -d "$THEME_PATH" ]]; then
 fi

 # Update theme symlinks
+ln -nsf "$BACKGROUND_PATH" "$HOME/.config/omarchy/current/backgrounds"
 ln -nsf "$THEME_PATH" "$CURRENT_THEME_DIR"

-# Change gnome modes
-if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-light"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita"
-else
-  gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-  gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
-fi
-
 # Trigger alacritty config reload
 touch "$HOME/.config/alacritty/alacritty.toml"

 # Restart components to apply new theme
-pkill -SIGUSR2 btop
 pkill -SIGUSR2 waybar
-pkill swayosd-server
-setsid uwsm app -- swayosd-server &>/dev/null &
 makoctl reload
 hyprctl reload

 # Set new background
-"$HOME/.local/share/omarchy/bin/omarchy-theme-bg-next"
+first_bg=$(find "$HOME/.config/omarchy/current/backgrounds/" -type f | head -n 1)
+if [[ -n "$first_bg" ]]; then
+  ln -nsf "$first_bg" "$HOME/.config/omarchy/current/background"
+  pkill -x swaybg
+  setsid swaybg -i "$HOME/.config/omarchy/current/background" -m fill >/dev/null &
+fi
--- a/bin/omarchy-toggle-idle
+++ b/bin/omarchy-toggle-idle
@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash

-if pgrep -x hypridle >/dev/null; then
+if pgrep -x hypridle > /dev/null; then
  pkill -x hypridle
  notify-send "Stop locking computer when idle"
 else
-  uwsm app -- hypridle >/dev/null 2>&1 &
+  setsid hypridle &> /dev/null &
  notify-send "Now locking computer when idle"
 fi
--- a/bin/omarchy-update
+++ b/bin/omarchy-update
@ -3,29 +3,29 @@
 cd ~/.local/share/omarchy

 if [[ $1 == "all" ]]; then
-  # Run all migrations since the root commit
-  migration_starting_point=$(git log --max-parents=0 --first-parent --format="%H")
+  # Run all migrations
+  last_updated_at=1
 else
-  # Remember the commit we're at before upgrading in order to only run new migrations
-  migration_starting_point=$(git log -1 --format=%H)
+  # Remember the version we're at before upgrading
+  last_updated_at=$(git log -1 --format=%cd --date=unix)
 fi

-# Get the latest while trying to preserve any modifications
-git pull --autostash
-git diff --check || git reset --merge
+# Get the latest
+git pull

 # Run any pending migrations
-for file in $(git diff --name-only --diff-filter=A $migration_starting_point.. migrations/*.sh); do
+for file in migrations/*.sh; do
  filename=$(basename "$file")
  migrate_at="${filename%.sh}"

+  if [ $migrate_at -gt $last_updated_at ]; then
    echo -e "\e[32m\nRunning migration ($migrate_at)\e[0m"
    source $file
+  fi
 done

-# Update system packages
-echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm
-
 # Back to where we came from
 cd - >/dev/null
+
+echo -e "\e[32m\nUpdating system packages\e[0m"
+yay -Syu --noconfirm
--- a/boot.sh
+++ b/boot.sh
@ -1,6 +1,4 @@
-#!/bin/bash
-
-ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
+ascii_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄      ▄████████    ▄████████  ▄████████    ▄█    █▄    ▄██   ▄  
 ███    ███ ▄██▀▀▀███▀▀▀██▄   ███    ███   ███    ███ ███    ███   ███    ███   ███   ██▄
 ███    ███ ███   ███   ███   ███    ███   ███    ███ ███    █▀    ███    ███   ███▄▄▄███
 ███    ███ ███   ███   ███   ███    ███  ▄███▄▄▄▄██▀ ███         ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
@ -10,10 +8,9 @@ ansi_art=' ▄██████▄    ▄▄▄▄███▄▄▄▄
 ▀██████▀   ▀█   ███   █▀    ███    █▀    ███    ███ ████████▀    ███    █▀     ▀█████▀ 
                                          ███    ███                                    '

-clear
-echo -e "\n$ansi_art\n"
+echo -e "\n$ascii_art\n"

-sudo pacman -Sy --noconfirm --needed git
+pacman -Q git &>/dev/null || sudo pacman -Sy --noconfirm --needed git

 echo -e "\nCloning Omarchy..."
 rm -rf ~/.local/share/omarchy/
--- a/config/hypr/hypridle.conf
+++ b/config/hypr/hypridle.conf
@ -2,7 +2,6 @@ general {
    lock_cmd = pidof hyprlock || hyprlock       # avoid starting multiple hyprlock instances.
    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 = pkill -SIGUSR2 waybar       # prevent stacking of waybar when waking
 }

 listener {
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@ -19,20 +19,20 @@ source = ~/.local/share/omarchy/default/hypr/windows.conf
 source = ~/.config/omarchy/current/theme/hyprland.conf

 # Application bindings
-$terminal = uwsm app -- alacritty
-$browser = uwsm app -- chromium --new-window --ozone-platform=wayland
+$terminal = alacritty
+$browser = chromium --new-window --ozone-platform=wayland
 $webapp = $browser --app

 bind = SUPER, return, exec, $terminal
-bind = SUPER, F, exec, uwsm app -- nautilus --new-window
+bind = SUPER, F, exec, nautilus --new-window
 bind = SUPER, B, exec, $browser
-bind = SUPER, M, exec, uwsm app -- spotify
+bind = SUPER, M, exec, spotify
 bind = SUPER, N, exec, $terminal -e nvim
 bind = SUPER, T, exec, $terminal -e btop
 bind = SUPER, D, exec, $terminal -e lazydocker
-bind = SUPER, G, exec, uwsm app -- signal-desktop
-bind = SUPER, O, exec, uwsm app -- obsidian -disable-gpu
-bind = SUPER, slash, exec, uwsm app -- 1password
+bind = SUPER, G, exec, signal-desktop
+bind = SUPER, O, exec, obsidian -disable-gpu
+bind = SUPER, slash, exec, 1password

 bind = SUPER, A, exec, $webapp="https://chatgpt.com"
 bind = SUPER SHIFT, A, exec, $webapp="https://grok.com"
@ -45,7 +45,7 @@ bind = SUPER, X, exec, $webapp="https://x.com/"
 bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"

 # Extra autostart processes
-# exec-once = uwsm app -- my-service
+# exec-once = dropbox-cli start

 # Extra env variables
 # Note: You must relaunch Hyprland after changing envs (use Super+Esc, then Relaunch)
@ -56,7 +56,7 @@ bind = SUPER SHIFT, X, exec, $webapp="https://x.com/compose/post"
 input {
  # Use multiple keyboard layouts and switch between them with Alt + Space
  # kb_layout = us,dk
-  kb_options = compose:caps # ,grp:alt_space_toggle
+  # kb_options = compose:caps,grp:alt_space_toggle

  # Change speed of keyboard repeat
  repeat_rate = 40
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@ -1,5 +1,14 @@
+# ────────────────────────────────────────────────────────────
+#  Hyprlock — minimal blur with ringed input
+# ────────────────────────────────────────────────────────────
+
 source = ~/.config/omarchy/current/theme/hyprlock.conf

+general {
+    disable_loading_bar = true
+    no_fade_in = false
+}
+
 background {
    monitor =
    color = $color
@ -21,11 +30,13 @@ input-field {
    outline_thickness = 4

    font_family = CaskaydiaMono Nerd Font
+    font_size = 32
    font_color = $font_color

+    placeholder_color = $placeholder_color
    placeholder_text =   Enter Password 󰈷 
    check_color = $check_color
-    fail_text = <i>$PAMFAIL ($ATTEMPTS)</i>
+    fail_text = Wrong

    rounding = 0
    shadow_passes = 0
--- a/config/swayosd/config.toml
+++ b/config/swayosd/config.toml
@ -1,4 +0,0 @@
-[server]
-show_percentage = true
-max_volume = 150
-style = "./style.css"
--- a/config/swayosd/style.css
+++ b/config/swayosd/style.css
@ -1,28 +0,0 @@
-@import "../omarchy/current/theme/swayosd.css";
-
-window {
-  border-radius: 0;
-  opacity: 0.97;
-  border: 2px solid @border-color;
-
-  background-color: @background-color;
-}
-
-label {
-  font-family: 'CaskaydiaMono Nerd Font', monospace;
-  font-size: 11pt;
-
-  color: @label;
-}
-
-image {
-  color: @image;
-}
-
-progressbar {
-  border-radius: 0;
-}
-
-progress {
-  background-color: @progress;
-}
--- a/config/walker/config.toml
+++ b/config/walker/config.toml
@ -1,292 +0,0 @@
-app_launch_prefix = "uwsm app -- "
-terminal_title_flag = ""
-locale = ""
-close_when_open = true                                             # Toggle on reopen
-theme = "omarchy-default"
-theme_base = []
-theme_location = ["~/.local/share/omarchy/default/walker/themes/"]
-monitor = ""
-hotreload_theme = false
-as_window = false
-timeout = 0
-disable_click_to_close = false
-force_keyboard_focus = true
-
-[keys]
-accept_typeahead = ["tab"]
-trigger_labels = "lalt"
-next = ["down"]
-prev = ["up"]
-close = ["esc"]
-remove_from_history = ["shift backspace"]
-resume_query = ["ctrl r"]
-toggle_exact_search = ["ctrl m"]
-
-[keys.activation_modifiers]
-keep_open = "shift"
-alternate = "alt"
-
-[keys.ai]
-clear_session = ["ctrl x"]
-copy_last_response = ["ctrl c"]
-resume_session = ["ctrl r"]
-run_last_responstruee = ["ctrl e"]
-
-[events]
-on_activate = ""
-on_selection = ""
-on_exit = ""
-on_launch = ""
-on_query_change = ""
-
-[list]
-dynamic_sub = true
-keyboard_scroll_style = "emacs"
-max_entries = 50
-show_initial_entries = true
-single_click = true
-visibility_threshold = 20
-placeholder = "No Results"
-
-[search]
-argument_delimiter = "#"
-placeholder = " Search..."
-delay = 0
-resume_last_query = false
-
-[activation_mode]
-labels = "jkl;asdf"
-
-[builtins.hyprland_keybinds]
-show_sub_when_single = true
-path = "~/.config/hypr/hyprland.conf"
-weight = 5
-name = "hyprland_keybinds"
-placeholder = "Hyprland Keybinds"
-switcher_only = true
-hidden = true
-
-[builtins.applications]
-weight = 5
-name = "applications"
-placeholder = " Search..."
-prioritize_new = false
-hide_actions_with_empty_query = true
-context_aware = false
-refresh = true
-show_sub_when_single = false
-show_icon_when_single = true
-show_generic = true
-history = false
-icon = ""
-hidden = true
-
-[builtins.applications.actions]
-enabled = false
-hide_category = true
-hide_without_query = true
-
-[builtins.bookmarks]
-weight = 5
-placeholder = "Bookmarks"
-name = "bookmarks"
-icon = "bookmark"
-switcher_only = true
-hidden = true
-
-[[builtins.bookmarks.entries]]
-label = "Walker"
-url = "https://github.com/abenz1267/walker"
-keywords = ["walker", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy - Github"
-url = "https://github.com/basecamp/omarchy"
-keywords = ["omarchy", "github"]
-
-[[builtins.bookmarks.entries]]
-label = "Omarchy Manual"
-url = "https://manuals.omamix.org/2/the-omarchy-manual"
-keywords = ["omarchy"]
-
-[builtins.xdph_picker]
-hidden = true
-weight = 5
-placeholder = "Screen/Window Picker"
-show_sub_when_single = true
-name = "xdphpicker"
-switcher_only = true
-
-[builtins.ai]
-weight = 5
-placeholder = "AI"
-name = "ai"
-icon = "help-browser"
-switcher_only = true
-show_sub_when_single = true
-
-[[builtins.ai.anthropic.prompts]]
-model = "claude-3-7-sonnet-20250219"
-temperature = 1
-max_tokens = 1_000
-label = "General Assistant"
-prompt = "You are a helpful general assistant. Keep your answers short and precise."
-
-[builtins.calc]
-require_number = true
-weight = 5
-name = "Calculator"
-icon = "accessories-calculator"
-placeholder = "Calculator"
-min_chars = 3                   # Min chars to calculate. 3 allows "3+3"
-prefix = "="
-
-[builtins.windows]
-weight = 5
-icon = "view-restore"
-name = "windows"
-placeholder = "Windows"
-show_icon_when_single = true
-switcher_only = true
-hidden = true
-
-[builtins.clipboard]
-always_put_new_on_top = true
-exec = "wl-copy"
-weight = 5
-name = "clipboard"
-avoid_line_breaks = true
-placeholder = "Clipboard"
-image_height = 300
-max_entries = 10
-switcher_only = true
-hidden = true
-
-[builtins.commands]
-weight = 5
-icon = "utilities-terminal"
-switcher_only = true
-name = "commands"
-placeholder = "Commands"
-hidden = true
-
-[builtins.custom_commands]
-weight = 5
-icon = "utilities-terminal"
-name = "custom_commands"
-placeholder = "Custom Commands"
-hidden = true
-
-[builtins.emojis]
-exec = "wl-copy"
-weight = 5
-name = "Emojis"
-placeholder = "Emojis"
-switcher_only = true
-history = true
-typeahead = true
-show_unqualified = false
-prefix = ":"
-
-[builtins.symbols]
-after_copy = ""
-weight = 5
-name = "symbols"
-placeholder = "Symbols"
-switcher_only = true
-history = true
-typeahead = true
-hidden = true
-
-[builtins.finder]
-use_fd = false
-fd_flags = "--ignore-vcs --type file --type directory"
-cmd_alt = "xdg-open $(dirname ~/%RESULT%)"
-weight = 5
-icon = "file"
-name = "finder"
-placeholder = "Finder"
-switcher_only = true
-ignore_gitignore = true
-refresh = true
-concurrency = 8
-show_icon_when_single = true
-preview_images = false
-hidden = true
-
-[builtins.runner]
-eager_loading = true
-weight = 5
-icon = "utilities-terminal"
-name = "runner"
-placeholder = "Runner"
-typeahead = true
-history = true
-generic_entry = false       # Generic command runner
-shell_config = ""           # Path to shell to parse for aliases
-refresh = true
-use_fd = false
-switcher_only = true
-hidden = true
-
-[builtins.ssh]
-weight = 5
-icon = "preferences-system-network"
-name = "ssh"
-placeholder = "SSH"
-switcher_only = true
-history = true
-refresh = true
-hidden = true
-
-[builtins.switcher]
-weight = 5
-name = "switcher"
-placeholder = "Switcher"
-prefix = "/"
-
-[builtins.websearch]
-keep_selection = true
-weight = 5
-icon = "applications-internet"
-name = "websearch"
-placeholder = "Websearch"
-switcher_only = true
-hidden = true
-
-[[builtins.websearch.entries]]
-name = "Google"
-url = "https://www.google.com/search?q=%TERM%"
-
-[[builtins.websearch.entries]]
-name = "DuckDuckGo"
-url = "https://duckduckgo.com/?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Ecosia"
-url = "https://www.ecosia.org/search?q=%TERM%"
-switcher_only = true
-
-[[builtins.websearch.entries]]
-name = "Yandex"
-url = "https://yandex.com/search/?text=%TERM%"
-switcher_only = true
-
-[builtins.dmenu]
-hidden = true
-weight = 5
-name = "dmenu"
-placeholder = "Dmenu"
-switcher_only = true
-show_icon_when_single = true
-
-[builtins.translation]
-delay = 1000
-weight = 5
-name = "translation"
-icon = "accessories-dictionary"
-placeholder = "Translation"
-switcher_only = true
-provider = "googlefree"
-hidden = true
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@ -50,8 +50,7 @@
  "clock": {
    "format": "{:%A %H:%M}",
    "format-alt": "{:%d %B W%V %Y}",
-    "tooltip": false,
-    "on-click-right": "~/.local/share/omarchy/bin/omarchy-cmd-tzupdate"
+    "tooltip": false
  },
  "network": {
    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
@ -93,11 +92,11 @@
    "format-disabled": "󰂲",
    "format-connected": "",
    "tooltip-format": "Devices connected: {num_connections}",
-    "on-click": "blueberry"
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
  },
  "pulseaudio": {
    "format": "{icon}",
-    "on-click": "alacritty --class=Wiremix -e wiremix",
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
    "on-click-right": "pamixer -t",
    "tooltip-format": "Playing at {volume}%",
    "scroll-step": 5,
@ -125,4 +124,66 @@
    "icon-size": 12,
    "spacing": 12
  }
+},
+  "cpu": {
+    "interval": 5,
+    "format": "󰍛",
+    "on-click": "alacritty -e btop"
+  },
+  "clock": {
+    "format": "{:%A %H:%M}",
+    "format-alt": "{:%d %B W%V %Y}",
+    "tooltip": false
+  },
+  "network": {
+    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
+    "format" : "{icon}",
+    "format-wifi" : "{icon}",
+    "format-ethernet" : "󰀂",
+    "format-disconnected" : "󰖪",
+    "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+    "tooltip-format-disconnected": "Disconnected",
+    "interval": 3,
+    "nospacing": 1,
+    "on-click": "alacritty --class=Impala -e impala"
+  },
+  "battery": {
+    "format": "{capacity}% {icon}",
+    "format-discharging": "{icon}",
+    "format-charging":    "{icon}",
+    "format-plugged":     "",
+    "format-icons": {
+      "charging": [
+        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
+      ],
+      "default": [
+        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+      ]
+    },
+    "format-full": "󰂅",
+    "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
+    "tooltip-format-charging": "{power:>1.0f}W↑ {capacity}%",
+    "interval": 5,
+    "states": {
+      "warning": 20,
+      "critical": 10
+    }
+  },
+  "bluetooth": {
+    "format": "",
+    "format-disabled": "󰂲",
+    "format-connected": "",
+    "tooltip-format": "Devices connected: {num_connections}",
+    "on-click": "GTK_THEME=Adwaita-dark blueberry"
+  },
+  "pulseaudio": {
+    "format": "",
+    "format-muted": "󰝟",
+    "scroll-step": 5,
+    "on-click": "GTK_THEME=Adwaita-dark pavucontrol",
+    "tooltip-format": "Playing at {volume}%",
+    "on-click-right": "pamixer -t",
+    "ignored-sinks": ["Easy Effects Sink"]
+  }
 }
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@ -23,7 +23,6 @@
  all: initial;
  padding: 0 6px;
  margin: 0 1.5px;
-  min-width: 9px;
 }

 #tray,
--- a/config/wofi/config
+++ b/config/wofi/config
@ -0,0 +1,15 @@
+width=600
+height=350
+location=center
+show=drun
+prompt=Search...
+filter_rate=100
+allow_markup=true
+no_actions=true
+halign=fill
+orientation=vertical
+content_halign=fill
+insensitive=true
+allow_images=true
+image_size=40
+gtk_dark=true
--- a/config/wofi/style.css
+++ b/config/wofi/style.css
@ -0,0 +1,73 @@
+/* Colors are defined by theme files and can be referenced via @base, @text, @selected-text, and @border */
+
+* {
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
+  font-size: 18px;
+}
+
+window {
+  margin: 0px;
+  padding: 20px;
+  background-color: @base;
+  opacity: 0.95;
+}
+
+#inner-box {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#outer-box {
+  margin: 0;
+  padding: 20px;
+  border: none;
+  background-color: @base;
+  border: 2px solid @border;
+}
+
+#scroll {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#input {
+  margin: 0;
+  padding: 10px;
+  border: none;
+  background-color: @base;
+  color: @text;
+}
+
+#input:focus {
+  outline: none;
+  box-shadow: none;
+  border: none;
+}
+
+#text {
+  margin: 5px;
+  border: none;
+  color: @text;
+}
+
+#entry {
+  background-color: @base;
+}
+
+#entry:selected {
+  outline: none;
+  border: none;
+}
+
+#entry:selected #text {
+  color: @selected-text;
+}
+
+#entry image {
+  -gtk-icon-transform: scale(0.7);
+}
+
--- a/default/bash/aliases
+++ b/default/bash/aliases
@ -15,7 +15,7 @@ zd() {
  fi
 }
 open() {
-  xdg-open "$@" >/dev/null 2>&1 &
+  xdg-open "$@" >/dev/null 2>&1
 }

 # Directories
@ -24,10 +24,10 @@ alias ...='cd ../..'
 alias ....='cd ../../..'

 # Tools
+alias n='nvim'
 alias g='git'
 alias d='docker'
 alias r='rails'
-n() { if [ "$#" -eq 0 ]; then nvim .; else nvim "$@"; fi; }

 # Git
 alias gcm='git commit -m'
--- a/default/bash/functions
+++ b/default/bash/functions
@ -69,5 +69,5 @@ web2app-remove() {
 # Ensure changes to ~/.XCompose are immediately available
 refresh-xcompose() {
  pkill fcitx5
-  uwsm app -- fcitx5 >/dev/null 2>&1 &
+  setsid fcitx5 &>/dev/null &
 }
--- a/default/bash/init
+++ b/default/bash/init
@ -7,8 +7,8 @@ if command -v zoxide &> /dev/null; then
 fi

 if command -v fzf &> /dev/null; then
-  if [[ -f /usr/share/fzf/completion.bash ]]; then
-    source /usr/share/fzf/completion.bash
+  if [[ -f /usr/share/bash-completion/completions/fzf ]]; then
+    source /usr/share/bash-completion/completions/fzf
  fi
  if [[ -f /usr/share/fzf/key-bindings.bash ]]; then
    source /usr/share/fzf/key-bindings.bash
--- a/default/bash/rc
+++ b/default/bash/rc
@ -4,4 +4,4 @@ source ~/.local/share/omarchy/default/bash/functions
 source ~/.local/share/omarchy/default/bash/prompt
 source ~/.local/share/omarchy/default/bash/init
 source ~/.local/share/omarchy/default/bash/envs
-[[ $- == *i* ]] && bind -f ~/.local/share/omarchy/default/bash/inputrc
+bind -f ~/.local/share/omarchy/default/bash/inputrc
--- a/default/hypr/autostart.conf
+++ b/default/hypr/autostart.conf
@ -1,9 +1,5 @@
-exec-once = uwsm app -- hypridle
-exec-once = uwsm app -- mako
-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 = hypridle & mako & waybar & fcitx5
+exec-once = swaybg -i ~/.config/omarchy/current/background -m fill
 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 = ~/.local/share/omarchy/bin/omarchy-first-run
--- a/default/hypr/bindings/media.conf
+++ b/default/hypr/bindings/media.conf
@ -1,16 +1,13 @@
-# Only display the OSD on the currently focused monitor
-$osdclient = swayosd-client --monitor "$(hyprctl monitors -j | jq -r '.[] | select(.focused == true).name')"
-
-# Laptop multimedia keys for volume and LCD brightness (with OSD)
-bindel = ,XF86AudioRaiseVolume, exec, $osdclient --output-volume raise
-bindel = ,XF86AudioLowerVolume, exec, $osdclient --output-volume lower
-bindel = ,XF86AudioMute, exec, $osdclient --output-volume mute-toggle
-bindel = ,XF86AudioMicMute, exec, $osdclient --input-volume mute-toggle
-bindel = ,XF86MonBrightnessUp, exec, $osdclient --brightness raise
-bindel = ,XF86MonBrightnessDown, exec, $osdclient --brightness lower
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-

 # Requires playerctl
-bindl = , XF86AudioNext, exec, $osdclient --playerctl next
-bindl = , XF86AudioPause, exec, $osdclient --playerctl play-pause
-bindl = , XF86AudioPlay, exec, $osdclient --playerctl play-pause
-bindl = , XF86AudioPrev, exec, $osdclient --playerctl previous
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
--- a/default/hypr/bindings/tiling.conf
+++ b/default/hypr/bindings/tiling.conf
@ -5,7 +5,6 @@ bind = SUPER, W, killactive,
 bind = SUPER, J, togglesplit, # dwindle
 bind = SUPER, P, pseudo, # dwindle
 bind = SUPER, V, togglefloating,
-bind = SHIFT, F11, fullscreen, 0

 # Move focus with mainMod + arrow keys
 bind = SUPER, left, movefocus, l
--- a/default/hypr/bindings/utilities.conf
+++ b/default/hypr/bindings/utilities.conf
@ -1,6 +1,6 @@
 # Launching
-bind = SUPER, space, exec, walker
-bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-menu-keybindings
+bind = SUPER, space, exec, pkill wofi || wofi --show drun --sort-order=alphabetical --style="$HOME/.local/share/omarchy/default/wofi/search.css"
+bind = SUPER, K, exec, ~/.local/share/omarchy/bin/omarchy-show-keybindings

 # Aesthetics
 bind = SUPER SHIFT, SPACE, exec, pkill -SIGUSR1 waybar
@ -13,24 +13,20 @@ bind = SUPER SHIFT, comma, exec, makoctl dismiss --all
 bind = SUPER CTRL, comma, exec, makoctl mode -t do-not-disturb && makoctl mode | grep -q 'do-not-disturb' && notify-send "Silenced notifications" || notify-send "Enabled notifications"

 # Power menu controls lock, suspend, relaunch, restart, shutdown
-bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-menu-power
+bind = SUPER, ESCAPE, exec, ~/.local/share/omarchy/bin/omarchy-power-menu

 # Toggle idling
 bind = SUPER CTRL, I, exec, ~/.local/share/omarchy/bin/omarchy-toggle-idle

 # Control Apple Display brightness
-bind = CTRL, F1, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness -5000
-bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +5000
-bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-cmd-apple-display-brightness +60000
+bind = CTRL, F1, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness -5000
+bind = CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness +5000
+bind = SHIFT CTRL, F2, exec, ~/.local/share/omarchy/bin/omarchy-apple-display-brightness +60000

 # Screenshots
-bind = , PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot
-bind = SHIFT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot window
-bind = CTRL, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenshot output
-
-# Screenshots
-bind = ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord
-bind = CTRL ALT, PRINT, exec, ~/.local/share/omarchy/bin/omarchy-cmd-screenrecord output
+bind = , PRINT, exec, hyprshot -m region
+bind = SHIFT, PRINT, exec, hyprshot -m window
+bind = CTRL, PRINT, exec, hyprshot -m output

 # Color picker
 bind = SUPER, PRINT, exec, hyprpicker -a
--- a/default/hypr/envs.conf
+++ b/default/hypr/envs.conf
@ -3,8 +3,8 @@ env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24

 # Force all apps to use Wayland
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
+env = GDK_BACKEND,wayland
+env = QT_QPA_PLATFORM,wayland
 env = QT_STYLE_OVERRIDE,kvantum
 env = SDL_VIDEODRIVER,wayland
 env = MOZ_ENABLE_WAYLAND,1
--- a/default/hypr/looknfeel.conf
+++ b/default/hypr/looknfeel.conf
@ -69,12 +69,6 @@ animations {
    animation = workspaces, 0, 0, ease
 }

-# Application-sepcific animation
-layerrule=noanim,walker
-
-# Remove 1px border around hyprshot screenshots
-layerrule = noanim, selection
-
 # Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
 # "Smart gaps" / "No gaps when only"
 # uncomment all if you wish to use that.
--- a/default/hypr/windows.conf
+++ b/default/hypr/windows.conf
@ -5,26 +5,28 @@ windowrule = suppressevent maximize, class:.*
 windowrule = tile, class:^(Chromium)$

 # Float and center settings and previews
-windowrule = float, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
-windowrule = size 800 600, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|com.gabm.satty)$
-windowrule = size 645 450, class:Omarchy
-windowrule = center, class:^(blueberry.py|Impala|Wiremix|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = float, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$
+windowrule = size 800 600, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer)$
+windowrule = size 645 350, class:Omarchy
+windowrule = center, class:^(org.pulseaudio.pavucontrol|blueberry.py|Impala|org.gnome.NautilusPreviewer|Omarchy)$

 # Float and center file pickers
 windowrule = float, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)
 windowrule = center, class:xdg-desktop-portal-gtk, title:^(Open.*Files?|Save.*Files?|All Files|Save)

 # Float Steam, fullscreen RetroArch
-windowrule = float, class:steam
-windowrule = center, class:steam
+windowrule = float, class:^(steam)$
 windowrule = fullscreen, class:^(com.libretro.RetroArch)$

 # Just dash of opacity
 windowrule = opacity 0.97 0.9, class:.*
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable)$
 windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
-windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv|org.gnome.NautilusPreviewer)$
+windowrule = opacity 1 1, class:^(zoom|vlc|mpv|org.kde.kdenlive|com.obsproject.Studio|com.github.PintaProject.Pinta|imv)$
 windowrule = opacity 1 1, class:^(com.libretro.RetroArch|steam)$

 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+
+# Proper background blur for wofi
+layerrule = blur,wofi
--- a/default/walker/themes/dmenu_150.css
+++ b/default/walker/themes/dmenu_150.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/dmenu_150.toml
+++ b/default/walker/themes/dmenu_150.toml
@ -1,10 +0,0 @@
-[ui.window.box]
-width = 150
-
-[ui.window.box.scroll.list]
-max_width = 150
-min_width = 150
-width = 150
-
-[ui.window.box.search]
-hide = true
--- a/default/walker/themes/dmenu_250.css
+++ b/default/walker/themes/dmenu_250.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/dmenu_250.toml
+++ b/default/walker/themes/dmenu_250.toml
@ -1,11 +0,0 @@
-[ui.window.box]
-width = 250
-
-[ui.window.box.scroll.list]
-max_width = 250
-min_width = 250
-width = 250
-max_height = 600
-
-[ui.window.box.search]
-hide = true
--- a/default/walker/themes/keybindings.css
+++ b/default/walker/themes/keybindings.css
@ -1,2 +0,0 @@
-@import url("file://~/.local/share/omarchy/default/walker/themes/omarchy-default.css");
-@import url("file://~/.config/omarchy/current/theme/walker.css");
--- a/default/walker/themes/keybindings.toml
+++ b/default/walker/themes/keybindings.toml
@ -1,48 +0,0 @@
-[ui.window.box]
-width = 964
-min_width = 964
-max_width = 964
-
-height = 664
-min_height = 664
-max_height = 664
-
-[ui.window.box.search]
-hide = false
-
-[ui.window.box.scroll]
-v_align = "fill"
-h_align = "fill"
-min_width = 964
-width = 964
-max_width = 964
-min_height = 664
-height = 664
-max_height = 664
-
-[ui.window.box.scroll.list]
-v_align = "fill"
-h_align = "fill"
-min_width = 900
-width = 900
-max_width = 900
-min_height = 600
-height = 600
-max_height = 600
-
-[ui.window.box.scroll.list.item]
-h_align = "fill"
-min_width = 900
-width = 900
-max_width = 900
-
-[ui.window.box.scroll.list.item.activation_label]
-hide = true
-
-[ui.window.box.scroll.list.placeholder]
-v_align = "start"
-h_align = "fill"
-hide = false
-min_width = 900
-width = 900
-max_width = 900
--- a/default/walker/themes/omarchy-default.css
+++ b/default/walker/themes/omarchy-default.css
@ -1,166 +0,0 @@
-@import url("file://~/.config/omarchy/current/theme/walker.css");
-
-/* Reset all elements */
-#window,
-#box,
-#search,
-#password,
-#input,
-#prompt,
-#clear,
-#typeahead,
-#list,
-child,
-scrollbar,
-slider,
-#item,
-#text,
-#label,
-#sub,
-#activationlabel {
-  all: unset;
-}
-
-* {
-  font-family: 'CaskaydiaMono Nerd Font', monospace;
-  font-size: 18px;
-}
-
-/* Window */
-#window {
-  background: transparent;
-  color: @text;
-}
-
-/* Main box container */
-#box {
-  background: alpha(@base, 0.95);
-  padding: 20px;
-  border: 2px solid @border;
-  border-radius: 0px;
-}
-
-/* Search container */
-#search {
-  background: @base;
-  padding: 10px;
-  margin-bottom: 0;
-}
-
-/* Hide prompt icon */
-#prompt {
-  opacity: 0;
-  min-width: 0;
-  margin: 0;
-}
-
-/* Hide clear button */
-#clear {
-  opacity: 0;
-  min-width: 0;
-}
-
-/* Input field */
-#input {
-  background: none;
-  color: @text;
-  padding: 0;
-}
-
-#input placeholder {
-  opacity: 0.5;
-  color: @text;
-}
-
-/* Hide typeahead */
-#typeahead {
-  opacity: 0;
-}
-
-/* List */
-#list {
-  background: transparent;
-}
-
-/* List items */
-child {
-  padding: 0px 12px;
-  background: transparent;
-  border-radius: 0;
-}
-
-child:selected,
-child:hover {
-  background: transparent;
-}
-
-/* Item layout */
-#item {
-  padding: 0;
-}
-
-/* Icon */
-#icon {
-  margin-right: 10px;
-  -gtk-icon-transform: scale(0.7);
-}
-
-/* Text */
-#text {
-  color: @text;
-  padding: 14px 0;
-}
-
-#label {
-  font-weight: normal;
-}
-
-/* Selected state */
-child:selected #text,
-child:selected #label,
-child:hover #text,
-child:hover #label {
-  color: @selected-text;
-}
-
-/* Hide sub text */
-#sub {
-  opacity: 0;
-  font-size: 0;
-  min-height: 0;
-}
-
-/* Hide activation label */
-#activationlabel {
-  opacity: 0;
-  min-width: 0;
-}
-
-/* Scrollbar styling */
-scrollbar {
-  opacity: 0;
-}
-
-/* Hide spinner */
-#spinner {
-  opacity: 0;
-}
-
-/* Hide AI elements */
-#aiScroll,
-#aiList,
-.aiItem {
-  opacity: 0;
-  min-height: 0;
-}
-
-/* Bar entry (switcher) */
-#bar {
-  opacity: 0;
-  min-height: 0;
-}
-
-.barentry {
-  opacity: 0;
-}
-
--- a/default/walker/themes/omarchy-default.toml
+++ b/default/walker/themes/omarchy-default.toml
@ -1,16 +0,0 @@
-[ui.window.box]
-width = 664
-min_width = 664
-max_width = 664
-height = 396
-min_height = 396
-max_height = 396
-
-# List constraints are critical - without these, the window shrinks when empty
-[ui.window.box.scroll.list]
-height = 300
-min_height = 300
-max_height = 300
-
-[ui.window.box.scroll.list.item.icon]
-pixel_size = 40
--- a/default/wofi/search.css
+++ b/default/wofi/search.css
@ -0,0 +1,73 @@
+@import ".config/omarchy/current/theme/wofi.css";
+@import ".config/wofi/style.css";
+
+* {
+  font-family: 'CaskaydiaMono Nerd Font', monospace;
+  font-size: 18px;
+}
+
+window {
+  margin: 0px;
+  padding: 20px;
+  background-color: @base;
+  opacity: 0.95;
+}
+
+#inner-box {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#outer-box {
+  margin: 0;
+  padding: 20px;
+  border: none;
+  background-color: @base;
+  border: 2px solid @border;
+}
+
+#scroll {
+  margin: 0;
+  padding: 0;
+  border: none;
+  background-color: @base;
+}
+
+#input {
+  margin: 0;
+  padding: 10px;
+  border: none;
+  background-color: @base;
+  color: @text;
+}
+
+#input:focus {
+  outline: none;
+  box-shadow: none;
+  border: none;
+}
+
+#text {
+  margin: 5px;
+  border: none;
+  color: @text;
+}
+
+#entry {
+  background-color: @base;
+}
+
+#entry:selected {
+  outline: none;
+  border: none;
+}
+
+#entry:selected #text {
+  color: @selected-text;
+}
+
+#entry image {
+  -gtk-icon-transform: scale(0.7);
+}
--- a/default/wofi/select.css
+++ b/default/wofi/select.css
@ -0,0 +1,8 @@
+@import ".config/omarchy/current/theme/wofi.css";
+@import ".local/share/omarchy/default/wofi/search.css";
+
+#input {
+    display: none;
+    opacity: 0;
+    margin-top: -200px;
+}
--- a/first-run/index.html
+++ b/first-run/index.html
@ -0,0 +1,8 @@
+<html>
+<head>
+<title>Hello</title>
+</head>
+<body>
+<h1>Hello!</h1>
+</body>
+</html>
--- a/install.sh
+++ b/install.sh
@ -1,82 +1,16 @@
-#!/bin/bash
-
 # Exit immediately if a command exits with a non-zero status
 set -e

-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 'echo "Omarchy installation failed! You can retry by running: source ~/.local/share/omarchy/install.sh"' ERR

-trap catch_errors ERR
+# Install everything
+for f in ~/.local/share/omarchy/install/*.sh; do
+  echo -e "\nRunning installer: $f"
+  source "$f"
+done

-show_logo() {
-  clear
-  tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand}
-  echo
-}
-
-show_subtext() {
-  echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe}
-  echo
-}
-
-# Install prerequisites
-source $OMARCHY_INSTALL/preflight/aur.sh
-source $OMARCHY_INSTALL/preflight/presentation.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/login.sh
-source $OMARCHY_INSTALL/config/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
-
-# Updates
-show_logo highlight
-show_subtext "Updating system packages [5/5]"
+# Ensure locate is up to date now that everything has been installed
 sudo updatedb
-sudo pacman -Syu --noconfirm

-# Reboot
-show_logo laseretch 920
-show_subtext "You're done! So we'll be rebooting now..."
-sleep 2
-reboot
+gum confirm "Reboot to apply all settings?" && reboot
--- a/install/1-yay.sh
+++ b/install/1-yay.sh
@ -0,0 +1,14 @@
+sudo pacman -S --needed --noconfirm base-devel
+
+if ! command -v yay &>/dev/null; then
+  cd /tmp
+  git clone https://aur.archlinux.org/yay-bin.git
+  cd yay-bin
+  makepkg -si --noconfirm
+  cd -
+  rm -rf yay-bin
+  cd ~
+
+  # Add fun and color to the pacman installer
+  sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf
+fi
--- a/install/config/identification.sh
+++ b/install/config/identification.sh
@ -1,4 +1,7 @@
-#!/bin/bash
+# Need gum to query for input
+yay -S --noconfirm --needed gum

+# Configure identification
+echo -e "\nEnter identification for git and autocomplete..."
 export OMARCHY_USER_NAME=$(gum input --placeholder "Enter full name" --prompt "Name> ")
 export OMARCHY_USER_EMAIL=$(gum input --placeholder "Enter email address" --prompt "Email> ")
--- a/install/development/terminal.sh
+++ b/install/development/terminal.sh
@ -1,8 +1,6 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
  wget curl unzip inetutils impala \
-  fd eza fzf ripgrep zoxide bat jq \
+  fd eza fzf ripgrep zoxide bat \
  wl-clipboard fastfetch btop \
  man tldr less whois plocate bash-completion \
  alacritty
--- a/install/config/config.sh
+++ b/install/config/config.sh
@ -1,20 +1,9 @@
-#!/bin/bash
-
 # Copy over Omarchy configs
 cp -R ~/.local/share/omarchy/config/* ~/.config/

-# Use default bashrc from Omarchy
-echo "source ~/.local/share/omarchy/default/bash/rc" >~/.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/
@ -22,9 +11,8 @@ 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"
+# Use default bashrc from Omarchy
+echo "source ~/.local/share/omarchy/default/bash/rc" >~/.bashrc

 # Set common git aliases
 git config --global alias.co checkout
--- 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 ~/.local/share/omarchy/bin/omarchy-refresh-applications || true
--- a/install/desktop/asdcontrol.sh
+++ b/install/desktop/asdcontrol.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install asdcontrol for controlling brightness on Apple Displays
 if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
  git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
--- a/install/backgrounds.sh
+++ b/install/backgrounds.sh
@ -0,0 +1,9 @@
+BACKGROUNDS_DIR=~/.config/omarchy/backgrounds/
+
+download_background_image() {
+  local url="$1"
+  local path="$2"
+  gum spin --title "Downloading $url as $path..." -- curl -sL -o "$BACKGROUNDS_DIR/$path" "$url"
+}
+
+for t in ~/.local/share/omarchy/themes/*; do source "$t/backgrounds.sh"; done
--- a/install/desktop/bluetooth.sh
+++ b/install/desktop/bluetooth.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install bluetooth controls
 yay -S --noconfirm --needed blueberry

--- a/install/config/detect-keyboard-layout.sh
+++ b/install/config/detect-keyboard-layout.sh
@ -1,15 +0,0 @@
-#!/bin/bash
-
-conf="/etc/vconsole.conf"
-hyprconf="$HOME/.config/hypr/hyprland.conf"
-
-layout=$(grep '^XKBLAYOUT=' "$conf" | cut -d= -f2 | tr -d '"')
-variant=$(grep '^XKBVARIANT=' "$conf" | cut -d= -f2 | tr -d '"')
-
-if [[ -n "$layout" ]]; then
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_layout = $layout" "$hyprconf"
-fi
-
-if [[ -n "$variant" ]]; then
-  sed -i "/^[[:space:]]*kb_options *=/i\  kb_variant = $variant" "$hyprconf"
-fi
--- a/install/config/login.sh
+++ b/install/config/login.sh
@ -1,267 +0,0 @@
-#!/bin/bash
-
-# Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
-if ! command -v uwsm &>/dev/null || ! command -v plymouth &>/dev/null; then
-  yay -S --noconfirm --needed uwsm plymouth
-fi
-
-# ==============================================================================
-# PLYMOUTH SETUP
-# ==============================================================================
-
-if ! grep -Eq '^HOOKS=.*plymouth' /etc/mkinitcpio.conf; then
-  # Backup original mkinitcpio.conf just in case
-  backup_timestamp=$(date +"%Y%m%d%H%M%S")
-  sudo cp /etc/mkinitcpio.conf "/etc/mkinitcpio.conf.bak.${backup_timestamp}"
-
-  # Add plymouth to HOOKS array after 'base udev' or 'base systemd'
-  if grep "^HOOKS=" /etc/mkinitcpio.conf | grep -q "base systemd"; then
-    sudo sed -i '/^HOOKS=/s/base systemd/base systemd plymouth/' /etc/mkinitcpio.conf
-  elif grep "^HOOKS=" /etc/mkinitcpio.conf | grep -q "base udev"; then
-    sudo sed -i '/^HOOKS=/s/base udev/base udev plymouth/' /etc/mkinitcpio.conf
-  else
-    echo "Couldn't add the Plymouth hook"
-  fi
-
-  # Regenerate initramfs
-  sudo mkinitcpio -P
-fi
-
-# Add kernel parameters for Plymouth
-if [ -d "/boot/loader/entries" ]; then # systemd-boot
-  echo "Detected systemd-boot"
-
-  for entry in /boot/loader/entries/*.conf; do
-    if [ -f "$entry" ]; then
-      # Skip fallback entries
-      if [[ "$(basename "$entry")" == *"fallback"* ]]; then
-        echo "Skipped: $(basename "$entry") (fallback entry)"
-        continue
-      fi
-
-      # Skip if splash it already present for some reason
-      if ! grep -q "splash" "$entry"; then
-        sudo sed -i '/^options/ s/$/ splash quiet/' "$entry"
-      else
-        echo "Skipped: $(basename "$entry") (splash already present)"
-      fi
-    fi
-  done
-elif [ -f "/etc/default/grub" ]; then # Grub
-  echo "Detected grub"
-
-  # Backup GRUB config before modifying
-  backup_timestamp=$(date +"%Y%m%d%H%M%S")
-  sudo cp /etc/default/grub "/etc/default/grub.bak.${backup_timestamp}"
-
-  # Check if splash is already in GRUB_CMDLINE_LINUX_DEFAULT
-  if ! grep -q "GRUB_CMDLINE_LINUX_DEFAULT.*splash" /etc/default/grub; then
-    # Get current GRUB_CMDLINE_LINUX_DEFAULT value
-    current_cmdline=$(grep "^GRUB_CMDLINE_LINUX_DEFAULT=" /etc/default/grub | cut -d'"' -f2)
-
-    # Add splash and quiet if not present
-    new_cmdline="$current_cmdline"
-    if [[ ! "$current_cmdline" =~ splash ]]; then
-      new_cmdline="$new_cmdline splash"
-    fi
-    if [[ ! "$current_cmdline" =~ quiet ]]; then
-      new_cmdline="$new_cmdline quiet"
-    fi
-
-    # Trim any leading/trailing spaces
-    new_cmdline=$(echo "$new_cmdline" | xargs)
-
-    sudo sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=\".*\"/GRUB_CMDLINE_LINUX_DEFAULT=\"$new_cmdline\"/" /etc/default/grub
-
-    # Regenerate grub config
-    sudo grub-mkconfig -o /boot/grub/grub.cfg
-  else
-    echo "GRUB already configured with splash kernel parameters"
-  fi
-elif [ -d "/etc/cmdline.d" ]; then # UKI
-  echo "Detected a UKI setup"
-  # Relying on mkinitcpio to assemble a UKI
-  # https://wiki.archlinux.org/title/Unified_kernel_image
-  if ! grep -q splash /etc/cmdline.d/*.conf; then
-    # Need splash, create the omarchy file
-    echo "splash" | sudo tee -a /etc/cmdline.d/omarchy.conf
-  fi
-  if ! grep -q quiet /etc/cmdline.d/*.conf; then
-    # Need quiet, create or append the omarchy file
-    echo "quiet" | sudo tee -a /etc/cmdline.d/omarchy.conf
-  fi
-elif [ -f "/etc/kernel/cmdline" ]; then # UKI Alternate
-  # Alternate UKI kernel cmdline location
-  echo "Detected a UKI setup"
-
-  # Backup kernel cmdline config before modifying
-  backup_timestamp=$(date +"%Y%m%d%H%M%S")
-  sudo cp /etc/kernel/cmdline "/etc/kernel/cmdline.bak.${backup_timestamp}"
-
-  current_cmdline=$(cat /etc/kernel/cmdline)
-
-  # Add splash and quiet if not present
-  new_cmdline="$current_cmdline"
-  if [[ ! "$current_cmdline" =~ splash ]]; then
-    new_cmdline="$new_cmdline splash"
-  fi
-  if [[ ! "$current_cmdline" =~ quiet ]]; then
-    new_cmdline="$new_cmdline quiet"
-  fi
-
-  # Trim any leading/trailing spaces
-  new_cmdline=$(echo "$new_cmdline" | xargs)
-
-  # Write new file
-  echo $new_cmdline | sudo tee /etc/kernel/cmdline
-else
-  echo ""
-  echo " None of systemd-boot, GRUB, or UKI detected. Please manually add these kernel parameters:"
-  echo "  - splash (to see the graphical splash screen)"
-  echo "  - quiet (for silent boot)"
-  echo ""
-fi
-
-if [ "$(plymouth-set-default-theme)" != "omarchy" ]; then
-  sudo cp -r "$HOME/.local/share/omarchy/default/plymouth" /usr/share/plymouth/themes/omarchy/
-  sudo plymouth-set-default-theme -R omarchy
-fi
-
-# ==============================================================================
-# SEAMLESS LOGIN
-# ==============================================================================
-
-if [ ! -x /usr/local/bin/seamless-login ]; then
-  # Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop
-  cat <<'CCODE' >/tmp/seamless-login.c
-/*
-* Seamless Login - Minimal SDDM-style Plymouth transition
-* Replicates SDDM's VT management for seamless auto-login
-*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <sys/wait.h>
-#include <string.h>
-
-int main(int argc, char *argv[]) {
-    int vt_fd;
-    int vt_num = 1; // TTY1
-    char vt_path[32];
-    
-    if (argc < 2) {
-        fprintf(stderr, "Usage: %s <session_command>\n", argv[0]);
-        return 1;
-    }
-    
-    // Open the VT (simple approach like SDDM)
-    snprintf(vt_path, sizeof(vt_path), "/dev/tty%d", vt_num);
-    vt_fd = open(vt_path, O_RDWR);
-    if (vt_fd < 0) {
-        perror("Failed to open VT");
-        return 1;
-    }
-    
-    // Activate the VT
-    if (ioctl(vt_fd, VT_ACTIVATE, vt_num) < 0) {
-        perror("VT_ACTIVATE failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Wait for VT to be active
-    if (ioctl(vt_fd, VT_WAITACTIVE, vt_num) < 0) {
-        perror("VT_WAITACTIVE failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Critical: Set graphics mode to prevent console text
-    if (ioctl(vt_fd, KDSETMODE, KD_GRAPHICS) < 0) {
-        perror("KDSETMODE KD_GRAPHICS failed");
-        close(vt_fd);
-        return 1;
-    }
-    
-    // Clear VT and close (like SDDM does)
-    const char *clear_seq = "\33[H\33[2J";
-    if (write(vt_fd, clear_seq, strlen(clear_seq)) < 0) {
-        perror("Failed to clear VT");
-    }
-    
-    close(vt_fd);
-    
-    // Set working directory to user's home
-    const char *home = getenv("HOME");
-    if (home) chdir(home);
-    
-    // Now execute the session command
-    execvp(argv[1], &argv[1]);
-    perror("Failed to exec session");
-    return 1;
-}
-CCODE
-
-  gcc -o /tmp/seamless-login /tmp/seamless-login.c
-  sudo mv /tmp/seamless-login /usr/local/bin/seamless-login
-  sudo chmod +x /usr/local/bin/seamless-login
-  rm /tmp/seamless-login.c
-fi
-
-if [ ! -f /etc/systemd/system/omarchy-seamless-login.service ]; then
-  cat <<EOF | sudo tee /etc/systemd/system/omarchy-seamless-login.service
-[Unit]
-Description=Omarchy Seamless Auto-Login
-Documentation=https://github.com/basecamp/omarchy
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
-PartOf=graphical.target
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/seamless-login uwsm start -- hyprland.desktop
-Restart=always
-RestartSec=2
-User=$USER
-TTYPath=/dev/tty1
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-StandardInput=tty
-StandardOutput=journal
-StandardError=journal+console
-PAMName=login
-
-[Install]
-WantedBy=graphical.target
-EOF
-fi
-
-if [ ! -f /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf ]; then
-  # Make plymouth remain until graphical.target
-  sudo mkdir -p /etc/systemd/system/plymouth-quit.service.d
-  sudo tee /etc/systemd/system/plymouth-quit.service.d/wait-for-graphical.conf <<'EOF'
-[Unit]
-After=multi-user.target
-EOF
-fi
-
-# Mask plymouth-quit-wait.service only if not already masked
-if ! systemctl is-enabled plymouth-quit-wait.service | grep -q masked; then
-  sudo systemctl mask plymouth-quit-wait.service
-  sudo systemctl daemon-reload
-fi
-
-# Enable omarchy-seamless-login.service only if not already enabled
-if ! systemctl is-enabled omarchy-seamless-login.service | grep -q enabled; then
-  sudo systemctl enable omarchy-seamless-login.service
-fi
-
-# Disable getty@tty1.service only if not already disabled
-if ! systemctl is-enabled getty@tty1.service | grep -q disabled; then
-  sudo systemctl disable getty@tty1.service
-fi
--- a/install/config/timezones.sh
+++ b/install/config/timezones.sh
@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ ! -f /etc/sudoers.d/omarchy-tzupdate ]]; then
-  yay -S --noconfirm --needed tzupdate
-  sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
-%wheel ALL=(root) NOPASSWD: /usr/bin/tzupdate, /usr/bin/timedatectl
-EOF
-  sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate
-fi
--- a/install/desktop.sh
+++ b/install/desktop.sh
@ -0,0 +1,6 @@
+yay -S --noconfirm --needed \
+  brightnessctl playerctl pamixer pavucontrol wireplumber \
+  fcitx5 fcitx5-gtk fcitx5-qt fcitx5-configtool wl-clip-persist \
+  nautilus sushi ffmpegthumbnailer \
+  mpv evince imv \
+  chromium
--- a/install/desktop/desktop.sh
+++ b/install/desktop/desktop.sh
@ -1,16 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed \
-  brightnessctl playerctl pamixer wiremix wireplumber \
-  fcitx5 fcitx5-gtk fcitx5-qt wl-clip-persist \
-  nautilus sushi ffmpegthumbnailer \
-  slurp satty \
-  mpv evince imv \
-  chromium
-
-# Add screen recorder based on GPU
-if lspci | grep -qi 'nvidia'; then
-  yay -S --noconfirm --needed wf-recorder
-else
-  yay -S --noconfirm --needed wl-screenrec
-fi
--- a/install/development/development.sh
+++ b/install/development/development.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
  cargo clang llvm mise \
  imagemagick \
--- a/install/development/docker.sh
+++ b/install/development/docker.sh
@ -1,22 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed docker docker-compose docker-buildx
-
-# Limit log size to avoid running out of disk
-sudo mkdir -p /etc/docker
-echo '{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}' | sudo tee /etc/docker/daemon.json
-
-# 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/development/firewall.sh
+++ b/install/development/firewall.sh
@ -1,26 +0,0 @@
-#!/bin/bash
-
-if ! command -v ufw &>/dev/null; then
-  yay -S --noconfirm --needed ufw ufw-docker
-
-  # Allow nothing in, everything out
-  sudo ufw default deny incoming
-  sudo ufw default allow outgoing
-
-  # Allow ports for LocalSend
-  sudo ufw allow 53317/udp
-  sudo ufw allow 53317/tcp
-
-  # Allow SSH in
-  sudo ufw allow 22/tcp
-
-  # Allow Docker containers to use DNS on host
-  sudo ufw allow in on docker0 to any port 53
-
-  # Turn on the firewall
-  sudo ufw enable
-
-  # Turn on Docker protections
-  sudo ufw-docker install
-  sudo ufw reload
-fi
--- a/install/docker.sh
+++ b/install/docker.sh
@ -0,0 +1,11 @@
+yay -S --noconfirm --needed docker docker-compose
+
+# Limit log size to avoid running out of disk
+sudo mkdir -p /etc/docker
+echo '{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}' | sudo tee /etc/docker/daemon.json
+
+# Start Docker automatically
+sudo systemctl enable docker
+
+# Give this user privileged Docker access
+sudo usermod -aG docker ${USER}
--- a/install/config/fix-fkeys.sh
+++ b/install/config/fix-fkeys.sh
@ -1,8 +1,6 @@
-#!/bin/bash
-
 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
+  # Rely on install/plymouth.sh to do the rebuild
  # sudo mkinitcpio -P
 fi
--- a/install/desktop/fonts.sh
+++ b/install/desktop/fonts.sh
@ -1,9 +1,7 @@
-#!/bin/bash
-
 if [ -z "$OMARCHY_BARE" ]; then
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
+  yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji noto-fonts-cjk noto-fonts-extra
 else
-  yay -S --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji
+  yay -Sy --noconfirm --needed ttf-font-awesome noto-fonts noto-fonts-emoji
 fi

 mkdir -p ~/.local/share/fonts
--- a/install/desktop/hyprlandia.sh
+++ b/install/desktop/hyprlandia.sh
@ -1,6 +1,4 @@
-#!/bin/bash
-
 yay -S --noconfirm --needed \
  hyprland hyprshot hyprpicker hyprlock hypridle polkit-gnome hyprland-qtutils \
-  walker-bin libqalculate waybar mako swaybg swayosd \
+  wofi waybar mako swaybg \
  xdg-desktop-portal-hyprland xdg-desktop-portal-gtk
--- a/install/login.sh
+++ b/install/login.sh
@ -0,0 +1,115 @@
+#!/bin/bash
+# Hyprland launched via UWSM and login directly as user, rely on disk encryption + hyprlock for security
+yay -S --noconfirm --needed uwsm
+
+# Compile the seamless login helper -- needed to prevent seeing terminal between loader and desktop
+cat <<'CCODE' >/tmp/seamless-login.c
+/*
+ * Seamless Login - Minimal SDDM-style Plymouth transition
+ * Replicates SDDM's VT management for seamless auto-login
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <linux/kd.h>
+#include <linux/vt.h>
+#include <sys/wait.h>
+#include <string.h>
+
+int main(int argc, char *argv[]) {
+    int vt_fd;
+    int vt_num = 1; // TTY1
+    char vt_path[32];
+    
+    if (argc < 2) {
+        fprintf(stderr, "Usage: %s <session_command>\n", argv[0]);
+        return 1;
+    }
+    
+    // Open the VT (simple approach like SDDM)
+    snprintf(vt_path, sizeof(vt_path), "/dev/tty%d", vt_num);
+    vt_fd = open(vt_path, O_RDWR);
+    if (vt_fd < 0) {
+        perror("Failed to open VT");
+        return 1;
+    }
+    
+    // Activate the VT
+    if (ioctl(vt_fd, VT_ACTIVATE, vt_num) < 0) {
+        perror("VT_ACTIVATE failed");
+        close(vt_fd);
+        return 1;
+    }
+    
+    // Wait for VT to be active
+    if (ioctl(vt_fd, VT_WAITACTIVE, vt_num) < 0) {
+        perror("VT_WAITACTIVE failed");
+        close(vt_fd);
+        return 1;
+    }
+    
+    // Critical: Set graphics mode to prevent console text
+    if (ioctl(vt_fd, KDSETMODE, KD_GRAPHICS) < 0) {
+        perror("KDSETMODE KD_GRAPHICS failed");
+        close(vt_fd);
+        return 1;
+    }
+    
+    // Clear VT and close (like SDDM does)
+    const char *clear_seq = "\33[H\33[2J";
+    if (write(vt_fd, clear_seq, strlen(clear_seq)) < 0) {
+        perror("Failed to clear VT");
+    }
+    
+    close(vt_fd);
+    
+    // Set working directory to user's home
+    const char *home = getenv("HOME");
+    if (home) chdir(home);
+    
+    // Now execute the session command
+    execvp(argv[1], &argv[1]);
+    perror("Failed to exec session");
+    return 1;
+}
+CCODE
+
+gcc -o /tmp/seamless-login /tmp/seamless-login.c
+sudo mv /tmp/seamless-login /usr/local/bin/seamless-login
+sudo chmod +x /usr/local/bin/seamless-login
+rm /tmp/seamless-login.c
+
+cat <<EOF | sudo tee /etc/systemd/system/omarchy-seamless-login.service
+[Unit]
+Description=Omarchy Seamless Auto-Login
+Documentation=https://github.com/basecamp/omarchy
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service
+PartOf=graphical.target
+
+[Service]
+Type=simple
+ExecStart=/usr/local/bin/seamless-login uwsm start -- hyprland.desktop
+Restart=always
+RestartSec=2
+User=$USER
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+StandardInput=tty
+StandardOutput=journal
+StandardError=journal+console
+PAMName=login
+
+[Install]
+WantedBy=graphical.target
+EOF
+
+sudo systemctl daemon-reload
+sudo systemctl enable omarchy-seamless-login.service
+
+# Disable getty@tty1 to prevent conflicts
+sudo systemctl disable getty@tty1.service
--- a/install/apps/mimetypes.sh
+++ b/install/apps/mimetypes.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 update-desktop-database ~/.local/share/applications

 # Open all images with imv
--- a/install/config/network.sh
+++ b/install/config/network.sh
@ -1,8 +1,6 @@
-#!/bin/bash
-
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
-if ! command -v iwctl &>/dev/null; then
+if ! command -v iwd &>/dev/null; then
  yay -S --noconfirm --needed iwd
  sudo systemctl enable --now iwd.service
 fi
--- a/install/config/nvidia.sh
+++ b/install/config/nvidia.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # ==============================================================================
 # Hyprland NVIDIA Setup Script for Arch Linux
 # ==============================================================================
@ -12,9 +10,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
@ -38,9 +33,6 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
    sudo sed -i '/^#\[multilib\]/,/^#Include/ s/^#//' /etc/pacman.conf
  fi

-  # force package database refresh
-  sudo pacman -Syy
-
  # Install packages
  PACKAGES_TO_INSTALL=(
    "${KERNEL_HEADERS}"
@ -53,7 +45,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
    "qt6-wayland"
  )

-  yay -S --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
+  yay -Syu --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/development/nvim.sh
+++ b/install/development/nvim.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 if ! command -v nvim &>/dev/null; then
  yay -S --noconfirm --needed nvim luarocks tree-sitter-cli

--- a/install/plymouth.sh
+++ b/install/plymouth.sh
@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+
+if ! command -v plymouth &>/dev/null; then
+  yay -S --noconfirm --needed plymouth
+
+  # Skip if plymouth already exists for some reason
+  # Backup original mkinitcpio.conf just in case
+  backup_timestamp=$(date +"%Y%m%d%H%M%S")
+  sudo cp /etc/mkinitcpio.conf "/etc/mkinitcpio.conf.bak.${backup_timestamp}"
+
+  # Add plymouth to HOOKS array after 'base udev' or 'base systemd'
+  if grep "^HOOKS=" /etc/mkinitcpio.conf | grep -q "base systemd"; then
+    sudo sed -i '/^HOOKS=/s/base systemd/base systemd plymouth/' /etc/mkinitcpio.conf
+  elif grep "^HOOKS=" /etc/mkinitcpio.conf | grep -q "base udev"; then
+    sudo sed -i '/^HOOKS=/s/base udev/base udev plymouth/' /etc/mkinitcpio.conf
+  else
+    echo "Couldn't add the Plymouth hook"
+  fi
+
+  # Regenerate initramfs
+  sudo mkinitcpio -P
+
+  # Add kernel parameters for Plymouth (systemd-boot only)
+  if [ -d "/boot/loader/entries" ]; then
+    echo "Detected systemd-boot"
+
+    for entry in /boot/loader/entries/*.conf; do
+      if [ -f "$entry" ]; then
+        # Skip fallback entries
+        if [[ "$(basename "$entry")" == *"fallback"* ]]; then
+          echo "Skipped: $(basename "$entry") (fallback entry)"
+          continue
+        fi
+
+        # Skip if splash it already present for some reason
+        if ! grep -q "splash" "$entry"; then
+          sudo sed -i '/^options/ s/$/ splash quiet/' "$entry"
+        else
+          echo "Skipped: $(basename "$entry") (splash already present)"
+        fi
+      fi
+    done
+  elif [ -f "/etc/default/grub" ]; then
+    echo "Detected grub"
+    # Backup GRUB config before modifying
+    backup_timestamp=$(date +"%Y%m%d%H%M%S")
+    sudo cp /etc/default/grub "/etc/default/grub.bak.${backup_timestamp}"
+
+    # Check if splash is already in GRUB_CMDLINE_LINUX_DEFAULT
+    if ! grep -q "GRUB_CMDLINE_LINUX_DEFAULT.*splash" /etc/default/grub; then
+      # Get current GRUB_CMDLINE_LINUX_DEFAULT value
+      current_cmdline=$(grep "^GRUB_CMDLINE_LINUX_DEFAULT=" /etc/default/grub | cut -d'"' -f2)
+
+      # Add splash and quiet if not present
+      new_cmdline="$current_cmdline"
+      if [[ ! "$current_cmdline" =~ splash ]]; then
+        new_cmdline="$new_cmdline splash"
+      fi
+      if [[ ! "$current_cmdline" =~ quiet ]]; then
+        new_cmdline="$new_cmdline quiet"
+      fi
+
+      # Trim any leading/trailing spaces
+      new_cmdline=$(echo "$new_cmdline" | xargs)
+
+      sudo sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=\".*\"/GRUB_CMDLINE_LINUX_DEFAULT=\"$new_cmdline\"/" /etc/default/grub
+
+      # Regenerate grub config
+      sudo grub-mkconfig -o /boot/grub/grub.cfg
+    else
+      echo "GRUB already configured with splash kernel parameters"
+    fi
+  elif [ -d "/etc/cmdline.d" ]; then
+    echo "Detected a UKI setup"
+    # Relying on mkinitcpio to assemble a UKI
+    # https://wiki.archlinux.org/title/Unified_kernel_image
+    if ! grep -q splash /etc/cmdline.d/*.conf; then
+      # Need splash, create the omarchy file
+      echo "splash" | sudo tee -a /etc/cmdline.d/omarchy.conf
+    fi
+    if ! grep -q quiet /etc/cmdline.d/*.conf; then
+      # Need quiet, create or append the omarchy file
+      echo "quiet" | sudo tee -a /etc/cmdline.d/omarchy.conf
+    fi
+  elif [ -f "/etc/kernel/cmdline" ]; then
+    # Alternate UKI kernel cmdline location
+    echo "Detected a UKI setup"
+
+    # Backup kernel cmdline config before modifying
+    backup_timestamp=$(date +"%Y%m%d%H%M%S")
+    sudo cp /etc/kernel/cmdline "/etc/kernel/cmdline.bak.${backup_timestamp}"
+
+    current_cmdline=$(cat /etc/kernel/cmdline)
+
+    # Add splash and quiet if not present
+    new_cmdline="$current_cmdline"
+    if [[ ! "$current_cmdline" =~ splash ]]; then
+      new_cmdline="$new_cmdline splash"
+    fi
+    if [[ ! "$current_cmdline" =~ quiet ]]; then
+      new_cmdline="$new_cmdline quiet"
+    fi
+
+    # Trim any leading/trailing spaces
+    new_cmdline=$(echo "$new_cmdline" | xargs)
+
+    # Write new file
+    echo $new_cmdline | sudo tee /etc/kernel/cmdline
+  else
+    echo ""
+    echo "Neither systemd-boot nor GRUB detected. Please manually add these kernel parameters:"
+    echo "  - splash (to see the graphical splash screen)"
+    echo "  - quiet (for silent boot)"
+    echo ""
+  fi
+
+  # Copy and set the Plymouth theme
+  sudo cp -r "$HOME/.local/share/omarchy/default/plymouth" /usr/share/plymouth/themes/omarchy/
+
+  sudo plymouth-set-default-theme -R omarchy
+fi
--- a/install/config/power.sh
+++ b/install/config/power.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Setting the performance profile can make a big difference. By default, most systems seem to start in balanced mode,
 # even if they're not running off a battery. So let's make sure that's changed to performance.
 yay -S --noconfirm power-profiles-daemon
--- a/install/preflight/aur.sh
+++ b/install/preflight/aur.sh
@ -1,41 +0,0 @@
-#!/bin/bash
-
-# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
-if [[ "$(uname -m)" == "x86_64" ]] && ! command -v yay &>/dev/null; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if ! pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1 &&
-    sudo pacman-key --recv-key 3056513887B78AEB &&
-    sudo pacman-key --lsign-key 3056513887B78AEB &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-
-    # Add Chaotic-AUR repo to pacman config
-    if ! grep -q "chaotic-aur" /etc/pacman.conf; then
-      echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-    fi
-
-    # Install yay directly from Chaotic-AUR
-    sudo pacman -Sy --needed --noconfirm yay
-  else
-    echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
-
-# Manually install yay from AUR if not already available
-if ! command -v yay &>/dev/null; then
-  # Install build tools
-  sudo pacman -Sy --needed --noconfirm base-devel
-  cd /tmp
-  rm -rf yay-bin
-  git clone https://aur.archlinux.org/yay-bin.git
-  cd yay-bin
-  makepkg -si --noconfirm
-  cd -
-  rm -rf yay-bin
-  cd ~
-fi
-
-# Add fun and color to the pacman installer
-if ! grep -q "ILoveCandy" /etc/pacman.conf; then
-  sudo sed -i '/^\[options\]/a Color\nILoveCandy' /etc/pacman.conf
-fi
--- a/install/preflight/presentation.sh
+++ b/install/preflight/presentation.sh
@ -1,3 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed gum python-terminaltexteffects
--- a/install/desktop/printer.sh
+++ b/install/desktop/printer.sh
@ -1,4 +1,2 @@
-#!/bin/bash
-
 sudo pacman -S --noconfirm cups cups-pdf cups-filters system-config-printer
 sudo systemctl enable --now cups.service
--- a/install/development/ruby.sh
+++ b/install/development/ruby.sh
@ -1,5 +1,3 @@
-#!/bin/bash
-
 # Install Ruby using gcc-14 for compatibility
 yay -S --noconfirm --needed gcc14
 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14"
--- a/Show More
+++ b/Show More