Suddenly the status indicators were busted on new installations

Don't have time to debug this now, so will have to wait until next
release

applications/wiremix.desktop

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

applications/xtras/Zoom.desktop

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

bin/omarchy-cmd-first-run

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+FIRST_RUN_MODE=~/.local/state/omarchy/first-run.mode
+
+if [[ -f "$FIRST_RUN_MODE" ]]; then
+  rm -f "$FIRST_RUN_MODE"
+  $OMARCHY_PATH/install/first-run/battery-monitor.sh
+  $OMARCHY_PATH/install/first-run/firewall.sh
+  sudo rm -f /etc/sudoers.d/first-run
+fi

bin/omarchy-cmd-screensaver

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-if command -v tte &>/dev/null; then
-  while true; do
+while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
     --frame-rate 240 --canvas-width 0 --canvas-height $(($(tput lines) - 2)) --anchor-canvas c --anchor-text c \
@@ -14,7 +13,4 @@ if command -v tte &>/dev/null; then
       exit 0
     fi
   done
-  done
-else
-  gum spin --title "Can't find tte. Try: pip install terminaltexteffects" -- sleep 2
-fi
+done

bin/omarchy-cmd-tzupdate

@@ -1,6 +1,7 @@
 #!/bin/bash
 
+sudo systemctl restart systemd-timesyncd
 sudo tzupdate
 new_timezone=$(timedatectl show -p Timezone --value)
 omarchy-restart-waybar
-notify-send "Timezone has been set to $new_timezone"
+notify-send "Time synced and timezone set to $new_timezone"

bin/omarchy-ensure-aur-available

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

bin/omarchy-install-dev-env

@@ -6,7 +6,7 @@ if [[ -z "$1" ]]; then
 fi
 
 install_php() {
-  yay -Sy php composer php-sqlite --noconfirm
+  sudo pacman -Sy php composer php-sqlite --noconfirm
 
   # Install Path for Composer
   if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then

bin/omarchy-install-docker-dbs

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-options=("MariaDB" "MySQL" "Redis" "PostgreSQL" "MongoDB")
+options=("MySQL" "PostgreSQL" "Redis" "MongoDB" "MariaDB")
 choices=$(printf "%s\n" "${options[@]}" | gum choose --no-limit --header "Select databases (space to select, return to install, esc to cancel)") || main_menu
 
 if [[ -n "$choices" ]]; then

bin/omarchy-install-dropbox

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Installing all dependencies..."
-yay -S --noconfirm --needed \
+sudo pacman -S --noconfirm --needed \
   dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."

bin/omarchy-install-steam

@@ -5,5 +5,5 @@ sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf
 sudo pacman -Sy
 
 echo "Now pick dependencies matching your graphics card"
-yay -S steam
+sudo pacman -S steam
 setsid gtk-launch steam >/dev/null 2>&1 &

bin/omarchy-launch-screensaver

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

bin/omarchy-menu

@@ -35,15 +35,23 @@ edit_in_nvim() {
 }
 
 install() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2"
+  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2"
 }
 
 install_and_launch() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
+  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm $2 && setsid gtk-launch $3"
 }
 
 install_font() {
-  present_terminal "echo 'Installing $1...'; yay -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+  present_terminal "echo 'Installing $1...'; sudo pacman -Sy --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'"
+}
+
+aur_install() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2"
+}
+
+aur_install_and_launch() {
+  present_terminal "echo 'Installing $1 from AUR...'; yay -Sy --noconfirm $2 && setsid gtk-launch $3"
 }
 
 show_learn_menu() {
@@ -127,16 +135,23 @@ show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
 
   case $(menu "Setup" "$options") in
   *Audio*) alacritty --class=Wiremix -e wiremix ;;
-  *Wifi*) alacritty --class=Impala -e bash -c "rfkill unblock wifi; impala" ;;
-  *Bluetooth*) blueberry ;;
+  *Wifi*)
+    rfkill unblock wifi
+    alacritty --class=Impala -e impala
+    ;;
+  *Bluetooth*)
+    rfkill unblock bluetooth
+    blueberry
+    ;;
   *Power*) show_setup_power_menu ;;
   *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
   *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
   *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *DNS*) present_terminal omarchy-setup-dns ;;
   *Config*) show_setup_config_menu ;;
   *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
   *Fido2*) present_terminal omarchy-setup-fido2 ;;
@@ -169,8 +184,9 @@ show_setup_config_menu() {
 }
 
 show_install_menu() {
-  case $(menu "Install" "󰣇  Package\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
+  case $(menu "Install" "󰣇  Package\n󰣇  AUR\n  Web App\n  TUI\n  Service\n  Style\n󰵮  Development\n  Editor\n󱚤  AI\n  Gaming") in
   *Package*) terminal omarchy-pkg-install ;;
+  *AUR*) terminal omarchy-pkg-aur-install ;;
   *Web*) present_terminal omarchy-webapp-install ;;
   *TUI*) present_terminal omarchy-tui-install ;;
   *Service*) show_install_service_menu ;;
@@ -192,9 +208,9 @@ show_install_service_menu() {
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix") in
+  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) aur_install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
@@ -203,21 +219,21 @@ show_install_editor_menu() {
 }
 
 show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
   *Claude*) install "Claude Code" "claude-code" ;;
