Skip to content

feat: add flatpak-preinstalld service and apps proposition #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jumpyvi wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

feat: add flatpak-preinstalld service and apps proposition #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31a6040
feat: add flatpak-preinstalld service and apps proposition
jumpyvi Jun 17, 2026
bc1c0cf
chore: restructure the postinst/prepare scripts
fizzyizzy05 Jun 18, 2026
966123b
chore[ci]: don't build stable on pr
fizzyizzy05 Jun 18, 2026
e63b20f
feat: enable flatpak-preinstall.service by default
fizzyizzy05 Jun 18, 2026
74748e8
feat: add gnome core apps
fizzyizzy05 Jun 18, 2026
65ed0fb
feat: add rsync
fizzyizzy05 Jun 18, 2026
cc5b48f
Merge branch 'main' into flatpak-preinstalld
fizzyizzy05 Jul 5, 2026
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
3 changes: 2 additions & 1 deletion mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
19 changes: 19 additions & 0 deletions mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service
View file
Open in desktop

@fizzyizzy05 fizzyizzy05 Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Original file line number Diff line number Diff line change
@@ -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
88 changes: 88 additions & 0 deletions mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
[Flatpak Preinstall org.gnome.Epiphany]

@fizzyizzy05 fizzyizzy05 Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mentioned this on Discord already, but Firefox is probably a better default than Epiphany IMHO, since it has better support for things like extensions and cross-device sync

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]

@fizzyizzy05 fizzyizzy05 Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not against this, though I think it'd be better to just promote this in Bazaar instead under the curated section.

@fizzyizzy05 fizzyizzy05 Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See also: #52

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]

@fizzyizzy05 fizzyizzy05 Jun 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as Extension Manager

Branch=stable
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