From a21ace2ee7bbb0f33c83d9777ecaa53f761f28c1 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Thu, 28 Aug 2025 21:50:49 +0200
Subject: [PATCH] Drop Chaotic-AUR repository now that we have OPR (#1264)

* Drop Chaotic AUR repo

Now that we have the AUR packages we need on the OPR, we don't need this
as a default.

* Fix escape issue and rename so it will run again
---
 install/preflight/repositories.sh | 18 ------------------
 migrations/1753352057.sh          | 18 ------------------
 migrations/1756360551.sh          |  6 ------
 migrations/1756360552.sh          |  7 +++++++
 4 files changed, 7 insertions(+), 42 deletions(-)
 delete mode 100755 migrations/1753352057.sh
 delete mode 100644 migrations/1756360551.sh
 create mode 100644 migrations/1756360552.sh

diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh
index 06ccb3f1..a0aab4bd 100755
--- a/install/preflight/repositories.sh
+++ b/install/preflight/repositories.sh
@@ -17,23 +17,5 @@ fi
 echo -e "Server = https://mirror.omarchy.org/\$repo/os/\$arch\nServer = https://mirror.rackspace.com/archlinux/\$repo/os/\$arch\nServer = https://geo.mirror.pkgbuild.com/\$repo/os/\$arch" |
   sudo tee /etc/pacman.d/mirrorlist >/dev/null
 
-# 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" ]; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if ! pacman-key --list-keys 3056513887B78AEB >/dev/null 2>&1 &&
-    sudo pacman-key --recv-key 3056513887B78AEB &&
-    sudo pacman-key --lsign-key 3056513887B78AEB &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-
-    # Add Chaotic-AUR repo to pacman config
-    if ! grep -q "chaotic-aur" /etc/pacman.conf; then
-      echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-    fi
-  else
-    echo -e "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
-
 # Refresh all repos
 sudo pacman -Syu --noconfirm
diff --git a/migrations/1753352057.sh b/migrations/1753352057.sh
deleted file mode 100755
index 3265f6a1..00000000
--- a/migrations/1753352057.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-echo "Add Chaotic-AUR to get compiled binaries"
-
-if [[ "$(uname -m)" == "x86_64" ]] && ! grep -q '^\[chaotic-aur\]' /etc/pacman.conf; then
-  # Try installing Chaotic-AUR keyring and mirrorlist
-  if sudo pacman-key --recv-key 3056513887B78AEB &&
-    sudo pacman-key --lsign-key 3056513887B78AEB &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' &&
-    sudo pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'; then
-
-    # Add Chaotic-AUR repo to pacman config
-    echo -e '\n[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist' | sudo tee -a /etc/pacman.conf >/dev/null
-
-    # Refresh pacman package databases
-    sudo pacman -Syu --noconfirm
-  else
-    echo "Failed to install Chaotic-AUR, so won't include it in pacman config!"
-  fi
-fi
diff --git a/migrations/1756360551.sh b/migrations/1756360551.sh
deleted file mode 100644
index ac9911a6..00000000
--- a/migrations/1756360551.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution"
-
-sudo cp /etc/pacman.conf /etc/pacman.conf.bak
-sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
-sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf ||
-  sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/" >> /etc/pacman.conf'
diff --git a/migrations/1756360552.sh b/migrations/1756360552.sh
new file mode 100644
index 00000000..a3ec24c4
--- /dev/null
+++ b/migrations/1756360552.sh
@@ -0,0 +1,7 @@
+echo "Move Omarchy Package Repository after Arch core/extra/multilib and remove AUR"
+
+sudo cp /etc/pacman.conf /etc/pacman.conf.bak
+sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf
+sudo sed -i '/\[chaotic-aur\]/,+2 d' /etc/pacman.conf
+sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/" >> /etc/pacman.conf'
+sudo pacman -Syu --noconfirm