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

This reverts commit b6896bd58f.

bin/omarchy-cmd-screensaver

@@ -15,7 +15,7 @@ while true; do
     "$effect" &
 
   while pgrep -x tte >/dev/null; do
-    if read -n 1 -t 3; then
+    if read -n 1 -t 2; then
       exit_screensaver
     fi
   done

bin/omarchy-install-dev-env

@@ -75,7 +75,7 @@ laravel)
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  omarchy-pkg-add symfony-cli
+  yay -S symfony-cli --noconfirm
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)

bin/omarchy-install-dropbox

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-echo "Installing all dependencies..."
+# FIXME: Should not use AUR dependencies when we can avoid it
-omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+echo "Installing all dependencies [from AUR]..."
+yay -S --noconfirm --needed \
+  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &

bin/omarchy-menu

@@ -200,18 +200,17 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
+  case $(menu "Install" "  Dropbox\n  Tailscale") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
-  *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
   *) show_install_menu ;;
   esac
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") 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*) 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" ;;
@@ -227,14 +226,14 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  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*) install "Claude Code" "claude-code" ;;
+  *Claude*) aur_install "Claude Code" "claude-code" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
-  *Studio*) install "LM Studio" "lmstudio" ;;
+  *Studio*) aur_install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
-  *Crush*) install "Crush" "crush-bin" ;;
+  *Crush*) aur_install "Crush" "crush-bin" ;;
-  *opencode*) install "opencode" "opencode-bin" ;;
+  *opencode*) aur_install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;
   esac
 }
@@ -324,12 +323,11 @@ show_remove_menu() {
 }
 
 show_update_menu() {
-  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n󰇅  Hardware\n  Timezone") in
+  case $(menu "Update" " Omarchy\n  Config\n󰸌  Themes\n  Process\n  Timezone") in
   *Omarchy*) present_terminal omarchy-update ;;
   *Config*) show_update_config_menu ;;
   *Themes*) present_terminal omarchy-theme-update ;;
   *Process*) show_update_process_menu ;;
-  *Hardware*) show_update_hardware_menu ;;
   *Timezone*) omarchy-cmd-tzupdate ;;
   *) show_main_menu ;;
   esac
@@ -342,7 +340,7 @@ show_update_process_menu() {
   *Swayosd*) omarchy-restart-swayosd ;;
   *Walker*) omarchy-restart-walker ;;
   *Waybar*) omarchy-restart-waybar ;;
-  *) show_update_menu ;;
+  *) show_main_menu ;;
   esac
 }
 
@@ -356,15 +354,7 @@ show_update_config_menu() {
   *Swayosd*) present_terminal omarchy-refresh-swayosd ;;
   *Walker*) present_terminal omarchy-refresh-walker ;;
   *Waybar*) present_terminal omarchy-refresh-waybar ;;
-  *) show_update_menu ;;
+  *) show_main_menu ;;
-  esac
-}
-
-show_update_hardware_menu() {
-  case $(menu "Restart" "󱚾  Wi-Fi\n󰂯  Bluetooth") in
-  *Wi-Fi*) present_terminal omarchy-restart-wifi ;;
-  *Bluetooth*) present_terminal omarchy-restart-bluetooth ;;
-  *) show_update_menu ;;
   esac
 }
 

bin/omarchy-pkg-add

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

bin/omarchy-refresh-pacman-mirrorlist

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist

bin/omarchy-restart-bluetooth

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

bin/omarchy-restart-wifi

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

bin/omarchy-update-system-pkgs

@@ -1,25 +1,18 @@
 #!/bin/bash
 
-# Used in package emergencies if a bad package has been pushed and we can't revoke.
-# Requires manually installing the good package using sudo pacman -U <url>
-ignored_packages=$(omarchy-pkg-ignored)
-
 echo -e "\e[32m\nUpdate system packages\e[0m"
-[[ -n $ignored_packages ]] && echo "sudo pacman -Syu --noconfirm --ignore \"$ignored_packages\""
+echo "sudo pacman -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\""
-sudo pacman -Syu --noconfirm --ignore "$ignored_packages"
+sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)"
 
-# Update AUR packages if any are installed
-if pacman -Qem >/dev/null; then
 if omarchy-pkg-aur-accessible; then
   echo -e "\e[32m\nUpdate AUR packages\e[0m"