-  *Gemini*) install "Gemini" "gemini-cli-bin" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Gemini*) install "Gemini" "gemini-cli" ;;
+  *Studio*) aur_install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" "ollama" ;;
-  *Crush*) install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode-bin" ;;
+  *Crush*) aur_install "Crush" "crush-bin" ;;
+  *opencode*) aur_install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft") in
+  case $(menu "Install" "  Steam\n  RetroArch [AUR]\n󰍳  Minecraft") in
   *Steam*) present_terminal omarchy-install-steam ;;
-  *RetroArch*) install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
+  *RetroArch*) aur_install_and_launch "RetroArch" "retroarch retroarch-assets libretro libretro-fbneo" "com.libretro.RetroArch.desktop" ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
   *) show_install_menu ;;
   esac

bin/omarchy-pkg-aur-accessible

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

bin/omarchy-pkg-aur-install

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

bin/omarchy-pkg-install

@@ -4,7 +4,7 @@ set -e
 
 fzf_args=(
   --multi
-  --preview 'yay -Sii {1}'
+  --preview 'pacman -Sii {1}'
   --preview-label='alt-p: toggle description, alt-j/k: scroll, tab: multi-select, F11: maximize'
   --preview-label-pos='bottom'
   --preview-window 'down:65%:wrap'
@@ -14,11 +14,12 @@ fzf_args=(
   --color 'pointer:green,marker:green'
 )
 
-pkg_names=$(yay -Slq | fzf "${fzf_args[@]}")
+sudo pacman -Sy
+pkg_names=$(pacman -Slq | fzf "${fzf_args[@]}")
 
 if [[ -n "$pkg_names" ]]; then
   # Convert newline-separated selections to space-separated for yay
-  echo "$pkg_names" | tr '\n' ' ' | xargs yay -Sy --noconfirm
+  echo "$pkg_names" | tr '\n' ' ' | xargs sudo pacman -Sy --noconfirm
   sudo updatedb
   omarchy-show-done
 fi

bin/omarchy-pkg-remove

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

bin/omarchy-refresh-applications

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

bin/omarchy-refresh-plymouth

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

bin/omarchy-setup-dns

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

bin/omarchy-setup-fido2

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

bin/omarchy-setup-fingerprint

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

bin/omarchy-snapshot

@@ -8,6 +8,10 @@ if [[ -z $COMMAND ]]; then
   exit 1
 fi
 
+if ! command -v snapper &>/dev/null; then
+  exit 127 # omarchy-update can use this to just ignore if snapper is not available
+fi
+
 case "$COMMAND" in
 create)
   DESC="$(omarchy-version)"

bin/omarchy-status-daemon

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

bin/omarchy-status-dnd

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

bin/omarchy-status-idle

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

bin/omarchy-status-nightlight

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

bin/omarchy-status-recording

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

bin/omarchy-theme-set

@@ -40,11 +40,19 @@ else
 fi
 
 # Change Chromium colors
-if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
+if command -v chromium &>/dev/null; then
+  if [[ -f ~/.config/omarchy/current/theme/light.mode ]]; then
+    chromium --no-startup-window --set-color-scheme="light"
+  else
+    chromium --no-startup-window --set-color-scheme="dark"
+  fi
+
+  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
     chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
-else
+  else
     # Use a default, neutral grey if theme doesn't have a color
     chromium --no-startup-window --set-theme-color="28,32,39"
+  fi
 fi
 
 # Trigger alacritty config reload

bin/omarchy-update

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

bin/omarchy-update-restart

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

bin/omarchy-update-system-pkgs

@@ -1,5 +1,23 @@
 #!/bin/bash
 
 echo -e "\e[32m\nUpdate system packages\e[0m"
-yay -Syu --noconfirm
+sudo pacman -Syu --noconfirm
 echo
+
+if omarchy-pkg-aur-accessible; then
+  echo -e "\e[32m\nUpdate AUR packages\e[0m"
+  yay -Syu --noconfirm
+  echo
+else
+  echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
+  echo
+fi
+
+orphans=$(pacman -Qtdq)
+if [[ -n $orphans ]]; then
+  echo -e "\e[32m\nRemove orphan system packages\e[0m"
+  for pkg in $orphans; do
+    sudo pacman -Rs --noconfirm "$pkg" || true
+  done
+  echo
+fi

boot.sh

@@ -23,8 +23,9 @@ echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
 rm -rf ~/.local/share/omarchy/
 git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
 
-# Use custom branch if instructed
-if [[ -n "$OMARCHY_REF" ]]; then
+# Use custom branch if instructed, otherwise default to master
+OMARCHY_REF="${OMARCHY_REF:-master}"
+if [[ $OMARCHY_REF != "master" ]]; then
   echo -e "\eUsing branch: $OMARCHY_REF"
   cd ~/.local/share/omarchy
   git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"

config/chromium/Default/Preferences

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

config/fastfetch/config.jsonc

