From be73add71463edf0ccf3f9c2e7c0c97b6a993735 Mon Sep 17 00:00:00 2001
From: John Schmidt <john@schmidthaus.rocks>
Date: Sun, 10 Nov 2024 15:29:24 -0800
Subject: [PATCH 1/2] chore(fedora): Consolidate distrobox and toolbox images

---
 toolboxes/fedora-toolbox/Containerfile.fedora | 38 +++++++++++--
 toolboxes/fedora-toolbox/packages.fedora      | 53 +++++++++++++++++++
 2 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/toolboxes/fedora-toolbox/Containerfile.fedora b/toolboxes/fedora-toolbox/Containerfile.fedora
index 4af5b84..e480aa8 100644
--- a/toolboxes/fedora-toolbox/Containerfile.fedora
+++ b/toolboxes/fedora-toolbox/Containerfile.fedora
@@ -1,14 +1,42 @@
-FROM ghcr.io/ublue-os/fedora-distrobox:latest
-# From https://github.com/ublue-os/fedora-distrobox
+FROM registry.fedoraproject.org/fedora-toolbox:40 AS fedora-toolbox
 
 LABEL com.github.containers.toolbox="true" \
       usage="This image is meant to be used with the toolbox or distrobox command" \
       summary="A cloud-native terminal experience powered by Fedora" 
 
-COPY ./toolboxes/fedora-toolbox/packages.fedora /toolbox-packages
+COPY ./toolboxes/fedora-toolbox/packages.fedora /tmp/toolbox-packages
 
 RUN dnf -y upgrade && \
-    dnf -y install $(<toolbox-packages) && \
+    dnf -y install $(<tmp/toolbox-packages) && \
     dnf clean all
 
-RUN rm /toolbox-packages
+# Set up dependencies
+RUN git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox && \
+    cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec && \
+    wget https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -O /usr/bin/host-spawn && \
+    chmod +x /usr/bin/host-spawn && \
+    rm -drf /tmp/distrobox && \
+    dnf install -y 'dnf-command(copr)' && \
+    dnf clean all
+
+# Set up cleaner Distrobox integration
+RUN dnf copr enable -y kylegospo/distrobox-utils && \
+    dnf install -y \
+    xdg-utils-distrobox \
+    adw-gtk3-theme && \
+    ln -s /usr/bin/distrobox-host-exec /usr/bin/flatpak && \
+    dnf clean all
+
+# Install RPMFusion for hardware accelerated encoding/decoding
+RUN dnf install -y \
+    "https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm" \
+    "https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm" && \
+    dnf install -y \
+    intel-media-driver \
+    nvidia-vaapi-driver && \
+    dnf swap -y mesa-va-drivers mesa-va-drivers-freeworld && \
+    dnf swap -y mesa-vdpau-drivers mesa-vdpau-drivers-freeworld && \
+    dnf clean all
+
+# Cleanup
+RUN rm -rf /tmp/*
diff --git a/toolboxes/fedora-toolbox/packages.fedora b/toolboxes/fedora-toolbox/packages.fedora
index 2652bf7..a2fa95c 100644
--- a/toolboxes/fedora-toolbox/packages.fedora
+++ b/toolboxes/fedora-toolbox/packages.fedora
@@ -1,2 +1,55 @@
+dnf5
+bash-completion
+bc
+bzip2
+curl
+diffutils
+dnf-plugins-core
+findutils
+fish
+glibc-all-langpacks
+glibc-locale-source
+gnupg2
+gnupg2-smime
+hostname
+iproute
+iputils
+keyutils
+krb5-libs
+less
+lsof
+man-db
+man-pages
+mtr
+ncurses
+nss-mdns
+openssh-clients
+pam
+passwd
+pigz
+pinentry
+procps-ng
+rsync
+shadow-utils
+sudo
+tcpdump
+time
+traceroute
+tree
+tzdata
+unzip
+util-linux
+vte-profile
+wget
+which
+whois
+words
+xorg-x11-xauth
+xz
+zip
+mesa-dri-drivers
+mesa-vulkan-drivers
+vulkan
+zsh
 vim
 ripgrep

From 7b5ba3f626f2ffb3cb9781277af564acc1bfc74f Mon Sep 17 00:00:00 2001
From: John Schmidt <john@schmidthaus.rocks>
Date: Tue, 12 Nov 2024 23:17:47 -0800
Subject: [PATCH 2/2] chore(fedora): Update image to F41

---
 toolboxes/fedora-toolbox/Containerfile.fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolboxes/fedora-toolbox/Containerfile.fedora b/toolboxes/fedora-toolbox/Containerfile.fedora
index e480aa8..5872e57 100644
--- a/toolboxes/fedora-toolbox/Containerfile.fedora
+++ b/toolboxes/fedora-toolbox/Containerfile.fedora
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora-toolbox:40 AS fedora-toolbox
+FROM registry.fedoraproject.org/fedora-toolbox:41 AS fedora-toolbox
 
 LABEL com.github.containers.toolbox="true" \
       usage="This image is meant to be used with the toolbox or distrobox command" \