Support brew-proxy and replace ublue-os/brew with lumaeris/homebrew-arch (#53)

* feat: support brew-proxy and replace ublue-os/brew with lumaeris/homebrew-arch

Signed-off-by: SmuJB <smujaybdev@protonmail.com>

* chore: remove brew-proxy-setup.service from system-preset as it is preset within the package

Signed-off-by: SmuJB <smujaybdev@protonmail.com>

---------

Signed-off-by: SmuJB <smujaybdev@protonmail.com>
Co-authored-by: Izzy <izzyjackson05@outlook.com>

Author: Smujb

.gitmodules

@@ -4,9 +4,9 @@
 [submodule "subprojects/arch-bootc-pkgs"]
 	path = subprojects/arch-bootc-pkgs
 	url = https://github.com/hecknt/arch-bootc-pkgs
-[submodule "subprojects/ublue-brew"]
-	path = subprojects/ublue-brew
-	url = https://github.com/ublue-os/brew
 [submodule "subprojects/xdg-terminal-exec-nautilus"]
 	path = subprojects/xdg-terminal-exec-nautilus
 	url = https://github.com/zirconium-dev/xdg-terminal-exec-nautilus.git
+[submodule "subprojects/homebrew-arch"]
+	path = subprojects/homebrew-arch
+	url = https://github.com/Lumaeris/homebrew-arch

mkosi.conf.d/subprojects.conf

@@ -2,5 +2,12 @@
 Distribution=arch
 
 [Content]
-ExtraTrees=subprojects/ublue-brew/system_files/:/
-            subprojects/assets/system_files/:/
+ExtraTrees=subprojects/assets/system_files/:/
+Packages=
+		homebrew
+		brew-proxy
+
+[Build]
+SandboxTrees=subprojects/homebrew-arch/repo.gpg:/usr/share/pacman/keyrings/lumaeris.gpg
+			repos/lumaeris-trusted:/usr/share/pacman/keyrings/lumaeris-trusted
+			repos/homebrew.conf:/etc/pacman.d/homebrew.conf

mkosi.postinst.d/os-info.chroot

@@ -2,8 +2,6 @@
 
 set -uexo pipefail
 
-echo "source /etc/profile.d/brew.sh" | tee -a /etc/bash.bashrc
-
 # Branding variables
 IMAGE_PRETTY_NAME="Apollo"
 HOSTNAME="apollo"

mkosi.prepare.d/install-software.chroot

@@ -7,8 +7,3 @@ cd /tmp
 git clone "https://gitlab.freedesktop.org/Vladimir-csp/xdg-terminal-exec.git" && cd xdg-terminal-exec
 
 make prefix="/usr" install
-
-# Install the homebrew.tar.zst
-mkdir /tmp/brew
-crane export ghcr.io/ublue-os/brew:latest | tar --strip-components=2 -xvf - -C /tmp/brew system_files/usr/share/homebrew.tar.zst
-mv /tmp/brew/share/homebrew.tar.zst /usr/share/homebrew.tar.zst

repos/homebrew.conf

@@ -0,0 +1,3 @@
+[homebrew]
+SigLevel = Required
+Server = https://github.com/Lumaeris/homebrew-arch/releases/download/$repo

repos/lumaeris-trusted

@@ -0,0 +1 @@
+F88AD54AC93B084021C2BB69FC179FA0288C0734:4: