Revert "Quick fix for lazyvim bufferline error when using catppuccin (#1084)"

This reverts commit b6896bd58f.

bin/omarchy-battery-monitor

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

bin/omarchy-cmd-missing

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

bin/omarchy-cmd-present

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

bin/omarchy-cmd-screensaver

@@ -1,5 +1,13 @@
 #!/bin/bash
 
+function exit_screensaver {
+  pkill -x tte 2>/dev/null
+  pkill -f "alacritty --class Screensaver" 2>/dev/null
+  exit 0
+}
+
+trap exit_screensaver SIGINT SIGTERM SIGHUP SIGQUIT
+
 while true; do
   effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
   tte -i ~/.config/omarchy/branding/screensaver.txt \
@@ -7,10 +15,8 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 0.01; then
+    if read -n 1 -t 2; then
-      pkill -x tte 2>/dev/null
+      exit_screensaver
-      pkill -f "alacritty --class Screensaver" 2>/dev/null
-      exit 0
     fi
   done
 done

bin/omarchy-install-docker-dbs

@@ -13,4 +13,6 @@ if [[ -n "$choices" ]]; then
     MongoDB) sudo docker run -d --restart unless-stopped -p "127.0.0.1:27017:27017" --name mongodb -e MONGO_INITDB_ROOT_USERNAME=admin -e MONGO_INITDB_ROOT_PASSWORD=admin123 mongo:noble ;;
     esac
   done
+else
+  echo "No databases selected for installation."
 fi

bin/omarchy-menu

@@ -208,22 +208,30 @@ show_install_service_menu() {
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix") in
+  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
   *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" ;;
+  *Emacs*) install "Emacs" "emacs-wayland" && systemctl --user enable --now emacs.service ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_ai_menu() {
-  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
+  ollama_pkg=$(
+    (command -v nvidia-smi &>/dev/null && echo ollama-cuda) ||
+      (command -v rocminfo &>/dev/null && echo ollama-rocm) ||
+      echo ollama
+  )
+
+  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
   *Claude*) aur_install "Claude Code" "claude-code" ;;
+  *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
   *Studio*) aur_install "LM Studio" "lmstudio" ;;
-  *Ollama*) install "Ollama" "ollama" ;;
+  *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) aur_install "Crush" "crush-bin" ;;
   *opencode*) aur_install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;

bin/omarchy-migrate

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

bin/omarchy-pkg-add

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

bin/omarchy-pkg-drop

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

bin/omarchy-pkg-missing

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

bin/omarchy-pkg-present

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

bin/omarchy-update-system-pkgs

@@ -6,8 +6,8 @@ sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
 
 if omarchy-pkg-aur-accessible; then
   echo -e "\e[32m\nUpdate AUR packages\e[0m"
-  echo "yay -Syu --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
+  echo "yay -Sua --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
-  yay -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
+  yay -Sua --noconfirm --ignore "$(omarchy-pkg-ignored)"
   echo
 else
   echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"

config/alacritty/alacritty.toml

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

config/fastfetch/config.jsonc

