cleaning up config file

Containerfile

@@ -2,18 +2,33 @@ ARG FEDORA_VERSION="39"
 
 FROM quay.io/fedora-ostree-desktops/silverblue:${FEDORA_VERSION} as silverblue-base
 
-RUN mkdir /tmp/build
-COPY scripts/ /tmp/build/
 COPY etc/ /etc/
-
-RUN /tmp/build/remove-packages.sh base && \
-/tmp/build/add-packages.sh base && \
-sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
-systemctl enable rpm-ostreed-automatic.timer && \
+COPY scripts/install-fonts.sh /tmp/
+RUN mkdir -p /usr/share/andyrusiecki
+COPY scripts/post-install.sh /usr/share/andyrusiecki
+
+RUN rpm-ostree install \
+  https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${FEDORA_VERSION}.noarch.rpm \
+  https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${FEDORA_VERSION}.noarch.rpm
+
+RUN rpm-ostree override remove \
+firefox \
+firefox-langpacks
+
+RUN rpm-ostree install \
+adw-gtk3-theme \
+distrobox \
+fish \
+gnome-tweaks \
+starship \
+steam-devices \
+tailscale
+
+RUN systemctl enable rpm-ostreed-automatic.timer && \
 systemctl enable tailscaled
 
-RUN /tmp/build/install-google-fonts.sh base && \
-/tmp/build/install-nerd-fonts.sh base
+RUN /tmp/install-google-fonts.sh base && \
+/tmp/install-nerd-fonts.sh base
 
 RUN rpm-ostree cleanup -m && \
 rm -rf /tmp/* && \
@@ -22,17 +37,21 @@ ostree container commit
 
 FROM silverblue-base as silverblue-framework
 
-RUN mkdir /tmp/build
-COPY scripts/ /tmp/build/
 COPY framework/etc/ /etc/
 
-RUN /tmp/build/remove-packages.sh framework && \
-/tmp/build/add-packages.sh framework && \
-systemctl enable fprintd && \
+RUN rpm-ostree override remove \
+power-profiles-daemon
+
+RUN rpm-ostree install \
+fprintd \
+tlp \
+tlp-rdw \
+powertop
+
+RUN systemctl enable fprintd && \
 systemctl enable tlp
 
 RUN rpm-ostree cleanup -m && \
-rm -rf /tmp/* && \
 ostree container commit
 
 FROM registry.fedoraproject.org/fedora-toolbox:${FEDORA_VERSION} as dev-toolbox

scripts/install-fonts.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+google_fonts=()
+nerd_fonts=(
+  FireCode
+  FireMono
+  JetBrainsMono
+  Meslo
+  Noto
+  RobotoMono
+  SourceCodePro
+  Ubuntu
+  UbuntuMono
+)
+
+
+mkdir -p /usr/share/fonts/google
+mkdir -p /usr/share/fonts/nerd
+
+google_tmp=$(mktemp -d)
+for font in ${google_fonts[@]}
+do
+  curl -L https://fonts.google.com/download?family=${font// /%20}.zip --output $google_tmp/$font.zip
+  unzip $google_tmp/$font.zip -d /usr/share/fonts/google/$font/
+done
+
+rm -rf $google_tmp
+
+nerd_tmp=$(mktemp -d)
+for font in ${nerd_fonts[@]}
+do
+  curl -L https://github.com/ryanoasis/nerd-fonts/releases/latest/download/$font.zip --output $nerd_tmp/$font.zip
+  unzip $nerd_tmp/$font.zip -d /usr/share/fonts/nerd/$font/
+done
+
+rm -rf $nerd_tmp