diff --git a/bin/omarchy-refresh-pacman b/bin/omarchy-refresh-pacman new file mode 100755 index 00000000..f24f9398 --- /dev/null +++ b/bin/omarchy-refresh-pacman @@ -0,0 +1,4 @@ +#!/bin/bash + +sudo cp -f ~/.local/share/omarchy/default/pacman/pacman.conf /etc/pacman.conf +omarchy-refresh-pacman-mirrorlist diff --git a/migrations/1751134560.sh b/migrations/1751134560.sh index e508b396..5c9149fd 100644 --- a/migrations/1751134560.sh +++ b/migrations/1751134560.sh @@ -9,17 +9,18 @@ export OMARCHY_PATH=$HOME/.local/share/omarchy export PATH=$OMARCHY_PATH/bin/:$PATH EOF -# Remove Zoom/qt5-remoteobjects to prevent a super lengthy build on old Omarchy installs -sudo pacman -Rns --noconfirm zoom qt5-remoteobjects - -# Ensure we have the latest repos -omarchy-refresh-pacman-mirrorlist -if ! grep -q "omarchy" /etc/pacman.conf; then - sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/stable\/$arch\n' /etc/pacman.conf -fi +# Ensure we have the latest repos and are ready to pull +omarchy-refresh-pacman +sudo systemctl restart systemd-timesyncd mkdir -p ~/.local/state/omarchy/migrations touch ~/.local/state/omarchy/migrations/1751134560.sh -sudo systemctl restart systemd-timesyncd +# Remove Zoom/qt5-remoteobjects to prevent a super lengthy build on old Omarchy installs +sudo pacman -Rns --noconfirm zoom qt5-remoteobjects + +# Get rid of old AUR packages +bash $OMARCHY_PATH/migrations/1756060611.sh +touch ~/.local/state/omarchy/migrations/1756060611.sh + bash omarchy-update-perform diff --git a/migrations/1751134561.sh b/migrations/1751134561.sh deleted file mode 100644 index f943fe0b..00000000 --- a/migrations/1751134561.sh +++ /dev/null @@ -1,9 +0,0 @@ -echo "Add Omarchy Package Repository" - -omarchy-refresh-pacman-mirrorlist - -if ! grep -q "omarchy" /etc/pacman.conf; then - sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/stable\/$arch\n' /etc/pacman.conf - sudo systemctl restart systemd-timesyncd - sudo pacman -Syu --noconfirm -fi diff --git a/migrations/1751134562.sh b/migrations/1751134562.sh deleted file mode 100644 index 7f51e2fc..00000000 --- a/migrations/1751134562.sh +++ /dev/null @@ -1,4 +0,0 @@ -echo "Ensure all indexes and packages are up to date" - -omarchy-refresh-pacman-mirrorlist -sudo pacman -Syu --noconfirm