Separate pacman setup from aur and make aur optional

install.sh

@@ -23,6 +23,7 @@ source $OMARCHY_INSTALL/preflight/trap-errors.sh
 source $OMARCHY_INSTALL/preflight/chroot.sh
 source $OMARCHY_INSTALL/preflight/mirrorlist.sh
 source $OMARCHY_INSTALL/preflight/guard.sh
+source $OMARCHY_INSTALL/preflight/pacman.sh
 source $OMARCHY_INSTALL/preflight/aur.sh
 source $OMARCHY_INSTALL/preflight/migrations.sh
 

install/preflight/aur.sh

@@ -3,9 +3,6 @@
 # Install build tools
 sudo pacman -Sy --needed --noconfirm base-devel jq
 
-# Ensure package repositories are accessible before proceeding
-omarchy-pkg-repos-accessible
-
 # 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
   # Try installing Chaotic-AUR keyring and mirrorlist
@@ -25,10 +22,9 @@ if [[ "$(uname -m)" == "x86_64" ]] && [ -z "$DISABLE_CHAOTIC" ] && ! command -v
   else
     echo "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
+else
+  # 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
@@ -37,9 +33,5 @@ if ! command -v yay &>/dev/null; then
     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
 fi

install/preflight/pacman.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Install build tools
+sudo pacman -Sy --needed --noconfirm base-devel jq
+
+# 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