@@ -126,13 +126,13 @@
     },
     {
       "type": "command",
-      "key": "  OS Age ",
+      "key": "󱦟 OS Age",
       "keyColor": "magenta",
       "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
     },
     {
       "type": "uptime",
-      "key": "  Uptime ",
+      "key": "󱫐 Uptime",
       "keyColor": "magenta"
     },
     {

config/hypr/bindings.conf

@@ -25,5 +25,5 @@ bindd = SUPER, X, X, exec, omarchy-launch-webapp "https://x.com/"
 bindd = SUPER SHIFT, X, X Post, exec, omarchy-launch-webapp "https://x.com/compose/post"
 
 # Overwrite existing bindings, like putting Omarchy Menu on Super + Space
-# unbind = SUPER, Space
+# unbind = SUPER, SPACE
 # bindd = SUPER, SPACE, Omarchy menu, exec, omarchy-menu

default/bash/aliases

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

default/bash/functions

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

default/hypr/apps/jetbrains.conf

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

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

default/hypr/windows.conf

@@ -7,5 +7,8 @@ windowrule = opacity 0.97 0.9, class:.*
 # Fix some dragging issues with XWayland
 windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
 
+# Prevent screensaver/lock while running apps fullscreen
+windowrule = idleinhibit fullscreen, class:.*
+
 # App-specific tweaks
 source = ~/.local/share/omarchy/default/hypr/apps.conf

install/config/theme.sh

@@ -4,6 +4,11 @@ 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"
 
+# Set links for Nautilius action icons
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+sudo gtk-update-icon-cache /usr/share/icons/Yaru
+
 # Setup theme links
 mkdir -p ~/.config/omarchy/themes
 for f in ~/.local/share/omarchy/themes/*; do ln -nfs "$f" ~/.config/omarchy/themes/; done

install/packages.sh

@@ -34,6 +34,7 @@ sudo pacman -S --noconfirm --needed \
   gnome-themes-extra \
   gum \
   gvfs-mtp \
+  gvfs-smb \
   hypridle \
   hyprland \
   hyprland-qtutils \
@@ -96,7 +97,7 @@ sudo pacman -S --noconfirm --needed \
   tree-sitter-cli \
   ttf-cascadia-mono-nerd \
   ttf-ia-writer \
-  ttf-jetbrains-mono \
+  ttf-jetbrains-mono-nerd \
   typora \
   tzupdate \
   ufw \

install/preflight/repositories.sh

@@ -10,30 +10,20 @@ fi
 
 # Add the Omarchy repository
 if ! grep -q "omarchy" /etc/pacman.conf; then
-  echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null
+  sudo tee -a /etc/pacman.conf >/dev/null <<'EOF'
+
+[omarchy]
+SigLevel = Optional TrustAll
+Server = https://pkgs.omarchy.org/$arch
+EOF
 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 <<'EOF'
-  sudo tee /etc/pacman.d/mirrorlist >/dev/null
+Server = https://mirror.omarchy.org/$repo/os/$arch
-
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
-# Only add Chaotic-AUR if the architecture is x86_64 so ARM users can build the packages
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ]; then
+EOF
-  # 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
-  else
-    echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
 
 # Refresh all repos
 sudo pacman -Syu --noconfirm

migrations/1751134561.sh

@@ -1,7 +1,7 @@
 echo "Add Omarchy Package Repository"
 
 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
+  sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\n' /etc/pacman.conf
   sudo systemctl restart systemd-timesyncd
   sudo pacman -Syu --noconfirm
 fi

migrations/1751135253.sh

@@ -1,5 +1,3 @@
 echo "Add missing installation of bat (used by the ff alias)"
-if ! command -v bat &>/dev/null; then
+
-  # Add missing installation of bat
+omarchy-pkg-add bat
-  sudo pacman -S --noconfirm --needed bat
-fi

migrations/1751510848.sh

@@ -1,5 +1,3 @@
 echo "Installing missing fd terminal tool for finding files"
 
-if ! command -v fd &>/dev/null; then
+omarchy-pkg-add fd
-  sudo pacman -S --noconfirm --needed fd
-fi

migrations/1751667620.sh

@@ -1,8 +1,9 @@
 echo "Switching from vlc to mpv for the default video player"
-if ! command -v mpv &>/dev/null; then
+if omarchy-cmd-missing mpv; then
-  sudo pacman -Rns --noconfirm vlc
+  omarchy-pkg-drop vlc
   rm ~/.local/share/applications/vlc.desktop
-  sudo pacman -S --noconfirm mpv
+
+  omarchy-pkg-add mpv
   xdg-mime default mpv.desktop video/mp4
   xdg-mime default mpv.desktop video/x-msvideo
   xdg-mime default mpv.desktop video/x-matroska

migrations/1751672984.sh

@@ -1,5 +1,3 @@
 echo "Add LocalSend as new default application"
 
-if ! command -v localsend &>/dev/null; then
+omarchy-pkg-add localsend
-  sudo pacman -S --noconfirm --needed localsend
-fi

migrations/1751679069.sh

@@ -1,5 +1,3 @@
 echo "Install ffmpegthumbnailer for video thumbnails in the file manager"
 
-if ! command -v ffmpegthumbnailer &>/dev/null; then
+omarchy-pkg-add ffmpegthumbnailer
-  sudo pacman -S --noconfirm --needed ffmpegthumbnailer
-fi

migrations/1751821819.sh

@@ -1,5 +1,3 @@
 echo "Install bash-completion"
 
-if ! pacman -Q bash-completion &>/dev/null; then
+omarchy-pkg-add bash-completion
-  sudo pacman -S --noconfirm --needed bash-completion
-fi

migrations/1751887718.sh

@@ -1,6 +1,6 @@
 echo "Install Impala as new wifi selection TUI"
-if ! command -v impala &>/dev/null; then
+
-  sudo pacman -S --noconfirm --needed impala
+if omarchy-cmd-missing impala; then
-  echo "You need to update the Waybar config to use Impala Wi-Fi selector in top bar."
+  omarchy-pkg-add impala
   omarchy-refresh-waybar
 fi

migrations/1752081088.sh

@@ -1,2 +1,3 @@
 echo "Permanently fix F-keys on Apple-mode keyboards (like Lofree Flow84)"
-source ~/.local/share/omarchy/install/config/hardware/fix-fkeys.sh
+
+source $OMARCHY_PATH/install/config/hardware/fix-fkeys.sh

migrations/1752082381.sh

@@ -1,5 +1,3 @@
 echo "Adding gnome-keyring to make 1password work with 2FA codes"
 
-if ! command -v gnome-keyring &>/dev/null; then
+omarchy-pkg-add gnome-keyring
-  sudo pacman -S --noconfirm --needed gnome-keyring
-fi

migrations/1752091783.sh

@@ -1,4 +1,4 @@
 echo "Install Plymouth splash screen"
 
-sudo pacman -S --needed --noconfirm uwsm plymouth
+omarchy-pkg-add uwsm plymouth
-source "$HOME/.local/share/omarchy/install/login/plymouth.sh"
+source "$OMARCHY_PATH/install/login/plymouth.sh"

migrations/1752104271.sh

@@ -1,4 +1,5 @@
 echo "Switching to polkit-gnome for better fingerprint authentication compatibility"
+
 if ! command -v /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &>/dev/null; then
   sudo pacman -S --noconfirm --needed polkit-gnome
   systemctl --user stop hyprpolkitagent

migrations/1752153188.sh

@@ -1,4 +1,5 @@
 echo "Migrate to the modular implementation of hyprlock"
+
 if [ -L ~/.config/hypr/hyprlock.conf ]; then
   rm ~/.config/hypr/hyprlock.conf
   cp ~/.local/share/omarchy/config/hypr/hyprlock.conf ~/.config/hypr/hyprlock.conf

migrations/1752188554.sh

@@ -1,7 +1,5 @@
 echo "Update chromium.desktop to ensure we are always using wayland"
-if [[ ! -f ~/.local/share/applications/chromium.desktop ]]; then
+
-  cp ~/.local/share/omarchy/applications/chromium.desktop ~/.local/share/applications/
+xdg-settings set default-web-browser chromium.desktop
-  xdg-settings set default-web-browser chromium.desktop
+xdg-mime default chromium.desktop x-scheme-handler/http
-  xdg-mime default chromium.desktop x-scheme-handler/http
+xdg-mime default chromium.desktop x-scheme-handler/https
-  xdg-mime default chromium.desktop x-scheme-handler/https
-fi

migrations/1752251002.sh

@@ -1,4 +1,5 @@
 echo "Migrate to the modular, variable-based implementation of waybar style.css"
+
 if [ -L ~/.config/waybar/style.css ]; then
   rm ~/.config/waybar/style.css
   cp ~/.local/share/omarchy/config/waybar/style.css ~/.config/waybar/style.css

migrations/1752292967.sh

@@ -1,5 +1,6 @@
 echo "Update to use UWSM and seamless login"
-if ! command -v uwsm &>/dev/null; then
+
+if omarchy-cmd-missing uwsm; then
   sudo rm -f /etc/systemd/system/getty@tty1.service.d/override.conf
   sudo rmdir /etc/systemd/system/getty@tty1.service.d/ 2>/dev/null || true
 
@@ -14,5 +15,5 @@ if ! command -v uwsm &>/dev/null; then
     sed -i 's/^GTK_IM_MODULE=fcitx$//' "$HOME/.config/environment.d/fcitx.conf"
   fi
 
-  source ~/.local/share/omarchy/install/login/plymouth.sh
+  source $OMARCHY_PATH/install/login/plymouth.sh
 fi

migrations/1752543801.sh

@@ -1,3 +1,4 @@
 echo "Add color and animation to pacman installs"
+
 grep -q '^Color' /etc/pacman.conf || sudo sed -i '/^\[options\]/a Color' /etc/pacman.conf
 grep -q '^ILoveCandy' /etc/pacman.conf || sudo sed -i '/^\[options\]/a ILoveCandy' /etc/pacman.conf

migrations/1752678932.sh

@@ -1,5 +1,3 @@
 echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility"
 
-if ! docker buildx version &>/dev/null; then
+omarchy-pkg-add docker-buildx
-  sudo pacman -S --noconfirm --needed docker-buildx
-fi

migrations/1752725616.sh

@@ -1,4 +1,5 @@
 echo "Make light themes possible"
+
 if [[ -f ~/.local/share/applications/blueberry.desktop ]]; then
   rm -f ~/.local/share/applications/blueberry.desktop
   rm -f ~/.local/share/applications/org.pulseaudio.pavucontrol.desktop

migrations/1752793122.sh

@@ -1,4 +1,5 @@
 echo "Rename waybar config file for syntax highlighting"
+
 if [[ -f ~/.config/waybar/config ]]; then
   mv ~/.config/waybar/config ~/.config/waybar/config.jsonc
 fi

migrations/1752797704.sh

@@ -1,4 +1,5 @@
 echo "Prevent docker from requiring network readiness on boot"
+
 if [[ ! -f /etc/systemd/system/docker.service.d/no-block-boot.conf ]]; then
   sudo mkdir -p /etc/systemd/system/docker.service.d/
   sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF'

migrations/1752874371.sh

@@ -1,4 +1,5 @@
 echo "Add Catppuccin Latte light theme"
+
 if [[ ! -L "~/.config/omarchy/themes/catppuccin-latte" ]]; then
   ln -snf ~/.local/share/omarchy/themes/catppuccin-latte ~/.config/omarchy/themes/
 fi

migrations/1752885858.sh

@@ -1,5 +1,3 @@
 echo "Install slurp + wl-screenrec for new ALT+PrintScreen screen recorder"
 
-if ! command -v wl-screenrec &>/dev/null || ! command -v slurp &>/dev/null; then
+omarchy-pkg-add slurp wl-screenrec
-  sudo pacman -S --noconfirm --needed slurp wl-screenrec
-fi

migrations/1752896442.sh

@@ -1,9 +1,8 @@
 echo "Replace volume control GUI with a TUI"
 
-if ! command -v wiremix &>/dev/null; then
+if omarchy-cmd-missing wiremix; then
-  sudo pacman -S --noconfirm --needed wiremix
+  omarchy-pkg-add wiremix
-  sudo pacman -Rns --noconfirm pavucontrol
+  omarchy-pkg-drop pavucontrol
-
   omarchy-refresh-applications
   omarchy-refresh-waybar
 fi

migrations/1752897642.sh

@@ -1,4 +1,3 @@
 echo "Remove needless fcitx5-configtool package"
-if pacman -Qe fcitx5-configtool &>/dev/null; then
+
-  sudo pacman -Rns --noconfirm fcitx5-configtool
+omarchy-pkg-drop fcitx5-configtool
-fi

migrations/1752899588.sh

@@ -1,2 +1,3 @@
 echo "Update .config/hypr/hyprlock.conf to include failed attempt counter"
+
 omarchy-refresh-hyprlock

migrations/1752955912.sh

@@ -1,5 +1,3 @@
 echo "Install satty for the new screenshot flow"
 
-if ! command -v satty &>/dev/null; then
+omarchy-pkg-add satty
-  sudo pacman -S --noconfirm --needed satty
-fi

migrations/1752981883.sh

@@ -1,9 +1,9 @@
 echo "Replace wofi with walker as the default launcher"
 
-if ! command -v walker &>/dev/null; then
+if omarchy-cmd-missing walker; then
-  sudo pacman -S --noconfirm --needed walker-bin libqalculate
+  omarchy-pkg-add walker-bin libqalculate
 
-  sudo pacman -Rns --noconfirm wofi
+  omarchy-pkg-drop wofi
   rm -rf ~/.config/wofi
 
   mkdir -p ~/.config/walker

migrations/1753138691.sh

@@ -1,6 +1,6 @@
 echo "Install swayOSD to show volume status"
 
-if ! command -v swayosd-server &>/dev/null; then
+if omarchy-cmd-missing swayosd-server; then
-  sudo pacman -S --noconfirm --needed swayosd
+  omarchy-pkg-add swayosd
   setsid uwsm app -- swayosd-server &>/dev/null &
 fi

migrations/1753176520.sh

@@ -1,7 +1,3 @@
 echo "Install wf-recorder for screen recording for nvidia"
 
-if lspci | grep -qi 'nvidia'; then
+omarchy-pkg-add wf-recorder
-  if ! command -v wf-recorder &>/dev/null; then
-    sudo pacman -S --noconfirm --needed wf-recorder
-  fi
-fi

migrations/1753352057.sh

@@ -1,18 +0,0 @@
-echo "Add Chaotic-AUR to get compiled binaries"
-
-if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.conf; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if 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
-    echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-
-    # Refresh pacman package databases
-    sudo pacman -Syu --noconfirm
-  else
-    echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi

migrations/1753468218.sh

@@ -1,5 +0,0 @@
-echo "Add Terminal Text Effects for rizzing Omarchy"
-
-if ! pacman -Q python-terminaltexteffects &>/dev/null; then
-  sudo pacman -S --noconfirm python-terminaltexteffects
-fi

migrations/1753495989.sh

@@ -1,5 +1,6 @@
 echo "Allow updating of timezone by right-clicking on the clock (or running omarchy-cmd-tzupdate)"
-if ! command -v tzupdate &>/dev/null; then
+
-  bash ~/.local/share/omarchy/install/config/timezones.sh
+if omarchy-cmd-missing tzupdate; then
+  $OMARCHY_PATH/install/config/timezones.sh
   omarchy-refresh-waybar
 fi

migrations/1753558374.sh

@@ -1,4 +0,0 @@
-echo "Update Walker config to include = as the leader key for the calculator"
-if ! grep -q 'prefix = "="' ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi

migrations/1753998861.sh

@@ -1,4 +0,0 @@
-echo "Update Walker config to include . as the leader key for the finder"
-if ! grep -q 'prefix = "\."' ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi

migrations/1754208139.sh

@@ -1,5 +0,0 @@
-echo "Ensure screensaver doesn't start while the computer is locked"
-
-if ! grep -q "pidof hyprlock || omarchy-launch-screensaver" ~/.config/hypr/hypridle.conf; then
-  omarchy-refresh-hypridle
-fi

migrations/1754215439.sh

@@ -1,5 +0,0 @@
-echo "Update app launcher config to allow enough entries to show all keybindings on SUPER+K"
-
-if ! grep "max_entries = 200" ~/.config/walker/config.toml; then
-  omarchy-refresh-walker
-fi

migrations/1754215533.sh

@@ -1,7 +1,7 @@
 echo "Enable auto-discovery of network printers"
 
 if [[ ! -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]]; then
-  sudo pacman -S --noconfirm avahi nss-mdns
+  omarchy-pkg-add avahi nss-mdns
 
   # Disable multicast dns in resolved. Avahi will provide this for better network printer discovery
   sudo mkdir -p /etc/systemd/resolved.conf.d
@@ -10,7 +10,7 @@ if [[ ! -f /etc/systemd/resolved.conf.d/10-disable-multicast.conf ]]; then
 fi
 
 if ! grep -q '^CreateRemotePrinters Yes' /etc/cups/cups-browsed.conf; then
-  sudo pacman -S --noconfirm cups-browsed
+  omarchy-pkg-add cups-browsed
   # Enable automatically adding remote printers
   echo 'CreateRemotePrinters Yes' | sudo tee -a /etc/cups/cups-browsed.conf
   sudo systemctl enable --now cups-browsed.service

migrations/1754221967.sh

@@ -1,2 +1,3 @@
 echo "Add support for accessing Android phone data via file manager"
-sudo pacman -S --noconfirm --needed gvfs-mtp
+
+omarchy-pkg-add gvfs-mtp

migrations/1754228679.sh

@@ -1,2 +0,0 @@
-echo "Increase time before screensaver starts to 2.5 minutes (from 1 minute)"
-omarchy-refresh-hypridle

migrations/1754265453.sh

@@ -1,2 +1,3 @@
 echo "Add chromium-flags.conf"
+
 omarchy-refresh-config chromium-flags.conf

migrations/1754302123.sh

@@ -1,4 +1,5 @@
 echo "Change update-available icon in top bar from  to "
+
 if grep -q '"format": "",' ~/.config/waybar/config.jsonc; then
   sed -i 's/"format": ""/"format": ""/' ~/.config/waybar/config.jsonc
 fi

migrations/1754305112.sh

@@ -1,2 +0,0 @@
-echo "Restart Walker to pick up menu selections"
-omarchy-restart-walker

migrations/1754332200.sh

@@ -1,2 +1,3 @@
 echo "Remove old Omarchy TUI app now that we have the Omarchy Menu"
-rm -rf ~/.local/share/applications/omarchy.desktop
+
+rm -f ~/.local/share/applications/omarchy.desktop

migrations/1754509222.sh

@@ -1,3 +1,3 @@
 echo "Add xmlstarlet needed for updating fonts via Omarchy menu"
 
-sudo pacman -S --noconfirm --needed xmlstarlet
+omarchy-pkg-add xmlstarlet

migrations/1754666868.sh

@@ -1,3 +0,0 @@
-echo "Update OS icon in About from Windows to Arch"
-
-omarchy-refresh-config fastfetch/config.jsonc

migrations/1754668999.sh

@@ -1,4 +1,3 @@
 echo "Tune MTU probing for more reliable SSH"
 
-# Solve common flakiness with SSH
 echo "net.ipv4.tcp_mtu_probing=1" | sudo tee -a /etc/sysctl.d/99-sysctl.conf

migrations/1754679822.sh

@@ -1,5 +0,0 @@
-echo "Lock 1password on screen lock"
-
-if ! grep -q "omarchy-lock-screen" ~/.config/hypr/hypridle.conf; then
-  omarchy-refresh-hypridle
-fi

migrations/1754828680.sh

@@ -1,2 +0,0 @@
-echo "Update Walker config"
-omarchy-refresh-walker

migrations/1754860578.sh

@@ -1,4 +1,5 @@
 echo "Update polkit policy to yield to fingerprint and fido2"
+
 # If fprint exists in polkit, it was wrong and needs reset
 if [ -f /etc/pam.d/polkit-1 ] && grep -Fq 'pam_fprintd.so' /etc/pam.d/polkit-1; then
   sudo tee /etc/pam.d/polkit-1 >/dev/null <<'EOF'

migrations/1754929475.sh

@@ -1,4 +1,5 @@
 echo "Add start burst limit to login"
+
 if [ -f /etc/systemd/system/omarchy-seamless-login.service ]; then
   cat <<EOF | sudo tee /etc/systemd/system/omarchy-seamless-login.service
 [Unit]

migrations/1754929737.sh

@@ -1,2 +1,3 @@
 echo "Update Walker config to add 60s timeout such that it won't conflict with screensaver"
+
 omarchy-refresh-walker

migrations/1754984734.sh

@@ -1,21 +1,23 @@
 echo "Configure Docker to use the host's DNS resolver"
 
-# If the daemon configuration has been changed since we wrote it, leave it as-is
+if omarchy-cmd-present docker; then
-ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}'
+  # If the daemon configuration has been changed since we wrote it, leave it as-is
+  ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}'
 
-NEW_CONFIG='{
+  NEW_CONFIG='{
-    "log-driver": "json-file",
+      "log-driver": "json-file",
-    "log-opts": { "max-size": "10m", "max-file": "5" },
+      "log-opts": { "max-size": "10m", "max-file": "5" },
-    "dns": ["172.17.0.1"],
+      "dns": ["172.17.0.1"],
-    "bip": "172.17.0.1/16"
+      "bip": "172.17.0.1/16"
-}'
+  }'
 
-if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then
+  if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then
-  echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null
+    echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null
+  fi
+
+  # Expose systemd-resolved to our Docker network
+  echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
+
+  sudo systemctl restart systemd-resolved
+  sudo systemctl restart docker
 fi
-
-# Expose systemd-resolved to our Docker network
-echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null
-
-sudo systemctl restart systemd-resolved
-sudo systemctl restart docker

migrations/1755109182.sh

@@ -29,4 +29,3 @@ if [ -f /etc/systemd/resolved.conf ]; then
   echo "DNS configuration reset to use DHCP (router DNS)"
   echo "To use Cloudflare DNS, run: omarchy-setup-dns Cloudflare"
 fi
-

migrations/1755164105.sh

@@ -9,9 +9,9 @@ set_theme_colors() {
   fi
 }
 
-if command -v chromium &>/dev/null; then
+if omarchy-cmd-present chromium; then
-  sudo pacman -Rns --noconfirm chromium || true
+  omarchy-pkg-drop chromium
-  sudo pacman -S --noconfirm omarchy-chromium
+  omarchy-pkg-add omarchy-chromium
 
   if pgrep -x chromium; then
     if gum confirm "Chromium must be restarted. Ready?"; then

migrations/1755436367.sh

@@ -1,6 +1,6 @@
 echo "Add minimal starship prompt to terminal"
 
-if ! command -v starship &>/dev/null; then
+if omarchy-cmd-missing starship; then
-  sudo pacman -S --noconfirm starship
+  omarchy-pkg-add starship
   cp $OMARCHY_PATH/config/starship.toml ~/.config/starship.toml
 fi

migrations/1755455095.sh

@@ -1,9 +1,3 @@
 echo "Ensure TTE and dependencies are installed"
 
-if ! pacman -Q python-poetry-core &>/dev/null; then
+omarchy-pkg-add python-poetry-core python-terminaltexteffects
-  sudo pacman -S --noconfirm python-poetry-core
-fi
-
-if ! pacman -Q python-terminaltexteffects &>/dev/null; then
-  sudo pacman -S --noconfirm python-terminaltexteffects
-fi

migrations/1755459930.sh

@@ -1,5 +1,3 @@
 echo "Add potentially missing dependency for power profile controls"
 
-if ! pacman -Q python-gobject &>/dev/null; then
+omarchy-pkg-add python-gobject
-  sudo pacman -S --noconfirm python-gobject
-fi

migrations/1755512354.sh

@@ -1,3 +0,0 @@
-echo "Update fastfetch config to include current theme name and colors"
-
-omarchy-refresh-config fastfetch/config.jsonc

migrations/1755527220.sh

@@ -1,3 +0,0 @@
-echo "Turn on the screensaver by default again now that TTE has been fixed"
-
-omarchy-refresh-hypridle

migrations/1755548643.sh

@@ -1,5 +1,3 @@
 echo "Install wf-recorder for intel based device"
 
-if lspci | grep -Eqi 'nvidia|intel.*graphics'; then
+omarchy-pkg-add wf-recorder
-  sudo pacman -S --noconfirm --needed wf-recorder
-fi

migrations/1755865046.sh

@@ -1,6 +1,4 @@
 echo "Switch from lazydocker-bin to lazydocker official"
 
-if pacman -Q lazydocker-bin >/dev/null; then
+omarchy-pkg-drop lazydocker-bin
-  sudo pacman -Rns --noconfirm lazydocker-bin
+omarchy-pkg-add lazydocker
-  sudo pacman -S --noconfirm lazydocker
-fi

migrations/1755878717.sh

@@ -1,5 +0,0 @@
-echo "Ensure Docker DNS requests are not blocked by ufw firewall"
-
-sudo ufw disable
-sudo ufw allow in proto udp from 172.16.0.0/12 to 172.17.0.1 port 53 comment 'allow-docker-dns'
-sudo ufw enable

migrations/1756060611.sh

@@ -1,15 +1,13 @@
 echo "Migrate AUR packages to official repos where possible"
 
 reinstall_package_opr() {
-  if pacman -Q $1 >/dev/null; then
+  if omarchy-pkg-present $1; then
     sudo pacman -Rns --noconfirm $1
     sudo pacman -S --noconfirm ${2:-$1}
   fi
 }
 
-if pacman -Q yay-bin-debug >/dev/null; then
+omarchy-pkg-drop yay-bin-debug
-  sudo pacman -Rns --noconfirm yay-bin-debug
-fi
 
 reinstall_package_opr yay-bin yay
 reinstall_package_opr obsidian-bin obsidian

migrations/1756062808.sh

@@ -1,2 +0,0 @@
-echo "Update Hypridle to prevent flash of unlocked screen after sleep"
-omarchy-refresh-hypridle

migrations/1756115364.sh

@@ -1,6 +1,6 @@
 echo "Replace buggy native Zoom client with webapp"
 
-if pacman -Q zoom >/dev/null; then
+if omarchy-pkg-present zoom; then
-  sudo pacman -Rns --noconfirm zoom
+  omarchy-pkg-drop zoom
   omarchy-webapp-install "Zoom" https://app.zoom.us/wc/home https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/png/zoom.png
 fi

migrations/1756205202.sh

@@ -0,0 +1,7 @@
+echo "Symlink files needed for Nautilus navigation icons"
+
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-previous-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-previous-symbolic.svg
+sudo ln -snf /usr/share/icons/Adwaita/symbolic/actions/go-next-symbolic.svg /usr/share/icons/Yaru/scalable/actions/go-next-symbolic.svg
+sudo gtk-update-icon-cache /usr/share/icons/Yaru
+pkill -x nautilus || true
+

migrations/1756208867.sh

@@ -1,3 +0,0 @@
-echo "Update fastfetch config"
-
-omarchy-refresh-config fastfetch/config.jsonc

migrations/1756284863.sh

@@ -1,3 +0,0 @@
-echo "Pin abseil-cpp as the latest package is broken"
-
-sudo pacman -U --noconfirm https://archive.archlinux.org/packages/u/uwsm/uwsm-0.23.0-1-any.pkg.tar.zst

migrations/1756360551.sh

@@ -1,6 +0,0 @@
-echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
-
-sudo cp /etc/pacman.conf /etc/pacman.conf.bak
-sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
-sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
-  sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/" >> /etc/pacman.conf'

migrations/1756360552.sh

@@ -0,0 +1,7 @@
+echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
+
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/,+2 d' /etc/pacman.conf
+sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch" >> /etc/pacman.conf'
+sudo pacman -Syu --noconfirm

migrations/1756363651.sh

@@ -1,3 +0,0 @@
-echo "Update About config to include the Omarchy branch name"
-
-omarchy-refresh-fastfetch

migrations/1756365707.sh

@@ -1,4 +0,0 @@
-# FIXME: This really shouldn't happen, need to find out why!
-echo "Ensure walker is present"
-
-sudo pacman -Syu --needed --noconfirm walker-bin

migrations/1756410649.sh

@@ -0,0 +1,7 @@
+echo "Remove any Chaotic-AUR infrastructure packages"
+
+omarchy-pkg-drop chaotic-keyring chaotic-mirrorlist
+
+if sudo pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1; then
+  sudo pacman-key --delete 3056513887B78AEB
+fi

migrations/1756411333.sh

@@ -0,0 +1,7 @@
+echo "Use new Omarchy mirror as default"
+
+sudo tee /etc/pacman.d/mirrorlist >/dev/null <<'EOF'
+Server = https://mirror.omarchy.org/$repo/os/$arch
+Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch
+EOF

migrations/1756411865.sh

@@ -0,0 +1,3 @@
+echo "Add back ttf-ia-writer if it was missing"
+
+omarchy-pkg-add ttf-ia-writer

migrations/1756491748.sh

@@ -0,0 +1,6 @@
+echo "Removing UseDNS=no from network files to fix DNS issue"
+
+for file in /etc/systemd/network/*.network; do
+  [[ -f "$file" ]] || continue
+  sudo sed -i '/^UseDNS=no/d' "$file"
+done