diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env index 9c9b9b2e..f8d85f91 100755 --- a/bin/omarchy-install-dev-env +++ b/bin/omarchy-install-dev-env @@ -8,7 +8,7 @@ if [[ -z $1 ]]; then fi install_php() { - sudo pacman -S php composer php-sqlite xdebug --noconfirm + omarchy-pkg-add php composer php-sqlite xdebug # Install Path for Composer if [[ ":$PATH:" != *":$HOME/.config/composer/vendor/bin:"* ]]; then diff --git a/bin/omarchy-install-xbox-controllers b/bin/omarchy-install-xbox-controllers index 07dd0e4c..c192e282 100755 --- a/bin/omarchy-install-xbox-controllers +++ b/bin/omarchy-install-xbox-controllers @@ -5,8 +5,8 @@ set -e # Install xpadneo to ensure controllers work out of the box -sudo pacman -S --noconfirm --needed linux-headers -yay -S --noconfirm xpadneo-dkms +omarchy-pkg-add linux-headers +omarchy-pkg-aur-add xpadneo-dkms # Prevent xpad/xpadneo driver conflict echo blacklist xpad | sudo tee /etc/modprobe.d/blacklist-xpad.conf >/dev/null diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 820326c6..84628c63 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -52,15 +52,15 @@ open_in_editor() { } install() { - present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2" + present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2" } install_and_launch() { - present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && setsid gtk-launch $3" } install_font() { - present_terminal "echo 'Installing $1...'; sudo pacman -S --noconfirm --needed $2 && sleep 2 && omarchy-font-set '$3'" + present_terminal "echo 'Installing $1...'; omarchy-pkg-add $2 && sleep 2 && omarchy-font-set '$3'" } install_terminal() { @@ -68,11 +68,11 @@ install_terminal() { } aur_install() { - present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2" + present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2" } aur_install_and_launch() { - present_terminal "echo 'Installing $1 from AUR...'; yay -S --noconfirm $2 && setsid gtk-launch $3" + present_terminal "echo 'Installing $1 from AUR...'; omarchy-pkg-aur-add $2 && setsid gtk-launch $3" } show_learn_menu() { @@ -317,7 +317,7 @@ show_install_editor_menu() { case $(menu "Install" " VSCode\n Cursor\n Zed\n Sublime Text\n Helix\n Emacs") in *VSCode*) present_terminal omarchy-install-vscode ;; *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;; - *Zed*) present_terminal "echo 'Installing Zed...'; sudo pacman -S zed && setsid gtk-launch dev.zed.Zed" ;; + *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 ;; diff --git a/bin/omarchy-setup-fido2 b/bin/omarchy-setup-fido2 index ecf3e2bb..adb72e31 100755 --- a/bin/omarchy-setup-fido2 +++ b/bin/omarchy-setup-fido2 @@ -88,7 +88,7 @@ else # Install required packages print_info "Installing required packages..." - sudo pacman -S --noconfirm --needed libfido2 pam-u2f + omarchy-pkg-add libfido2 pam-u2f if ! check_fido2_hardware; then exit 1 diff --git a/bin/omarchy-setup-fingerprint b/bin/omarchy-setup-fingerprint index 22a164ef..7a746e56 100755 --- a/bin/omarchy-setup-fingerprint +++ b/bin/omarchy-setup-fingerprint @@ -100,7 +100,7 @@ else # Install required packages print_info "Installing required packages..." - sudo pacman -S --noconfirm --needed fprintd usbutils + omarchy-pkg-add fprintd usbutils if ! check_fingerprint_hardware; then exit 1 diff --git a/install/config/hardware/fix-apple-spi-keyboard.sh b/install/config/hardware/fix-apple-spi-keyboard.sh index 19fd88f6..e0384788 100644 --- a/install/config/hardware/fix-apple-spi-keyboard.sh +++ b/install/config/hardware/fix-apple-spi-keyboard.sh @@ -3,7 +3,7 @@ product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)" if [[ "$product_name" =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then echo "Detected MacBook with SPI keyboard" - sudo pacman -S --noconfirm --needed macbook12-spi-driver-dkms + omarchy-pkg-add macbook12-spi-driver-dkms if [[ "$product_name" == "MacBook8,1" ]]; then echo "MODULES=(applespi spi_pxa2xx_platform spi_pxa2xx_pci)" | sudo tee /etc/mkinitcpio.conf.d/macbook_spi_modules.conf >/dev/null else diff --git a/install/config/hardware/fix-apple-t2.sh b/install/config/hardware/fix-apple-t2.sh index 40c6942b..19b44a8d 100644 --- a/install/config/hardware/fix-apple-t2.sh +++ b/install/config/hardware/fix-apple-t2.sh @@ -3,7 +3,7 @@ if lspci -nn | grep -q "106b:180[12]"; then echo "Detected MacBook with T2 chip. Installing support items..." - sudo pacman -S --noconfirm --needed \ + omarchy-pkg-add \ linux-t2 \ linux-t2-headers \ apple-t2-audio-config \ diff --git a/install/config/hardware/fix-bcm43xx.sh b/install/config/hardware/fix-bcm43xx.sh index 5078f69e..f6e0f18b 100644 --- a/install/config/hardware/fix-bcm43xx.sh +++ b/install/config/hardware/fix-bcm43xx.sh @@ -6,5 +6,5 @@ pci_info=$(lspci -nnv) if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then echo "BCM4360 / BCM4331 detected" - sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers + omarchy-pkg-add broadcom-wl dkms linux-headers fi diff --git a/install/config/hardware/intel.sh b/install/config/hardware/intel.sh index 546fe477..c80375e2 100644 --- a/install/config/hardware/intel.sh +++ b/install/config/hardware/intel.sh @@ -3,9 +3,9 @@ if INTEL_GPU=$(lspci | grep -iE 'vga|3d|display' | grep -i 'intel'); then # HD Graphics and newer uses intel-media-driver if [[ "${INTEL_GPU,,}" =~ "hd graphics"|"xe"|"iris" ]]; then - sudo pacman -S --needed --noconfirm intel-media-driver + omarchy-pkg-add intel-media-driver elif [[ "${INTEL_GPU,,}" =~ "gma" ]]; then # Older generations from 2008 to ~2014-2017 use libva-intel-driver - sudo pacman -S --needed --noconfirm libva-intel-driver + omarchy-pkg-add libva-intel-driver fi fi diff --git a/install/helpers/presentation.sh b/install/helpers/presentation.sh index 70cab2e9..5a07abad 100644 --- a/install/helpers/presentation.sh +++ b/install/helpers/presentation.sh @@ -1,6 +1,6 @@ # Ensure we have gum available if ! command -v gum &>/dev/null; then - sudo pacman -S --needed --noconfirm gum + omarchy-pkg-add gum fi # Get terminal size from /dev/tty (works in all scenarios: direct, sourced, or piped) diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh index a2a49637..a2f9810f 100644 --- a/install/login/limine-snapper.sh +++ b/install/login/limine-snapper.sh @@ -1,5 +1,5 @@ if command -v limine &>/dev/null; then - sudo pacman -S --noconfirm --needed limine-snapper-sync limine-mkinitcpio-hook + omarchy-pkg-add limine-snapper-sync limine-mkinitcpio-hook sudo tee /etc/mkinitcpio.conf.d/omarchy_hooks.conf </dev/null HOOKS=(base udev plymouth keyboard autodetect microcode modconf kms keymap consolefont block encrypt filesystems fsck btrfs-overlayfs) diff --git a/install/packaging/base.sh b/install/packaging/base.sh index 668e4a9b..b76e8298 100644 --- a/install/packaging/base.sh +++ b/install/packaging/base.sh @@ -1,3 +1,3 @@ # Install all base packages mapfile -t packages < <(grep -v '^#' "$OMARCHY_INSTALL/omarchy-base.packages" | grep -v '^$') -sudo pacman -S --noconfirm --needed "${packages[@]}" +omarchy-pkg-add "${packages[@]}" diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh index c996bfef..6479e792 100644 --- a/install/preflight/pacman.sh +++ b/install/preflight/pacman.sh @@ -1,6 +1,6 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then # Install build tools - sudo pacman -S --needed --noconfirm base-devel + omarchy-pkg-add base-devel # Configure pacman sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf /etc/pacman.conf @@ -10,7 +10,7 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then sudo pacman-key --lsign-key 40DFB630FF42BCFFB047046CF0134EE680CAC571 sudo pacman -Sy - sudo pacman -S --noconfirm --needed omarchy-keyring + omarchy-pkg-add omarchy-keyring # Refresh all repos sudo pacman -Syyu --noconfirm