@@ -85,9 +85,9 @@
     "break",
     {
       "type": "command",
-      "key": "│ ├Ø",
+      "key": "Ø Omarchy",
       "keyColor": "blue",
-      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
+      "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"$version\""
     },
     {
       "type": "command",

config/hypr/hypridle.conf

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

config/waybar/config.jsonc

@@ -4,15 +4,8 @@
   "position": "top",
   "spacing": 0,
   "height": 26,
-  "modules-left": [
-    "custom/omarchy",
-    "hyprland/workspaces"
-  ],
-  "modules-center": [
-    "group/status-cluster",
-    "clock",
-    "custom/update"
-  ],
+  "modules-left": ["custom/omarchy", "hyprland/workspaces"],
+  "modules-center": ["group/status-cluster", "clock", "custom/update"],
   "modules-right": [
     "group/tray-expander",
     "bluetooth",
@@ -46,7 +39,7 @@
     }
   },
   "custom/omarchy": {
-    "format": "",
+    "format": "<span font='omarchy'>\ue900</span>",
     "on-click": "omarchy-menu",
     "tooltip-format": "Omarchy Menu\n\nSuper + Alt + Space"
   },
@@ -70,11 +63,11 @@
     "on-click-right": "omarchy-cmd-tzupdate"
   },
   "network": {
-    "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
-    "format" : "{icon}",
-    "format-wifi" : "{icon}",
-    "format-ethernet" : "󰀂",
-    "format-disconnected" : "󰖪",
+    "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
+    "format": "{icon}",
+    "format-wifi": "{icon}",
+    "format-ethernet": "󰀂",
+    "format-disconnected": "󰖪",
     "tooltip-format-wifi": "{essid} ({frequency} GHz)\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-ethernet": "⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
     "tooltip-format-disconnected": "Disconnected",
@@ -88,12 +81,8 @@
     "format-charging": "{icon}",
     "format-plugged": "",
     "format-icons": {
-      "charging": [
-        "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
-      ],
-      "default": [
-        "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
-      ]
+      "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"],
+      "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
     },
     "format-full": "󰂅",
     "tooltip-format-discharging": "{power:>1.0f}W↓ {capacity}%",
@@ -128,43 +117,7 @@
       "transition-duration": 600,
       "children-class": "tray-group-item"
     },
