From 31a60402601344fdee1c31773d03cf8e034d5bf5 Mon Sep 17 00:00:00 2001 From: JumpyVi Date: Wed, 17 Jun 2026 18:00:20 -0400 Subject: [PATCH 1/6] feat: add flatpak-preinstalld service and apps proposition --- .../systemd/system/flatpak-preinstall.service | 19 ++++++++++ .../flatpak/preinstall.d/flathub.preinstall | 35 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service create mode 100644 mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall diff --git a/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service b/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service new file mode 100644 index 0000000..cdf5a6d --- /dev/null +++ b/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service @@ -0,0 +1,19 @@ +[Unit] +Description=Preinstall Flatpaks +After=network-online.target +Wants=network-online.target +ConditionPathExists=/usr/bin/flatpak +ConditionPathExists=!/var/lib/apollo/preinstall-finished +Documentation=man:flatpak-preinstall(1) + +[Service] +Type=oneshot +ExecStart=mkdir -p /var/lib/apollo +ExecStart=/usr/bin/flatpak preinstall -y +ExecStart=touch /var/lib/apollo/preinstall-finished +RemainAfterExit=true +Restart=on-failure +RestartSec=30 + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall new file mode 100644 index 0000000..dbcb7da --- /dev/null +++ b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall @@ -0,0 +1,35 @@ +[Flatpak Preinstall org.gnome.Epiphany] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.TextEditor] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall io.github.kolunmi.Bazaar] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Firmware] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall com.mattjakeman.ExtensionManager] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.FileRoller] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Loupe] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Papers] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall page.tesk.Refine] +Branch=stable +IsRuntime=false \ No newline at end of file From bc1c0cfc9c774ce299457efaa452423c1ed722a0 Mon Sep 17 00:00:00 2001 From: Isabelle Jackson Date: Thu, 18 Jun 2026 17:02:59 +0100 Subject: [PATCH 2/6] chore: restructure the postinst/prepare scripts remove singular mkosi.postinst.chroot and mkosi.prepare scripts and refactor them into seperate scripts in mkosi.postinst.d and mkosi.prepare.d --- .../config.chroot | 29 ++--------------- mkosi.postinst.d/os-info.chroot | 31 +++++++++++++++++++ .../install-software.chroot | 3 -- 3 files changed, 33 insertions(+), 30 deletions(-) rename mkosi.postinst.chroot => mkosi.postinst.d/config.chroot (51%) create mode 100755 mkosi.postinst.d/os-info.chroot rename mkosi.prepare.chroot => mkosi.prepare.d/install-software.chroot (76%) diff --git a/mkosi.postinst.chroot b/mkosi.postinst.d/config.chroot similarity index 51% rename from mkosi.postinst.chroot rename to mkosi.postinst.d/config.chroot index ed116ac..04cd8c2 100755 --- a/mkosi.postinst.chroot +++ b/mkosi.postinst.d/config.chroot @@ -22,33 +22,8 @@ setcap -r /usr/bin/newuidmap setcap -r /usr/bin/newgidmap chmod u+s /usr/bin/newuidmap /usr/bin/newgidmap -echo "source /etc/profile.d/brew.sh" | tee -a /etc/bash.bashrc - -# Branding variables -IMAGE_PRETTY_NAME="Apollo" -HOSTNAME="apollo" -HOME_URL="https://getapollo.dev" -SUPPORT_URL="https://github.com/apollo-linux/apollo/issues" -ID="apollo" -ID_LIKE="arch" -BUILD_ID="rolling" -LOGO=apollo-logo - -# Set default hostname -echo "${HOSTNAME}" > /etc/hostname - -# Overwrite os-release -cat > /usr/lib/os-release < /etc/hostname + +# Overwrite os-release +cat > /usr/lib/os-release < Date: Thu, 18 Jun 2026 22:01:48 +0100 Subject: [PATCH 3/6] chore[ci]: don't build stable on pr --- .github/workflows/build-stable-lts.yaml | 3 --- .github/workflows/build-stable.yaml | 3 --- 2 files changed, 6 deletions(-) diff --git a/.github/workflows/build-stable-lts.yaml b/.github/workflows/build-stable-lts.yaml index cabc4b3..9054fef 100644 --- a/.github/workflows/build-stable-lts.yaml +++ b/.github/workflows/build-stable-lts.yaml @@ -1,9 +1,6 @@ --- name: Build LTS images on: - pull_request: - branches: - - main schedule: # TODO: long-term, this should be weekly builds. Ideally closer to either beta or GA. - cron: "05 10 * * *" # 10:05am UTC everyday diff --git a/.github/workflows/build-stable.yaml b/.github/workflows/build-stable.yaml index 92837b3..e496f09 100644 --- a/.github/workflows/build-stable.yaml +++ b/.github/workflows/build-stable.yaml @@ -1,9 +1,6 @@ --- name: Build stable images on: - pull_request: - branches: - - main schedule: # TODO: long-term, this should be weekly builds. Ideally closer to either beta or GA. - cron: "05 10 * * *" # 10:05am UTC everyday From e63b20f5aaeca46733231818bfa89d9401a0eda8 Mon Sep 17 00:00:00 2001 From: Isabelle Jackson Date: Thu, 18 Jun 2026 22:42:06 +0100 Subject: [PATCH 4/6] feat: enable flatpak-preinstall.service by default --- .../usr/lib/systemd/system-preset/10-apollo-base.preset | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset b/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset index faa9b52..593c775 100644 --- a/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset +++ b/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset @@ -4,8 +4,9 @@ enable apparmor.service enable bluetooth.service enable cups.service enable firewalld.service +enable flatpak-preinstall.service enable fwupd.service enable gdm.service enable gnome-initial-setup.service enable NetworkManager.service -enable systemd-resolved.service +enable systemd-resolved.service \ No newline at end of file From 74748e8228934f4a39edda9908169d8d09c9b920 Mon Sep 17 00:00:00 2001 From: Isabelle Jackson Date: Thu, 18 Jun 2026 23:01:31 +0100 Subject: [PATCH 5/6] feat: add gnome core apps --- .../flatpak/preinstall.d/flathub.preinstall | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall index dbcb7da..14e4f60 100644 --- a/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall +++ b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall @@ -32,4 +32,57 @@ IsRuntime=false [Flatpak Preinstall page.tesk.Refine] Branch=stable -IsRuntime=false \ No newline at end of file +IsRuntime=false + +[Flatpak Preinstall net.nokyan.Resources] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Calendar] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Contacts] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.baobab] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Showtime] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Snapshot] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Decibels] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Music] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.SimpleScan] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Logs] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.clocks] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.font-viewer] +Branch=stable +IsRuntime=false + +[Flatpak Preinstall org.gnome.Calculator] +Branch=stable +IsRuntime=false + From 65ed0fbcd91d74314f13e5cb81fa7acdf4815496 Mon Sep 17 00:00:00 2001 From: Isabelle Jackson Date: Thu, 18 Jun 2026 23:42:00 +0100 Subject: [PATCH 6/6] feat: add rsync --- mkosi.conf.d/tools.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mkosi.conf.d/tools.conf b/mkosi.conf.d/tools.conf index e706fb0..24eaf99 100644 --- a/mkosi.conf.d/tools.conf +++ b/mkosi.conf.d/tools.conf @@ -24,6 +24,7 @@ Packages= networkmanager-openconnect podman python-pip + rsync scdoc ttf-nerd-fonts-symbols unrar