-    [[ -n $ignored_packages ]] && echo "yay -Sua --noconfirm  --ignore \"$ignored_packages\""
+  echo "yay -Sua --noconfirm  --ignore \"$(omarchy-pkg-ignored)\""
-    yay -Sua --noconfirm --ignore "$ignored_packages"
+  yay -Sua --noconfirm --ignore "$(omarchy-pkg-ignored)"
   echo
 else
   echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m"
   echo
 fi
-fi
 
 orphans=$(pacman -Qtdq)
 if [[ -n $orphans ]]; then

default/hypr/apps.conf

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

default/hypr/apps/bitwarden.conf

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

default/hypr/apps/qemu.conf

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

default/hypr/apps/retroarch.conf

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

default/hypr/apps/steam.conf

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

default/hypr/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

default/pacman/mirrorlist

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

default/pacman/pacman.conf

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

install.sh

@@ -3,21 +3,21 @@
 # Exit immediately if a command exits with a non-zero status
 set -eE
 
-OMARCHY_PATH="$HOME/.local/share/omarchy"
+export PATH="$HOME/.local/share/omarchy/bin:$PATH"
-OMARCHY_INSTALL="$OMARCHY_PATH/install"
+OMARCHY_INSTALL=~/.local/share/omarchy/install
-export PATH="$OMARCHY_PATH/bin:$PATH"
 
 # 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/chroot.sh
-source $OMARCHY_INSTALL/preflight/pacman.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
@@ -39,7 +39,6 @@ source $OMARCHY_INSTALL/config/mise-ruby.sh
 source $OMARCHY_INSTALL/config/docker.sh
 source $OMARCHY_INSTALL/config/mimetypes.sh
 source $OMARCHY_INSTALL/config/localdb.sh
-source $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
 source $OMARCHY_INSTALL/config/hardware/network.sh
 source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh
 source $OMARCHY_INSTALL/config/hardware/bluetooth.sh
@@ -47,12 +46,22 @@ source $OMARCHY_INSTALL/config/hardware/printer.sh
 source $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 source $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 source $OMARCHY_INSTALL/config/hardware/nvidia.sh
-source $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
 
 # Login
 source $OMARCHY_INSTALL/login/plymouth.sh
 source $OMARCHY_INSTALL/login/limine-snapper.sh
 source $OMARCHY_INSTALL/login/alt-bootloaders.sh
 
-# Finishing
+# Reboot
-source $OMARCHY_INSTALL/reboot.sh
+clear
+tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
+echo
+echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
+
+if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
+  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
+  echo -e "\nRemember to remove USB installer!\n\n"
+fi
+
+sleep 5
+reboot

install/config/hardware/fix-f13-amd-audio-input.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-AMD_AUDIO_CARD=$(pactl list cards | grep -B20 "Family 17h/19h" | grep "Name: " | awk '{print $2}')
-
-if [[ -n $AMD_AUDIO_CARD ]]; then
-  pactl set-card-profile "$AMD_AUDIO_CARD" "HiFi (Mic1, Mic2, Speaker)" 2>/dev/null || true
-fi

install/config/hardware/network.sh

@@ -1,7 +1,11 @@
 #!/bin/bash
 
-# Ensure iwd service will be started
+# Install iwd explicitly if it wasn't included in archinstall
+# This can happen if archinstall used ethernet
+if ! command -v iwctl &>/dev/null; then
+  sudo pacman -S --noconfirm --needed iwd
   sudo systemctl enable iwd.service
+fi
 
 # Prevent systemd-networkd-wait-online timeout on boot
 sudo systemctl disable systemd-networkd-wait-online.service

install/config/sudoless-asdcontrol.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Setup sudo-less controls for controlling brightness on Apple Displays
-echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
-sudo chmod 440 /etc/sudoers.d/asdcontrol

install/packages.sh

@@ -1,9 +1,6 @@
-#!/bin/bash
-
 sudo pacman -S --noconfirm --needed \
   1password-beta \
   1password-cli \
-  asdcontrol-git \
   alacritty \
   avahi \
   bash-completion \
@@ -29,7 +26,6 @@ sudo pacman -S --noconfirm --needed \
   fcitx5-qt \
   fd \
   ffmpegthumbnailer \