-    "modules": [
-      "custom/expand-icon",
-    "tray"
-    ]
-  },
-  "group/status-cluster": {
-    "orientation": "inherit",
-    "modules": [
-      "custom/status-dnd",
-      "custom/status-nightlight", 
-      "custom/status-recording",
-      "custom/status-idle"
-    ]
-  },
-  "custom/status-dnd": {
-    "exec": "omarchy-status-daemon dnd",
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "makoctl mode -t do-not-disturb"
-  },
-  "custom/status-nightlight": {
-    "exec": "omarchy-status-daemon nightlight", 
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "omarchy-toggle-nightlight"
-  },
-  "custom/status-recording": {
-    "exec": "omarchy-status-daemon recording",
-    "return-type": "json", 
-    "interval": 1,
-    "on-click": "omarchy-cmd-screenrecord-stop"
-  },
-  "custom/status-idle": {
-    "exec": "omarchy-status-daemon idle",
-    "return-type": "json",
-    "interval": 1,
-    "on-click": "omarchy-toggle-idle"
+    "modules": ["custom/expand-icon", "tray"]
   },
   "custom/expand-icon": {
     "format": " ",

config/waybar/style.css

@@ -64,7 +64,6 @@ tooltip {
 
 #custom-status-dnd,
 #custom-status-nightlight, 
-#custom-status-recording,
 #custom-status-idle {
   min-width: 12px;
   margin: 0 2px;
@@ -77,11 +76,6 @@ tooltip {
   opacity: 1;
 }
 
-#custom-status-recording.status-recording {
-  color: #a55555;
-  opacity: 1;
-}
-
 .hidden {
   opacity: 0;
 }

default/hypr/apps.conf

@@ -8,4 +8,3 @@ source = ~/.local/share/omarchy/default/hypr/apps/system.conf
 source = ~/.local/share/omarchy/default/hypr/apps/walker.conf
 source = ~/.local/share/omarchy/default/hypr/apps/1password.conf
 source = ~/.local/share/omarchy/default/hypr/apps/jetbrains.conf
-source = ~/.local/share/omarchy/default/hypr/apps/zoom.conf

default/hypr/apps/chromium.conf

@@ -3,4 +3,4 @@ windowrule = tile, class:^(Chromium)$
 
 # Only slight opacity when unfocused
 windowrule = opacity 1 0.97, class:^(Chromium|chromium|google-chrome|google-chrome-unstable|Brave-browser|brave-browser)$
-windowrule = opacity 1 1, initialTitle:^(youtube.com_/)$ # Youtube
+windowrule = opacity 1 1, initialTitle:(youtube.com_/|app.zoom.us_/wc/home)

default/hypr/apps/system.conf

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

default/hypr/apps/zoom.conf

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

default/hypr/autostart.conf

@@ -6,7 +6,4 @@ exec-once = uwsm app -- swaybg -i ~/.config/omarchy/current/background -m fill
 exec-once = uwsm app -- swayosd-server
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = wl-clip-persist --clipboard regular --all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'
-
-# FIXME: Reenable the walker service once the memory leak has been fixed
-# See https://github.com/basecamp/omarchy/issues/698
-# exec-once = uwsm app -- walker --gapplication-service
+exec-once = omarchy-cmd-first-run

default/hypr/bindings/tiling.conf

@@ -55,10 +55,10 @@ bindd = ALT, Tab, Reveal active window on top, bringactivetotop
 bindd = ALT SHIFT, Tab, Reveal active window on top, bringactivetotop
 
 # Resize active window
-bindd = SUPER, minus, Expand window left, resizeactive, -100 0
-bindd = SUPER, equal, Shrink window left, resizeactive, 100 0
-bindd = SUPER SHIFT, minus, Shrink window up, resizeactive, 0 -100
-bindd = SUPER SHIFT, equal, Expand window down, resizeactive, 0 100
+bindd = SUPER, code:20, Expand window left, resizeactive, -100 0    # - key
+bindd = SUPER, code:21, Shrink window left, resizeactive, 100 0     # = key
+bindd = SUPER SHIFT, code:20, Shrink window up, resizeactive, 0 -100
+bindd = SUPER SHIFT, code:21, Expand window down, resizeactive, 0 100
 
 # Scroll through existing workspaces with SUPER + scroll
 bindd = SUPER, mouse_down, Scroll active workspace forward, workspace, e+1

install.sh

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

install/apps/tuis.sh

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

install/apps/webapps.sh

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

install/apps/xtras.sh

@@ -1,21 +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
-  # FIXME: Add pinta back to this list when we have dealt with certificate issue
-  for pkg in typora spotify zoom; do
-    yay -S --noconfirm --needed "$pkg" ||
-      echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m"
-  done
-
-  yay -S --noconfirm --needed 1password-beta 1password-cli ||
-    echo -e "\e[31mFailed to install 1password. Continuing without!\e[0m"
-fi
-
-# Copy over Omarchy applications
-source omarchy-refresh-applications || true

install/config/branding.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Allow the user to change the branding for fastfetch and screensaver
 mkdir -p ~/.config/omarchy/branding
 cp ~/.local/share/omarchy/icon.txt ~/.config/omarchy/branding/about.txt
 cp ~/.local/share/omarchy/logo.txt ~/.config/omarchy/branding/screensaver.txt

install/config/config.sh

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

install/config/detect-keyboard-layout.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Copy over the keyboard layout that's been set in Arch during install to Hyprland
 conf="/etc/vconsole.conf"
 hyprconf="$HOME/.config/hypr/hyprland.conf"
 

install/config/docker.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-yay -S --noconfirm --needed docker docker-compose docker-buildx
-
 # Configure Docker daemon:
 # - limit log size to avoid running out of disk
 # - use host's DNS resolver

install/config/git.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Set common git aliases
+git config --global alias.co checkout
+git config --global alias.br branch
+git config --global alias.ci commit
+git config --global alias.st status
+git config --global pull.rebase true
+git config --global init.defaultBranch master
+
+# Set identification from install inputs
+if [[ -n "${OMARCHY_USER_NAME//[[:space:]]/}" ]]; then
+  git config --global user.name "$OMARCHY_USER_NAME"
+fi
+
+if [[ -n "${OMARCHY_USER_EMAIL//[[:space:]]/}" ]]; then
+  git config --global user.email "$OMARCHY_USER_EMAIL"
+fi

install/config/gpg.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Setup GPG configuration with multiple keyservers for better reliability
+sudo mkdir -p /etc/gnupg
+sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/
+sudo chmod 644 /etc/gnupg/dirmngr.conf
+sudo gpgconf --kill dirmngr || true
+sudo gpgconf --launch dirmngr || true

install/config/hardware/bluetooth.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-# Install bluetooth controls
-yay -S --noconfirm --needed blueberry
-
 # Turn on bluetooth by default
 chrootable_systemctl_enable bluetooth.service

install/config/hardware/fix-fkeys.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 
+# Ensure that F-keys on Apple-like keyboards (such as Lofree Flow84) are always F-keys
 if [[ ! -f /etc/modprobe.d/hid_apple.conf ]]; then
   echo "options hid_apple fnmode=2" | sudo tee /etc/modprobe.d/hid_apple.conf
-
-  # Rely on install/login.sh to do the rebuild
-  # sudo mkinitcpio -P
 fi

install/config/hardware/network.sh

@@ -3,7 +3,7 @@
 # Install iwd explicitly if it wasn't included in archinstall
 # This can happen if archinstall used ethernet
 if ! command -v iwctl &>/dev/null; then
-  yay -S --noconfirm --needed iwd
+  sudo pacman -S --noconfirm --needed iwd
   chrootable_systemctl_enable iwd.service
 fi
 

install/config/hardware/nvidia.sh

@@ -12,9 +12,6 @@
 
 # --- GPU Detection ---
 if [ -n "$(lspci | grep -i 'nvidia')" ]; then
-  show_logo
-  show_subtext "Install NVIDIA drivers..."
-
   # --- Driver Selection ---
   # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
   if echo "$(lspci | grep -i 'nvidia')" | grep -q -E "RTX [2-9][0-9]|GTX 16"; then
@@ -53,7 +50,7 @@ if [ -n "$(lspci | grep -i 'nvidia')" ]; then
     "qt6-wayland"
   )
 
