From 9d739faf2bdd57d5d1ad9fa8cc1fb75ab6447a54 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 24 Aug 2025 17:35:24 +0200 Subject: [PATCH] Switch to pacman to make it clear when we are not depending on AUR --- bin/omarchy-install-steam | 2 +- install/apps/xtras.sh | 4 ++-- install/config/network.sh | 2 +- install/config/nvidia.sh | 2 +- install/config/power.sh | 2 +- install/desktop/bluetooth.sh | 2 +- install/desktop/hyprlandia.sh | 2 +- install/desktop/theme.sh | 10 +++++----- install/development/development.sh | 2 +- install/development/docker.sh | 2 +- install/development/nvim.sh | 2 +- install/development/ruby.sh | 2 +- install/development/terminal.sh | 2 +- install/login/plymouth.sh | 2 +- migrations/1751135253.sh | 2 +- migrations/1751510848.sh | 2 +- migrations/1751667620.sh | 2 +- migrations/1751679069.sh | 2 +- migrations/1751821819.sh | 2 +- migrations/1751887718.sh | 2 +- migrations/1752082381.sh | 2 +- migrations/1752104271.sh | 2 +- migrations/1752678932.sh | 2 +- migrations/1752896442.sh | 2 +- migrations/1752897642.sh | 2 +- migrations/1752955912.sh | 2 +- migrations/1753138691.sh | 2 +- migrations/1753176520.sh | 2 +- migrations/1754047941.sh | 2 +- migrations/1754109724.sh | 2 +- migrations/1754221967.sh | 2 +- migrations/1754509222.sh | 2 +- migrations/1755436367.sh | 2 +- migrations/1755459930.sh | 4 ++-- migrations/1755548643.sh | 2 +- migrations/1755795450.sh | 2 +- 36 files changed, 42 insertions(+), 42 deletions(-) diff --git a/bin/omarchy-install-steam b/bin/omarchy-install-steam index 4dc76b7c..9eb826db 100755 --- a/bin/omarchy-install-steam +++ b/bin/omarchy-install-steam @@ -5,5 +5,5 @@ sudo sed -i '/^\s*#\[multilib\]/,/^$/{s/^\s*#//}' /etc/pacman.conf sudo pacman -Sy echo "Now pick dependencies matching your graphics card" -yay -S steam +sudo pacman -S steam setsid gtk-launch steam >/dev/null 2>&1 & diff --git a/install/apps/xtras.sh b/install/apps/xtras.sh index 0be93e23..27f4c33d 100644 --- a/install/apps/xtras.sh +++ b/install/apps/xtras.sh @@ -1,14 +1,14 @@ #!/bin/bash if [ -z "$OMARCHY_BARE" ]; then - yay -S --noconfirm --needed \ + sudo pacman -S --noconfirm --needed \ gnome-calculator gnome-keyring signal-desktop \ obsidian libreoffice obs-studio kdenlive \ xournalpp localsend # Packages known to be flaky or having key signing issues are run one-by-one for pkg in spotify pinta; do - yay -S --noconfirm --needed "$pkg" || + sudo pacman -S --noconfirm --needed "$pkg" || echo -e "\e[31mFailed to install $pkg. Continuing without!\e[0m" done fi diff --git a/install/config/network.sh b/install/config/network.sh index 52722547..70138838 100644 --- a/install/config/network.sh +++ b/install/config/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 diff --git a/install/config/nvidia.sh b/install/config/nvidia.sh index e3a475a4..2241269d 100644 --- a/install/config/nvidia.sh +++ b/install/config/nvidia.sh @@ -53,7 +53,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 diff --git a/install/config/power.sh b/install/config/power.sh index 44a7b785..d973fb33 100644 --- a/install/config/power.sh +++ b/install/config/power.sh @@ -2,7 +2,7 @@ # 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 +sudo pacman -S --noconfirm python-gobject power-profiles-daemon # FIXME: Can't set powerprofilesctl during CHROOT, must do it afterwards if [ -z "${OMARCHY_CHROOT_INSTALL:-}" ]; then diff --git a/install/desktop/bluetooth.sh b/install/desktop/bluetooth.sh index f7c6282f..48f98176 100644 --- a/install/desktop/bluetooth.sh +++ b/install/desktop/bluetooth.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install bluetooth controls -yay -S --noconfirm --needed blueberry +sudo pacman -S --noconfirm --needed blueberry # Turn on bluetooth by default chrootable_systemctl_enable bluetooth.service diff --git a/install/desktop/hyprlandia.sh b/install/desktop/hyprlandia.sh index 5a7e916b..6d33ed77 100644 --- a/install/desktop/hyprlandia.sh +++ b/install/desktop/hyprlandia.sh @@ -1,6 +1,6 @@ #!/bin/bash -yay -S --noconfirm --needed \ +sudo pacman -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 diff --git a/install/desktop/theme.sh b/install/desktop/theme.sh index 0076d192..7d7976b9 100644 --- a/install/desktop/theme.sh +++ b/install/desktop/theme.sh @@ -1,18 +1,18 @@ #!/bin/bash # Use dark mode for QT apps too (like kdenlive) -if ! yay -Q kvantum-qt5 &>/dev/null; then - yay -S --noconfirm kvantum-qt5 +if ! pacman -Q kvantum-qt5 &>/dev/null; then + sudo pacman -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 +if ! pacman -Q gnome-themes-extra &>/dev/null; then + sudo pacman -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 + sudo pacman -S --noconfirm yaru-icon-theme fi gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark" diff --git a/install/development/development.sh b/install/development/development.sh index bc524bdc..f77c28f8 100644 --- a/install/development/development.sh +++ b/install/development/development.sh @@ -1,6 +1,6 @@ #!/bin/bash -yay -S --noconfirm --needed \ +sudo pacman -S --noconfirm --needed \ cargo clang llvm mise \ imagemagick \ mariadb-libs postgresql-libs \ diff --git a/install/development/docker.sh b/install/development/docker.sh index 7d10fbf6..93ccee5b 100644 --- a/install/development/docker.sh +++ b/install/development/docker.sh @@ -1,6 +1,6 @@ #!/bin/bash -yay -S --noconfirm --needed docker docker-compose docker-buildx +sudo pacman -S --noconfirm --needed docker docker-compose docker-buildx # Configure Docker daemon: # - limit log size to avoid running out of disk diff --git a/install/development/nvim.sh b/install/development/nvim.sh index 0227836d..7c037e2a 100644 --- a/install/development/nvim.sh +++ b/install/development/nvim.sh @@ -1,7 +1,7 @@ #!/bin/bash if ! command -v nvim &>/dev/null || [ ! -d "$HOME/.config/nvim" ]; then - yay -S --noconfirm --needed nvim luarocks tree-sitter-cli + sudo pacman -S --noconfirm --needed nvim luarocks tree-sitter-cli # Install LazyVim rm -rf ~/.config/nvim diff --git a/install/development/ruby.sh b/install/development/ruby.sh index 5ec98a29..13d69d4b 100644 --- a/install/development/ruby.sh +++ b/install/development/ruby.sh @@ -1,7 +1,7 @@ #!/bin/bash # Install Ruby using gcc-14 for compatibility -yay -S --noconfirm --needed gcc14 +sudo pacman -S --noconfirm --needed gcc14 mise settings set ruby.ruby_build_opts "CC=gcc-14 CXX=g++-14" # Trust .ruby-version diff --git a/install/development/terminal.sh b/install/development/terminal.sh index 10aab60e..44e4eef5 100644 --- a/install/development/terminal.sh +++ b/install/development/terminal.sh @@ -1,6 +1,6 @@ #!/bin/bash -yay -S --noconfirm --needed \ +sudo pacman -S --noconfirm --needed \ unzip inetutils impala \ fd eza fzf ripgrep zoxide bat dust jq xmlstarlet \ wl-clipboard fastfetch btop \ diff --git a/install/login/plymouth.sh b/install/login/plymouth.sh index 20b46dd2..21ae3418 100644 --- a/install/login/plymouth.sh +++ b/install/login/plymouth.sh @@ -2,7 +2,7 @@ # 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 + sudo pacman -S --noconfirm --needed plymouth uwsm fi # ============================================================================== diff --git a/migrations/1751135253.sh b/migrations/1751135253.sh index 677b610f..92e91445 100644 --- a/migrations/1751135253.sh +++ b/migrations/1751135253.sh @@ -1,5 +1,5 @@ echo "Add missing installation of bat (used by the ff alias)" if ! command -v bat &>/dev/null; then # Add missing installation of bat - yay -S --noconfirm --needed bat + sudo pacman -S --noconfirm --needed bat fi diff --git a/migrations/1751510848.sh b/migrations/1751510848.sh index 4888bb2f..8bdc855c 100644 --- a/migrations/1751510848.sh +++ b/migrations/1751510848.sh @@ -1,5 +1,5 @@ echo "Installing missing fd terminal tool for finding files" if ! command -v fd &>/dev/null; then - yay -S --noconfirm --needed fd + sudo pacman -S --noconfirm --needed fd fi diff --git a/migrations/1751667620.sh b/migrations/1751667620.sh index 227006ff..46cd9def 100644 --- a/migrations/1751667620.sh +++ b/migrations/1751667620.sh @@ -2,7 +2,7 @@ echo "Switching from vlc to mpv for the default video player" if ! command -v mpv &>/dev/null; then yay -Rns --noconfirm vlc rm ~/.local/share/applications/vlc.desktop - yay -S --noconfirm mpv + sudo pacman -S --noconfirm mpv xdg-mime default mpv.desktop video/mp4 xdg-mime default mpv.desktop video/x-msvideo xdg-mime default mpv.desktop video/x-matroska diff --git a/migrations/1751679069.sh b/migrations/1751679069.sh index 57feb128..a2f437f3 100644 --- a/migrations/1751679069.sh +++ b/migrations/1751679069.sh @@ -1,5 +1,5 @@ echo "Install ffmpegthumbnailer for video thumbnails in the file manager" if ! command -v ffmpegthumbnailer &>/dev/null; then - yay -S --noconfirm --needed ffmpegthumbnailer + sudo pacman -S --noconfirm --needed ffmpegthumbnailer fi diff --git a/migrations/1751821819.sh b/migrations/1751821819.sh index a34d82e7..f8d616f9 100644 --- a/migrations/1751821819.sh +++ b/migrations/1751821819.sh @@ -1,5 +1,5 @@ echo "Install bash-completion" if ! pacman -Q bash-completion &>/dev/null; then - yay -S --noconfirm --needed bash-completion + sudo pacman -S --noconfirm --needed bash-completion fi diff --git a/migrations/1751887718.sh b/migrations/1751887718.sh index d62fbdd0..ac1894f5 100644 --- a/migrations/1751887718.sh +++ b/migrations/1751887718.sh @@ -1,6 +1,6 @@ echo "Install Impala as new wifi selection TUI" if ! command -v impala &>/dev/null; then - yay -S --noconfirm --needed impala + sudo pacman -S --noconfirm --needed impala echo "You need to update the Waybar config to use Impala Wi-Fi selector in top bar." omarchy-refresh-waybar fi diff --git a/migrations/1752082381.sh b/migrations/1752082381.sh index a3b937de..561fa7e7 100644 --- a/migrations/1752082381.sh +++ b/migrations/1752082381.sh @@ -1,5 +1,5 @@ echo "Adding gnome-keyring to make 1password work with 2FA codes" if ! command -v gnome-keyring &>/dev/null; then - yay -S --noconfirm --needed gnome-keyring + sudo pacman -S --noconfirm --needed gnome-keyring fi diff --git a/migrations/1752104271.sh b/migrations/1752104271.sh index b00e99a9..5c950d08 100644 --- a/migrations/1752104271.sh +++ b/migrations/1752104271.sh @@ -1,6 +1,6 @@ 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 - yay -S --noconfirm --needed polkit-gnome + sudo pacman -S --noconfirm --needed polkit-gnome systemctl --user stop hyprpolkitagent systemctl --user disable hyprpolkitagent yay -Rns --noconfirm hyprpolkitagent diff --git a/migrations/1752678932.sh b/migrations/1752678932.sh index 29e1e492..1aa8c858 100644 --- a/migrations/1752678932.sh +++ b/migrations/1752678932.sh @@ -1,5 +1,5 @@ echo "Install missing docker-buildx package for out-of-the-box Kamal compatibility" if ! docker buildx version &>/dev/null; then - yay -S --noconfirm --needed docker-buildx + sudo pacman -S --noconfirm --needed docker-buildx fi diff --git a/migrations/1752896442.sh b/migrations/1752896442.sh index 012acfc5..f604d94e 100644 --- a/migrations/1752896442.sh +++ b/migrations/1752896442.sh @@ -1,7 +1,7 @@ echo "Replace volume control GUI with a TUI" if ! command -v wiremix &>/dev/null; then - yay -S --noconfirm --needed wiremix + sudo pacman -S --noconfirm --needed wiremix yay -Rns --noconfirm pavucontrol omarchy-refresh-applications diff --git a/migrations/1752897642.sh b/migrations/1752897642.sh index 034b78fa..f9881986 100644 --- a/migrations/1752897642.sh +++ b/migrations/1752897642.sh @@ -1,4 +1,4 @@ echo "Remove needless fcitx5-configtool package" -if yay -Qe fcitx5-configtool &>/dev/null; then +if pacman -Qe fcitx5-configtool &>/dev/null; then yay -Rns --noconfirm fcitx5-configtool fi diff --git a/migrations/1752955912.sh b/migrations/1752955912.sh index 8c59fb22..0933cb10 100644 --- a/migrations/1752955912.sh +++ b/migrations/1752955912.sh @@ -1,5 +1,5 @@ echo "Install satty for the new screenshot flow" if ! command -v satty &>/dev/null; then - yay -S --noconfirm --needed satty + sudo pacman -S --noconfirm --needed satty fi diff --git a/migrations/1753138691.sh b/migrations/1753138691.sh index 04012e49..53f54719 100644 --- a/migrations/1753138691.sh +++ b/migrations/1753138691.sh @@ -1,6 +1,6 @@ echo "Install swayOSD to show volume status" if ! command -v swayosd-server &>/dev/null; then - yay -S --noconfirm --needed swayosd + sudo pacman -S --noconfirm --needed swayosd setsid uwsm app -- swayosd-server &>/dev/null & fi diff --git a/migrations/1753176520.sh b/migrations/1753176520.sh index 8b211871..5e68e410 100644 --- a/migrations/1753176520.sh +++ b/migrations/1753176520.sh @@ -2,7 +2,7 @@ echo "Install wf-recorder for screen recording for nvidia" if lspci | grep -qi 'nvidia'; then if ! command -v wf-recorder &>/dev/null; then - yay -S --noconfirm --needed wf-recorder + sudo pacman -S --noconfirm --needed wf-recorder fi if command -v wl-screenrec &>/dev/null; then diff --git a/migrations/1754047941.sh b/migrations/1754047941.sh index 39ddd154..0774ba13 100644 --- a/migrations/1754047941.sh +++ b/migrations/1754047941.sh @@ -1,7 +1,7 @@ echo "Add icon theme coloring" if ! yay -! yaru-icon-theme &>/dev/null; then - yay -S --noconfirm yaru-icon-theme + sudo pacman -S --noconfirm yaru-icon-theme if [[ -f ~/.config/omarchy/current/theme/icons.theme ]]; then gsettings set org.gnome.desktop.interface icon-theme "$(<~/.config/omarchy/current/theme/icons.theme)" diff --git a/migrations/1754109724.sh b/migrations/1754109724.sh index b8ff9096..dc39bbd3 100644 --- a/migrations/1754109724.sh +++ b/migrations/1754109724.sh @@ -1,6 +1,6 @@ echo "Add hyprsunset blue light filter" if ! command -v hyprsunset &>/dev/null; then - yay -S --noconfirm --needed hyprsunset + sudo pacman -S --noconfirm --needed hyprsunset fi omarchy-refresh-hyprsunset diff --git a/migrations/1754221967.sh b/migrations/1754221967.sh index 8225c6df..7a135079 100644 --- a/migrations/1754221967.sh +++ b/migrations/1754221967.sh @@ -1,2 +1,2 @@ echo "Add support for accessing Android phone data via file manager" -yay -S --noconfirm --needed gvfs-mtp +sudo pacman -S --noconfirm --needed gvfs-mtp diff --git a/migrations/1754509222.sh b/migrations/1754509222.sh index 799cac38..8ad7ad45 100644 --- a/migrations/1754509222.sh +++ b/migrations/1754509222.sh @@ -1,3 +1,3 @@ echo "Add xmlstarlet needed for updating fonts via Omarchy menu" -yay -Sy --noconfirm --needed xmlstarlet +sudo pacman -Sy --noconfirm --needed xmlstarlet diff --git a/migrations/1755436367.sh b/migrations/1755436367.sh index 11f832d7..b3de9b4b 100644 --- a/migrations/1755436367.sh +++ b/migrations/1755436367.sh @@ -1,6 +1,6 @@ echo "Add minimal starship prompt to terminal" if ! command -v starship &>/dev/null; then - yay -S --noconfirm starship + sudo pacman -S --noconfirm starship cp $OMARCHY_PATH/config/starship.toml ~/.config/starship.toml fi diff --git a/migrations/1755459930.sh b/migrations/1755459930.sh index ee6633b0..2b9c2f31 100644 --- a/migrations/1755459930.sh +++ b/migrations/1755459930.sh @@ -1,5 +1,5 @@ echo "Add potentially missing dependency for power profile controls" -if ! yay -Q python-gobject &>/dev/null; then - yay -S --noconfirm python-gobject +if ! pacman -Q python-gobject &>/dev/null; then + sudo pacman -S --noconfirm python-gobject fi diff --git a/migrations/1755548643.sh b/migrations/1755548643.sh index eb8ada50..3f5367b9 100644 --- a/migrations/1755548643.sh +++ b/migrations/1755548643.sh @@ -1,5 +1,5 @@ echo "Install wf-recorder for intel based device" if lspci | grep -Eqi 'nvidia|intel.*graphics'; then - yay -S --noconfirm --needed wf-recorder + sudo pacman -S --noconfirm --needed wf-recorder fi diff --git a/migrations/1755795450.sh b/migrations/1755795450.sh index a69eae76..96df3fcd 100644 --- a/migrations/1755795450.sh +++ b/migrations/1755795450.sh @@ -1,3 +1,3 @@ echo "Ensure latest uwsm is installed" -yay -Sy --noconfirm uwsm +sudo pacman -Sy --noconfirm uwsm