-  fontconfig \
   fzf \
   gcc14 \
   github-cli \
@@ -50,7 +46,6 @@ sudo pacman -S --noconfirm --needed \
   impala \
   imv \
   inetutils \
-  iwd \
   jq \
   kdenlive \
   kvantum-qt5 \
@@ -88,7 +83,6 @@ sudo pacman -S --noconfirm --needed \
   python-gobject \
   python-poetry-core \
   python-terminaltexteffects \
-  qt5-wayland \
   ripgrep \
   satty \
   signal-desktop \

install/packaging/asdcontrol.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Install asdcontrol for controlling brightness on Apple Displays
+if ! command -v asdcontrol &>/dev/null; then
+  git clone https://github.com/nikosdion/asdcontrol.git /tmp/asdcontrol
+  cd /tmp/asdcontrol
+  make
+  sudo make install
+  cd -
+  rm -rf /tmp/asdcontrol
+
+  # Setup sudo-less controls
+  echo "$USER ALL=(ALL) NOPASSWD: /usr/local/bin/asdcontrol" | sudo tee /etc/sudoers.d/asdcontrol
+  sudo chmod 440 /etc/sudoers.d/asdcontrol
+fi

install/preflight/pacman.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Install build tools
-sudo pacman -S --needed --noconfirm base-devel
-
-# Configure pacman
-sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf
-sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist /etc/pacman.d/mirrorlist
-
-# Refresh all repos
-sudo pacman -Syu --noconfirm

install/preflight/repositories.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Install build tools
+sudo pacman -S --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
+if ! grep -q "omarchy" /etc/pacman.conf; then
+  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
+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
+
+# Refresh all repos
+sudo pacman -Syu --noconfirm

install/preflight/trap-errors.sh

@@ -24,11 +24,7 @@ catch_errors() {
   echo "    ▀▀▀▀▀▀▀ ▀ ▀ ▀▀▀  ▀ ▀▀▀▀▀▀    "
   echo "                                 "
 
-  if command -v gum >/dev/null && gum confirm "Retry installation?"; then
+  echo "You can retry by running: bash ~/.local/share/omarchy/install.sh"
-    bash ~/.local/share/omarchy/install.sh
-  else
-    echo "You can retry later by running: bash ~/.local/share/omarchy/install.sh"
-  fi
 }
 
 trap catch_errors ERR

install/reboot.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-clear
-tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch
-echo
-echo "You're done! So we're ready to reboot now..." | tte --frame-rate 640 wipe
-
-if sudo test -f /etc/sudoers.d/99-omarchy-installer; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer &>/dev/null
-  echo -e "\nRemember to remove USB installer!\n\n"
-fi
-
-sleep 5
-reboot

migrations/1751134561.sh

@@ -1,7 +1,5 @@
 echo "Add Omarchy Package Repository"
 
-omarchy-refresh-pacman-mirrorlist
-
 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 systemctl restart systemd-timesyncd

migrations/1755164105.sh

@@ -1,8 +1,7 @@
 echo "Switch to Omarchy Chromium for synchronized theme switching"
 
-if omarchy-cmd-present chromium; then
 set_theme_colors() {
-    if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]]; then
+  if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then
     chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)"
   else
     # Use a default, neutral grey if theme doesn't have a color
@@ -10,6 +9,7 @@ if omarchy-cmd-present chromium; then
   fi
 }
 
+if omarchy-cmd-present chromium; then
   omarchy-pkg-drop chromium
   omarchy-pkg-add omarchy-chromium
 

migrations/1756411333.sh

@@ -1,3 +1,7 @@
 echo "Use new Omarchy mirror as default"
 
-omarchy-refresh-pacman-mirrorlist
+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/1756629295.sh

@@ -1,3 +0,0 @@
-echo "Ensure qt5-wayland is installed so KeepassXC, Nextcloud, Sqlite Browser, and other apps display correctly"
-
-omarchy-pkg-add qt5-wayland

migrations/1756642681.sh

@@ -1,3 +0,0 @@
-echo "Fix audio input on AMD Framework laptops"
-
-source $OMARCHY_PATH/install/config/hardware/fix-f13-amd-audio-input.sh || true