Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 9 additions & 2 deletions mkosi.conf.d/subprojects.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions mkosi.postinst.d/os-info.chroot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 0 additions & 5 deletions mkosi.prepare.d/install-software.chroot
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions repos/homebrew.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[homebrew]
SigLevel = Required
Server = https://github.com/Lumaeris/homebrew-arch/releases/download/$repo
1 change: 1 addition & 0 deletions repos/lumaeris-trusted
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
F88AD54AC93B084021C2BB69FC179FA0288C0734:4:
1 change: 1 addition & 0 deletions subprojects/homebrew-arch
Submodule homebrew-arch added at d4b839
1 change: 0 additions & 1 deletion subprojects/ublue-brew
Submodule ublue-brew deleted from 55f0e7
Loading