-  yay -S --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
+  sudo pacman -S --needed --noconfirm "${PACKAGES_TO_INSTALL[@]}"
 
   # Configure modprobe for early KMS
   echo "options nvidia_drm modeset=1" | sudo tee /etc/modprobe.d/nvidia.conf >/dev/null

install/config/hardware/printer.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-sudo pacman -S --noconfirm cups cups-pdf cups-filters cups-browsed system-config-printer avahi nss-mdns
 chrootable_systemctl_enable cups.service
 
 # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery

install/config/increase-lockout-limit.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# 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"

install/config/increase-sudo-tries.sh

@@ -1,2 +1,5 @@
+#!/bin/bash
+
+# Give the user 10 instead of 3 tries to fat finger their password before lockout
 echo "Defaults passwd_tries=10" | sudo tee /etc/sudoers.d/passwd-tries
 sudo chmod 440 /etc/sudoers.d/passwd-tries

install/config/mimetypes.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+omarchy-refresh-applications
 update-desktop-database ~/.local/share/applications
 
 # Open all images with imv

install/config/mise-ruby.sh

@@ -1,7 +1,6 @@
 #!/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"
 
 # Trust .ruby-version

install/config/power.sh

@@ -1,20 +0,0 @@
-#!/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 python-gobject power-profiles-daemon
-
-if ls /sys/class/power_supply/BAT* &>/dev/null; then
-  # This computer runs on a battery
-  powerprofilesctl set balanced || true
-
-  # Enable battery monitoring timer for low battery notifications
-  if [ -n "${OMARCHY_CHROOT_INSTALL:-}" ]; then
-    systemctl --user enable omarchy-battery-monitor.timer
-  else
-    systemctl --user enable --now omarchy-battery-monitor.timer
-  fi
-else
-  # This computer runs on power outlet
-  powerprofilesctl set performance || true
-fi

install/config/ssh-flakiness.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Solve common flakiness with SSH
+echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf

install/config/theme.sh

@@ -1,20 +1,5 @@
 #!/bin/bash
 
-# Use dark mode for QT apps too (like kdenlive)
-if ! yay -Q kvantum-qt5 &>/dev/null; then
-  yay -S --noconfirm kvantum-qt5
-fi
-
-# Prefer dark mode everything
-if ! yay -Q gnome-themes-extra &>/dev/null; then
-  yay -S --noconfirm gnome-themes-extra # Adds Adwaita-dark theme
-fi
-
-# Allow icons to match the theme
-if ! yay -! yaru-icon-theme &>/dev/null; then
-  yay -S --noconfirm yaru-icon-theme
-fi
-
 gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
 gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue"

install/config/timezones.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-if ! command -v tzupdate &>/dev/null; then
-  yay -S --noconfirm --needed tzupdate
-  sudo tee /etc/sudoers.d/omarchy-tzupdate >/dev/null <<EOF
+# Ensure timezone can be updated without needing to sudo
+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
+sudo chmod 0440 /etc/sudoers.d/omarchy-tzupdate

install/config/xcompose.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Set default XCompose that is triggered with CapsLock
+tee ~/.XCompose >/dev/null <<EOF
+include "%H/.local/share/omarchy/default/xcompose"
+
+# Identification
+<Multi_key> <space> <n> : "$OMARCHY_USER_NAME"
+<Multi_key> <space> <e> : "$OMARCHY_USER_EMAIL"
+EOF

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 gvfs-mtp \
-  slurp satty \
-  mpv evince imv \
-  omarchy-chromium-bin
-
-# Add screen recorder based on GPU
-if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
-  yay -S --noconfirm --needed wf-recorder
-else
-  yay -S --noconfirm --needed wl-screenrec
-fi

install/desktop/fonts.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed ttf-font-awesome ttf-cascadia-mono-nerd ttf-ia-writer noto-fonts noto-fonts-emoji
-
-if [ -z "$OMARCHY_BARE" ]; then
-  yay -S --noconfirm --needed ttf-jetbrains-mono noto-fonts-cjk noto-fonts-extra
-fi

install/desktop/hyprlandia.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed \
-  hyprland hyprshot hyprpicker hyprlock hypridle hyprsunset polkit-gnome hyprland-qtutils \
-  walker-bin libqalculate waybar mako swaybg swayosd \
-  xdg-desktop-portal-hyprland xdg-desktop-portal-gtk

install/development/development.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed \
-  cargo clang llvm mise \
-  imagemagick \
-  mariadb-libs postgresql-libs \
-  github-cli \
-  lazygit lazydocker

install/development/firewall.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-if ! command -v ufw &>/dev/null && -z "${OMARCHY_CHROOT_INSTALL:-}"; 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 proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-
-  # Turn on the firewall
-  sudo ufw --force enable
-
-  # Turn on Docker protections
-  sudo ufw-docker install
-  sudo ufw reload
-fi

install/development/terminal.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-yay -S --noconfirm --needed \
-  unzip inetutils impala \
-  fd eza fzf ripgrep zoxide bat dust jq xmlstarlet \
-  wl-clipboard btop \
-  man tldr less whois plocate \
-  starship bash-completion \
-  alacritty

install/first-run/battery-monitor.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if ls /sys/class/power_supply/BAT* &>/dev/null; then
+  # This computer runs on a battery
+  powerprofilesctl set balanced || true
+
+  # Enable battery monitoring timer for low battery notifications
+  systemctl --user enable --now omarchy-battery-monitor.timer
+else
+  # This computer runs on power outlet
+  powerprofilesctl set performance || true
+fi

install/first-run/firewall.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# 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 proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
+
+# Turn on the firewall
+sudo ufw --force enable
+
+# Turn on Docker protections
+sudo ufw-docker install
+sudo ufw reload

install/log/after-install.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo -e "\n--- Pacman packages (after installation) ---"
-echo "Total packages installed: $(pacman -Q | wc -l)"
-pacman -Q

install/log/before-install.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Start logging a copy of everything sent to STDOUT and STDERR
-mkdir -p ~/.local/state/omarchy/logs/
-exec &> >(tee -a ~/.local/state/omarchy/logs/installation.log)
-
-echo "--- System state before installation ---"
-sudo pacman -S --noconfirm fastfetch
-fastfetch
-
-echo -e "\n--- System logs (journalctl / current boot) ---"
-journalctl -b --no-pager
-
-echo -e "\n--- Pacman packages (before installation) ---"
-echo "Total packages installed: $(pacman -Q | wc -l)"
-pacman -Q

install/login/limine-snapper.sh

@@ -1,17 +1,22 @@
 #!/bin/bash
 
-if command -v limine &>/dev/null && [ ! -f /etc/default/limine ]; then
-  yay -S --noconfirm --needed limine-mkinitcpio-hook limine-snapper-sync
-
+if command -v limine &>/dev/null; then
   sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf <<EOF >/dev/null
 HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs)
 EOF
 
