diff --git a/default/pacman/pacman.conf b/default/pacman/pacman.conf new file mode 100644 index 00000000..10239f2e --- /dev/null +++ b/default/pacman/pacman.conf @@ -0,0 +1,32 @@ +# 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 + +# REPOSITORIES +# - pacman will search repositories in the order defined here +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +[omarchy] +SigLevel = Optional TrustAll +Server = https://pkgs.omarchy.org/$arch diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh index 3134ec72..4ec80d4d 100755 --- a/install/preflight/pacman.sh +++ b/install/preflight/pacman.sh @@ -3,24 +3,9 @@ # 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 -omarchy-refresh-pacman-mirrorlist +# 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 -