Merge branch 'main' into niri-tiling-compositor

build_files/build.sh

@@ -5,6 +5,10 @@ set -ouex pipefail
 # Copy System Files onto root
 rsync -rvK /ctx/sys_files/ /
 
+# Copy cosign.pub key into the right location
+mkdir -p /etc/pki/containers
+cp /ctx/cosign.pub /etc/pki/containers/davejansen.pub
+
 ### Install packages
 
 # Packages can be installed from any enabled yum repo on the image.
@@ -27,8 +31,9 @@ fi
 # Set higher priority
 dnf5 config-manager setopt fedora-multimedia.priority=90
 
-# Remove system-installed Firefox as I prefer to use the Flatpak version
-dnf5 remove -y firefox firefox-langpacks fedora-flathub-remote
+# Remove Fedora's package that enforces their own (filtered) version of the
+# flathub repo is present, as-well as the system-installed Firefox as I prefer to use the Flatpak version
+dnf5 remove -y fedora-flathub-remote firefox firefox-langpacks
 
 # Add Flathub to the image for eventual application
 mkdir -p /etc/flatpak/remotes.d/
@@ -55,12 +60,15 @@ dnf5 distro-sync --skip-unavailable -y --repo='fedora-multimedia' "${OVERRIDES[@
 dnf5 versionlock add "${OVERRIDES[@]}"
 
 # Remove additional repositories Fedora comes with out of the box
+# And don't raise an error if any of these files does not exist when attempting
+# to delete them.
 rm \
   /etc/yum.repos.d/fedora-cisco-openh264.repo \
   /etc/yum.repos.d/google-chrome.repo \
   /etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
   /etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
-  /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo
+  /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
+  2>&1
 
 # Add country query to all repo metalinks
 # shellcheck disable=SC2016
@@ -82,6 +90,7 @@ sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.
 
 # Install my own layered packages
 dnf5 install -y \
+  fish \
   gvfs-nfs \
   openssl \
   wl-clipboard \
@@ -90,7 +99,9 @@ dnf5 install -y \
   libcamera libcamera-gstreamer libcamera-ipa libcamera-tools pipewire-plugin-libcamera \
   gnome-shell-extension-appindicator \
   1password 1password-cli \
-  tailscale
+  tailscale \
+  waypipe \
+  htop
 
 # Install Niri, the scrollable-tiling window compositor
 # https://yalter.github.io/niri/
@@ -105,12 +116,14 @@ dnf5 -y copr disable avengemedia/dms
 ## CLEANUP
 
 # Delete 1Password and Tailscale repos once packages are installed
-# so they don't end up in the final image.
+# so they don't end up in the final image, and don't raise an error if any of
+# these files does not exist when attempting to delete them.
 rm \
   /etc/yum.repos.d/1password.repo \
   /etc/yum.repos.d/tailscale.repo \
   /etc/pki/rpm-gpg/1password.asc \
-  /etc/pki/rpm-gpg/tailscale.gpg
+  /etc/pki/rpm-gpg/tailscale.gpg \
+  2>&1
 
 # Or just disable:
 # dnf5 config-manager setopt 1password.enabled=0 tailscale-stable.enabled=0