-  CMDLINE=$(grep "^[[:space:]]*cmdline:" /boot/EFI/limine/limine.conf | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//')
+  [[ -f /boot/EFI/limine/limine.conf ]] && EFI=true
+
+  # Conf location is different between EFI and BIOS
+  [[ -n "$EFI" ]] && limine_config="/boot/EFI/limine/limine.conf" || limine_config="/boot/limine/limine.conf"
+
+  CMDLINE=$(grep "^[[:space:]]*cmdline:" "$limine_config" | head -1 | sed 's/^[[:space:]]*cmdline:[[:space:]]*//')
 
   sudo tee /etc/default/limine <<EOF >/dev/null
 TARGET_OS_NAME="Omarchy"
 
+ESP_PATH="/boot"
+
 KERNEL_CMDLINE[default]="$CMDLINE"
 KERNEL_CMDLINE[default]+="quiet splash"
 
@@ -29,6 +34,11 @@ MAX_SNAPSHOT_ENTRIES=5
 SNAPSHOT_FORMAT_CHOICE=5
 EOF
 
+  # UKI and EFI fallback are EFI only
+  if [[ -z $EFI ]]; then
+    sudo sed -i '/^ENABLE_UKI=/d; /^ENABLE_LIMINE_FALLBACK=/d' /etc/default/limine
+  fi
+
   # We overwrite the whole thing knowing the limine-update will add the entries for us
   sudo tee /boot/limine.conf <<EOF >/dev/null
 ### Read more at config document: https://github.com/limine-bootloader/limine/blob/trunk/CONFIG.md
@@ -52,6 +62,9 @@ term_background_bright: 24283b
  
 EOF
 
+  sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook
+  sudo limine-update
+
   # Match Snapper configs if not installing from the ISO
   if [ -z "${OMARCHY_CHROOT_INSTALL:-}" ]; then
     if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then
@@ -68,16 +81,14 @@ EOF
   sudo sed -i 's/^NUMBER_LIMIT="50"/NUMBER_LIMIT="5"/' /etc/snapper/configs/{root,home}
   sudo sed -i 's/^NUMBER_LIMIT_IMPORTANT="10"/NUMBER_LIMIT_IMPORTANT="5"/' /etc/snapper/configs/{root,home}
 
-  sudo limine-update
   chrootable_systemctl_enable limine-snapper-sync.service
 fi
 
 # Add UKI entry to UEFI machines to skip bootloader showing on normal boot
-# Only doing this for ISO installs
-if [ -n "${OMARCHY_CHROOT_INSTALL:-}" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
+if [ -n "$EFI" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
   sudo efibootmgr --create \
-    --disk "$(findmnt -n -o SOURCE /boot | sed 's/[0-9]*$//')" \
-    --part "$(findmnt -n -o SOURCE /boot | grep -o '[0-9]*$')" \
+    --disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \
+    --part "$(findmnt -n -o SOURCE /boot | grep -o 'p\?[0-9]*$' | sed 's/^p//')" \
     --label "Omarchy" \
     --loader "\\EFI\\Linux\\$(cat /etc/machine-id)_linux.efi"
 fi

install/login/plymouth.sh

@@ -1,9 +1,6 @@
 #!/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 plymouth uwsm
-fi
 
 # ==============================================================================
 # PLYMOUTH SETUP

install/packages.sh

@@ -0,0 +1,122 @@
+sudo pacman -S --noconfirm --needed \
+  1password-beta \
+  1password-cli \
+  alacritty \
+  avahi \
+  bash-completion \
+  bat \
+  blueberry \
+  brightnessctl \
+  btop \
+  cargo \
+  clang \
+  cups \
+  cups-browsed \
+  cups-filters \
+  cups-pdf \
+  docker \
+  docker-buildx \
+  docker-compose \
+  dust \
+  evince \
+  eza \
+  fastfetch \
+  fcitx5 \
+  fcitx5-gtk \
+  fcitx5-qt \
+  fd \
+  ffmpegthumbnailer \
+  fzf \
+  gcc14 \
+  github-cli \
+  gnome-calculator \
+  gnome-keyring \
+  gnome-themes-extra \
+  gum \
+  gvfs-mtp \
+  hypridle \
+  hyprland \
+  hyprland-qtutils \
+  hyprlock \
+  hyprpicker \
+  hyprshot \
+  hyprsunset \
+  imagemagick \
+  impala \
+  imv \
+  inetutils \
+  jq \
+  kdenlive \
+  kvantum-qt5 \
+  lazydocker \
+  lazygit \
+  less \
+  libqalculate \
+  libreoffice \
+  llvm \
+  localsend \
+  luarocks \
+  mako \
+  man \
+  mariadb-libs \
+  mise \
+  mpv \
+  nautilus \
+  noto-fonts \
+  noto-fonts-cjk \
+  noto-fonts-emoji \
+  noto-fonts-extra \
+  nss-mdns \
+  nvim \
+  obs-studio \
+  obsidian \
+  omarchy-chromium \
+  pamixer \
+  pinta \
+  playerctl \
+  plocate \
+  plymouth \
+  polkit-gnome \
+  postgresql-libs \
+  power-profiles-daemon \
+  python-gobject \
+  python-poetry-core \
+  python-terminaltexteffects \
+  ripgrep \
+  satty \
+  signal-desktop \
+  slurp \
+  spotify \
+  starship \
+  sushi \
+  swaybg \
+  swayosd \
+  system-config-printer \
+  tldr \
+  tree-sitter-cli \
+  ttf-cascadia-mono-nerd \
+  ttf-font-awesome \
+  ttf-ia-writer \
+  ttf-jetbrains-mono \
+  typora \
+  tzupdate \
+  ufw \
+  ufw-docker \
+  unzip \
+  uwsm \
+  walker-bin \
+  waybar \
+  wf-recorder \
+  whois \
+  wiremix \
+  wireplumber \
+  wl-clip-persist \
+  wl-clipboard \
+  wl-screenrec \
+  xdg-desktop-portal-gtk \
+  xdg-desktop-portal-hyprland \
+  xmlstarlet \
+  xournalpp \
+  yaru-icon-theme \
+  yay \
+  zoxide

install/packaging/asdcontrol.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Install asdcontrol for controlling brightness on Apple Displays
-if [ -z "$OMARCHY_BARE" ] && ! command -v asdcontrol &>/dev/null; then
+if ! command -v asdcontrol &>/dev/null; then
   git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
   cd /tmp/asdcontrol
   make

install/packaging/fonts.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Omarchy logo in a font for Waybar use
+mkdir -p ~/.local/share/fonts
+cp ~/.local/share/omarchy/config/omarchy.ttf ~/.local/share/fonts/
+fc-cache

install/packaging/lazyvim.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if ! command -v nvim &>/dev/null || [ ! -d "$HOME/.config/nvim" ]; then
-  yay -S --noconfirm --needed nvim luarocks tree-sitter-cli
-
-  # Install LazyVim
-  rm -rf ~/.config/nvim
+if [[ ! -d "$HOME/.config/nvim" ]]; then
   git clone https://github.com/LazyVim/starter ~/.config/nvim
   cp -R ~/.local/share/omarchy/config/nvim/* ~/.config/nvim/
   rm -rf ~/.config/nvim/.git

install/packaging/tuis.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/qdirstat.png
+omarchy-tui-install "Docker" "lazydocker" tile https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/docker.png

install/packaging/webapps.sh

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

install/preflight/chroot.sh

@@ -1,8 +1,4 @@
-# Chroot installations have some differences
-if ! cmp -s /proc/1/root/ / 2>/dev/null; then
-  export OMARCHY_CHROOT_INSTALL=1
-fi
-
+# Starting the installer with OMARCHY_CHROOT_INSTALL=1 will put it into chroot mode
 chrootable_systemctl_enable() {
   if [ -n "${OMARCHY_CHROOT_INSTALL:-}" ]; then
     sudo systemctl enable $1

install/preflight/first-run-mode.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Set first-run mode marker so we can install stuff post-installation
+mkdir -p ~/.local/state/omarchy
+touch ~/.local/state/omarchy/first-run.mode
+
+# Setup sudo-less access for first-run
+sudo tee /etc/sudoers.d/first-run >/dev/null <<EOF
+Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
+$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw
+$USER ALL=(ALL) NOPASSWD: /usr/bin/ufw-docker
+$USER ALL=(ALL) NOPASSWD: FIRST_RUN_CLEANUP
+EOF
+sudo chmod 440 /etc/sudoers.d/first-run

install/preflight/guard.sh

@@ -15,7 +15,7 @@ for marker in /etc/cachyos-release /etc/eos-release /etc/garuda-release /etc/man
 done
 
 # Must not be running as root
-[ "$EUID" -eq 0 ] && abort "Running as user (not root)"
+[ "$EUID" -eq 0 ] && abort "Running as root (not user)"
 
 # Must be x86 only to fully work
 [ "$(uname -m)" != "x86_64" ] && abort "x86_64 CPU"

install/preflight/gum.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo pacman -S --noconfirm --needed gum

install/preflight/migrations.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-omarchy_migrations_state_path=~/.local/state/omarchy/migrations
-mkdir -p $omarchy_migrations_state_path
+OMARCHY_MIGRATIONS_STATE_PATH=~/.local/state/omarchy/migrations
+mkdir -p $OMARCHY_MIGRATIONS_STATE_PATH
 
 for file in ~/.local/share/omarchy/migrations/*.sh; do
-  touch "$omarchy_migrations_state_path/$(basename "$file")"
+  touch "$OMARCHY_MIGRATIONS_STATE_PATH/$(basename "$file")"
 done

install/preflight/mirrorlist.sh

@@ -1,8 +0,0 @@
-# Set mirror to single geo setup
-echo 'Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch' |
-  sudo tee /etc/pacman.d/mirrorlist >/dev/null
-
-# Update indexes if online
-if ping -c5 omarchy.org &>/dev/null; then
-  sudo pacman -Syy
-fi

install/preflight/repositories.sh

@@ -3,8 +3,22 @@
 # Install build tools
 sudo pacman -Sy --needed --noconfirm base-devel
 
+# Add fun and color and verbosity to the pacman installer
+if ! grep -q "ILoveCandy" /etc/pacman.conf; then
+  sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
+fi
+
+# Add the Omarchy repository as first choice
+if ! grep -q "omarchy" /etc/pacman.conf; then
+  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf
+fi
+
+# Set mirrors to global ones only
+echo -e "Server = https://geo.mirror.pkgbuild.com/\$repo/os/\$arch\nServer = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch" |
+  sudo tee /etc/pacman.d/mirrorlist >/dev/null
+
 # Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
-if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v yay &>/dev/null; then
+if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
   # Try installing Chaotic-AUR keyring and mirrorlist
   if ! pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1 &&
     sudo pacman-key --recv-key 3056513887B78AEB &&
@@ -17,26 +31,15 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v
       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
+    # Refresh all repos
+    sudo pacman -Sy
   else
-    echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
+    echo -e "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
-  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 and verbosity to the pacman installer
-if ! grep -q "ILoveCandy" /etc/pacman.conf; then
-  sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf
-fi
+# Allow repository index updates without sudo
+sudo tee /etc/sudoers.d/repositories >/dev/null <<EOF
+$USER ALL=(ALL) NOPASSWD: /usr/binpacman -Sy
+EOF
+sudo chmod 440 /etc/sudoers.d/repositories

install/preflight/show-env.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo "Installation ENV:"
+env | grep -E "^(OMARCHY_CHROOT_INSTALL|OMARCHY_USER_NAME|OMARCHY_USER_EMAIL|USER|HOME|OMARCHY_REPO|OMARCHY_REF)="

install/preflight/trap-errors.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Give people a chance to retry running the installation
+catch_errors() {
+  echo -e "\n\e[31mOmarchy installation failed!\e[0m"
+  echo
+  echo "This command halted with exit code $?:"
+  echo "$BASH_COMMAND"
+  echo
+  echo "Get help from the community via QR code or at https://discord.gg/tXFUdasqhY"
+  echo "                                 "
+  echo "    █▀▀▀▀▀█ ▄ ▄ ▀▄▄▄█ █▀▀▀▀▀█    "
+  echo "    █ ███ █ ▄▄▄▄▀▄▀▄▀ █ ███ █    "
+  echo "    █ ▀▀▀ █ ▄█  ▄█▄▄▀ █ ▀▀▀ █    "
+  echo "    ▀▀▀▀▀▀▀ ▀▄█ █ █ █ ▀▀▀▀▀▀▀    "
+  echo "    ▀▀█▀▀▄▀▀▀▀▄█▀▀█  ▀ █ ▀ █     "
+  echo "    █▄█ ▄▄▀▄▄ ▀ ▄ ▀█▄▄▄▄ ▀ ▀█    "
+  echo "    ▄ ▄▀█ ▀▄▀▀▀▄ ▄█▀▄█▀▄▀▄▀█▀    "
+  echo "    █ ▄▄█▄▀▄█ ▄▄▄  ▀ ▄▀██▀ ▀█    "
+  echo "    ▀ ▀   ▀ █ ▀▄  ▀▀█▀▀▀█▄▀      "
+  echo "    █▀▀▀▀▀█ ▀█  ▄▀▀ █ ▀ █▄▀██    "
+  echo "    █ ███ █ █▀▄▄▀ █▀███▀█▄██▄    "
+  echo "    █ ▀▀▀ █ ██  ▀ █▄█ ▄▄▄█▀ █    "
+  echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
+  echo "                                 "
+
+  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
+}
+
+trap catch_errors ERR