diff --git a/bin/omarchy-refresh-pacman b/bin/omarchy-refresh-pacman index 119bc36d..fa2980be 100755 --- a/bin/omarchy-refresh-pacman +++ b/bin/omarchy-refresh-pacman @@ -7,15 +7,14 @@ sudo cp -f /etc/pacman.conf /etc/pacman.conf.bak sudo cp -f /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak -sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf if [[ $1 == "edge" ]]; then + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist - sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/edge/$arch|' /etc/pacman.conf echo "Setting channel to edge" else + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist - sudo sed -i 's|https://pkgs.omarchy.org/.*$arch|https://pkgs.omarchy.org/stable/$arch|' /etc/pacman.conf echo "Setting channel to stable" fi diff --git a/boot.sh b/boot.sh index 4e61ccd1..c36b0893 100755 --- a/boot.sh +++ b/boot.sh @@ -27,7 +27,7 @@ rm -rf ~/.local/share/omarchy/ git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null # Use custom branch if instructed, otherwise default to master -export OMARCHY_REF="${OMARCHY_REF:-master}" +OMARCHY_REF="${OMARCHY_REF:-master}" if [[ $OMARCHY_REF != "master" ]]; then echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m" cd ~/.local/share/omarchy @@ -35,5 +35,12 @@ if [[ $OMARCHY_REF != "master" ]]; then cd - fi +# Set edge mirror for dev installs +if [[ $OMARCHY_REF == "dev" ]]; then + export OMARCHY_MIRROR=edge +else + export OMARCHY_MIRROR=stable +fi + echo -e "\nInstallation starting..." source ~/.local/share/omarchy/install.sh diff --git a/default/pacman/pacman-edge.conf b/default/pacman/pacman-edge.conf new file mode 100644 index 00000000..50d2e498 --- /dev/null +++ b/default/pacman/pacman-edge.conf @@ -0,0 +1,30 @@ +# 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/edge/$arch diff --git a/default/pacman/pacman.conf b/default/pacman/pacman-stable.conf similarity index 100% rename from default/pacman/pacman.conf rename to default/pacman/pacman-stable.conf diff --git a/install/post-install/pacman.sh b/install/post-install/pacman.sh index dbd6bcfc..a192347b 100644 --- a/install/post-install/pacman.sh +++ b/install/post-install/pacman.sh @@ -1,6 +1,12 @@ # Configure pacman -sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf -sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist + +if [[ ${OMARCHY_MIRROR:-} == "edge" ]] || ; then + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf + sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist +else + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf + sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist +fi if lspci -nn | grep -q "106b:180[12]"; then cat </dev/null diff --git a/install/preflight/pacman.sh b/install/preflight/pacman.sh index a28c6bea..7dc595ef 100644 --- a/install/preflight/pacman.sh +++ b/install/preflight/pacman.sh @@ -3,11 +3,11 @@ if [[ -n ${OMARCHY_ONLINE_INSTALL:-} ]]; then sudo pacman -S --needed --noconfirm base-devel # Configure pacman - sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf - - if [[ ${OMARCHY_REF:-} == "dev" ]]; then + if [[ ${OMARCHY_MIRROR:-} == "edge" ]] || ; then + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-edge.conf /etc/pacman.conf sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-edge /etc/pacman.d/mirrorlist else + sudo cp -f ~/.local/share/omarchy/default/pacman/pacman-stable.conf /etc/pacman.conf sudo cp -f ~/.local/share/omarchy/default/pacman/mirrorlist-stable /etc/pacman.d/mirrorlist fi