From 2a57c2826a3ecb06738f621e75830a8d76ab93c9 Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Thu, 20 Jul 2023 11:50:38 -0600 Subject: [PATCH 1/2] Possibly-terrible attempt at preinstalling Flatpaks --- Containerfile | 6 ++-- etc/flatpak/remotes.d/flathub.flatpakrepo | 8 +++++ flatpaks | 43 +++++++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 etc/flatpak/remotes.d/flathub.flatpakrepo create mode 100644 flatpaks diff --git a/Containerfile b/Containerfile index 7e56934..fcff123 100644 --- a/Containerfile +++ b/Containerfile @@ -12,6 +12,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" COPY etc /etc COPY usr /usr +ADD flatpaks /tmp/flatpaks ADD packages.json /tmp/packages.json ADD build.sh /tmp/build.sh @@ -19,10 +20,7 @@ RUN /tmp/build.sh && \ wget https://copr.fedorainfracloud.org/coprs/ublue-os/gnome-software/repo/fedora-${FEDORA_VERSION}/ublue-os-gnome-software-fedora-${FEDORA_VERSION}.repo -O /etc/yum.repos.d/ublue-os-gnome-software.repo && \ rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:gnome-software gnome-software gnome-software-rpm-ostree && \ pip install --prefix=/usr yafti && \ - curl -sL $(curl -s https://api.github.com/repos/rsms/inter/releases | jq -r '.[0].assets[0].browser_download_url') -o /tmp/inter.zip && \ - mkdir -p /tmp/inter /usr/share/fonts/inter && \ - unzip /tmp/inter.zip -d /tmp/inter/ && \ - mv /tmp/inter/*.ttf /tmp/inter/*.ttc /tmp/inter/LICENSE.txt /usr/share/fonts/inter/ && \ + cat /tmp/flatpaks | while read line; do flatpak install --system --noninteractive flathub $line; done && \ systemctl unmask dconf-update.service && \ systemctl enable dconf-update.service && \ systemctl enable rpm-ostree-countme.service && \ diff --git a/etc/flatpak/remotes.d/flathub.flatpakrepo b/etc/flatpak/remotes.d/flathub.flatpakrepo new file mode 100644 index 0000000..99c4786 --- /dev/null +++ b/etc/flatpak/remotes.d/flathub.flatpakrepo @@ -0,0 +1,8 @@ +[Flatpak Repo] +Title=Flathub +Url=https://dl.flathub.org/repo/ +Homepage=https://flathub.org/ +Comment=Central repository of Flatpak applications +Description=Central repository of Flatpak applications +Icon=https://dl.flathub.org/repo/logo.svg +GPGKey=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 diff --git a/flatpaks b/flatpaks new file mode 100644 index 0000000..27c23d6 --- /dev/null +++ b/flatpaks @@ -0,0 +1,43 @@ +com.hack_computer.Clubhouse +com.hack_computer.OperatingSystemApp +com.hack_computer.Sidetrack +org.chromium.Chromium +org.gnome.Calculator +org.gnome.Cheese +org.gnome.Contacts +org.gnome.Epiphany +org.gnome.FileRoller +org.gnome.Logs +org.gnome.Totem +org.gnome.Shotwell +org.gnome.font-viewer +org.gnome.gedit +org.libreoffice.LibreOffice +cc.arduino.arduinoide +com.endlessm.photos +com.endlessnetwork.aqueducts +com.endlessnetwork.dragonsapprentice +com.endlessnetwork.fablemaker +com.endlessnetwork.frogsquash +com.endlessnetwork.MidnightmareTeddy +com.endlessnetwork.missilemath +com.endlessnetwork.passage +com.endlessnetwork.tankwarriors +com.endlessnetwork.whitehouse +com.tux4kids.tuxmath +com.tux4kids.tuxtype +edu.mit.Scratch +io.lmms.LMMS +io.thp.numptyphysics +org.audacityteam.Audacity +org.blender.Blender +org.gimp.GIMP +org.gnome.Gnote +org.gnome.Rhythmbox3 +org.gnome.Weather +org.inkscape.Inkscape +org.kde.gcompris +org.laptop.TurtleArtActivity +org.learningequality.Kolibri +org.pitivi.Pitivi +org.tuxpaint.Tuxpaint \ No newline at end of file From dbfde3a99add9e38fa2c0a05e24376ab6fb44777 Mon Sep 17 00:00:00 2001 From: Cassidy James Blaede Date: Thu, 20 Jul 2023 12:31:53 -0600 Subject: [PATCH 2/2] flatpaks: let's just start with one --- flatpaks | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/flatpaks b/flatpaks index 27c23d6..58497b4 100644 --- a/flatpaks +++ b/flatpaks @@ -1,43 +1 @@ -com.hack_computer.Clubhouse -com.hack_computer.OperatingSystemApp -com.hack_computer.Sidetrack -org.chromium.Chromium -org.gnome.Calculator -org.gnome.Cheese -org.gnome.Contacts -org.gnome.Epiphany -org.gnome.FileRoller -org.gnome.Logs -org.gnome.Totem -org.gnome.Shotwell -org.gnome.font-viewer -org.gnome.gedit -org.libreoffice.LibreOffice -cc.arduino.arduinoide -com.endlessm.photos -com.endlessnetwork.aqueducts -com.endlessnetwork.dragonsapprentice -com.endlessnetwork.fablemaker -com.endlessnetwork.frogsquash -com.endlessnetwork.MidnightmareTeddy -com.endlessnetwork.missilemath -com.endlessnetwork.passage -com.endlessnetwork.tankwarriors -com.endlessnetwork.whitehouse -com.tux4kids.tuxmath -com.tux4kids.tuxtype -edu.mit.Scratch -io.lmms.LMMS -io.thp.numptyphysics -org.audacityteam.Audacity -org.blender.Blender -org.gimp.GIMP -org.gnome.Gnote -org.gnome.Rhythmbox3 -org.gnome.Weather -org.inkscape.Inkscape -org.kde.gcompris -org.laptop.TurtleArtActivity org.learningequality.Kolibri -org.pitivi.Pitivi -org.tuxpaint.Tuxpaint \ No newline at end of file