From f745bdfba29b058d4888ba0abba343755373b7d7 Mon Sep 17 00:00:00 2001 From: Izzy Date: Tue, 4 Aug 2026 13:09:43 +0100 Subject: [PATCH 1/3] chore: add apollo repo --- .gitmodules | 3 +++ mkosi.conf.d/subprojects.conf | 3 +++ repos/apollo.conf | 3 +++ repos/fizzyizzy05-trusted | 1 + 4 files changed, 10 insertions(+) create mode 100644 repos/apollo.conf create mode 100644 repos/fizzyizzy05-trusted diff --git a/.gitmodules b/.gitmodules index 04415a5..b20b6b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "subprojects/homebrew-arch"] path = subprojects/homebrew-arch url = https://github.com/Lumaeris/homebrew-arch +[submodule "subprojects/apollo-packages"] + path = subprojects/apollo-packages + url = https://github.com/apollo-linux/packages.git diff --git a/mkosi.conf.d/subprojects.conf b/mkosi.conf.d/subprojects.conf index 75a4f20..59f1679 100644 --- a/mkosi.conf.d/subprojects.conf +++ b/mkosi.conf.d/subprojects.conf @@ -10,3 +10,6 @@ Packages= 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 + subprojects/apollo-packages/repo.gpg:/usr/share/pacman/keyrings/fizzyizzy05.gpg + repos/fizzyizzy05-trusted:/usr/share/pacman/keyrings/fizzyizzy05-trusted + repos/apollo.conf:/etc/pacman.d/apollo.conf diff --git a/repos/apollo.conf b/repos/apollo.conf new file mode 100644 index 0000000..a07c45d --- /dev/null +++ b/repos/apollo.conf @@ -0,0 +1,3 @@ +[apollo] +SigLevel = Required +Server = https://github.com/apollo-linux/packages/releases/download/$repo diff --git a/repos/fizzyizzy05-trusted b/repos/fizzyizzy05-trusted new file mode 100644 index 0000000..fbe46d4 --- /dev/null +++ b/repos/fizzyizzy05-trusted @@ -0,0 +1 @@ +F74289FDFA6BBD5C2995DDAD8048C7731FE274FA:4: From 0136c61f6c9a2f5a3308da7875460a34bba38db3 Mon Sep 17 00:00:00 2001 From: Izzy Date: Tue, 4 Aug 2026 13:28:52 +0100 Subject: [PATCH 2/3] chore: use packaged xdg-terminal-exec --- mkosi.conf.d/tools.conf | 1 + mkosi.postinst.d/config.chroot | 3 --- mkosi.prepare.d/install-software.chroot | 9 --------- 3 files changed, 1 insertion(+), 12 deletions(-) delete mode 100755 mkosi.prepare.d/install-software.chroot diff --git a/mkosi.conf.d/tools.conf b/mkosi.conf.d/tools.conf index 24eaf99..41b8ae0 100644 --- a/mkosi.conf.d/tools.conf +++ b/mkosi.conf.d/tools.conf @@ -31,6 +31,7 @@ Packages= unzip vim wireguard-tools + xdg-terminal-exec ydotool zenity zip diff --git a/mkosi.postinst.d/config.chroot b/mkosi.postinst.d/config.chroot index 04cd8c2..1fedca5 100755 --- a/mkosi.postinst.d/config.chroot +++ b/mkosi.postinst.d/config.chroot @@ -22,9 +22,6 @@ setcap -r /usr/bin/newuidmap setcap -r /usr/bin/newgidmap chmod u+s /usr/bin/newuidmap /usr/bin/newgidmap -# Set ptyxis as the default terminal -echo "org.gnome.Ptyxis.desktop:new-window" | tee -a /usr/share/xdg-terminal-exec/xdg-terminals.list - # Remove packages that are only used for building pacman -Rs --noconfirm \ crane \ diff --git a/mkosi.prepare.d/install-software.chroot b/mkosi.prepare.d/install-software.chroot deleted file mode 100755 index 7b28767..0000000 --- a/mkosi.prepare.d/install-software.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -uexo pipefail - -# Install xdg-terminal-exec -cd /tmp -git clone "https://gitlab.freedesktop.org/Vladimir-csp/xdg-terminal-exec.git" && cd xdg-terminal-exec - -make prefix="/usr" install From a9b0cabdb1a7b3f690a4c14539f2c29ed8f8714b Mon Sep 17 00:00:00 2001 From: Izzy Date: Tue, 4 Aug 2026 13:38:33 +0100 Subject: [PATCH 3/3] chore: fix submodules --- .gitmodules | 2 +- subprojects/apollo-packages | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 subprojects/apollo-packages diff --git a/.gitmodules b/.gitmodules index b20b6b7..63e11fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = https://github.com/Lumaeris/homebrew-arch [submodule "subprojects/apollo-packages"] path = subprojects/apollo-packages - url = https://github.com/apollo-linux/packages.git + url = https://github.com/apollo-linux/packages diff --git a/subprojects/apollo-packages b/subprojects/apollo-packages new file mode 160000 index 0000000..2061509 --- /dev/null +++ b/subprojects/apollo-packages @@ -0,0 +1 @@ +Subproject commit 2061509370218554a0a60ad853f210032df88ab6