From 90adea60f636e42c82e2fe3e5170afcebe96caa3 Mon Sep 17 00:00:00 2001
From: Sneexy <sneexy@disroot.org>
Date: Wed, 3 Apr 2024 10:27:18 -0500
Subject: [PATCH] feat: add more packages to fedora and ubuntu image

---
 toolboxes/fedora-toolbox/Containerfile.fedora | 24 +++++++++++++++----
 toolboxes/fedora-toolbox/packages.fedora      |  2 --
 toolboxes/ubuntu-toolbox/Containerfile.ubuntu |  4 +++-
 3 files changed, 23 insertions(+), 7 deletions(-)
 delete mode 100644 toolboxes/fedora-toolbox/packages.fedora

diff --git a/toolboxes/fedora-toolbox/Containerfile.fedora b/toolboxes/fedora-toolbox/Containerfile.fedora
index 257ccfb..3790edb 100644
--- a/toolboxes/fedora-toolbox/Containerfile.fedora
+++ b/toolboxes/fedora-toolbox/Containerfile.fedora
@@ -1,9 +1,25 @@
 FROM ghcr.io/ublue-os/fedora-distrobox:latest
 
-COPY ./toolboxes/fedora-toolbox/packages.fedora /toolbox-packages
-
+# Install decent selection of Modern Unix utilities, then random useful utilities
 RUN dnf -y upgrade && \
-    dnf -y install $(<toolbox-packages) && \
+    dnf -y install \
+	bat \
+	duf \
+	fd-find \
+	fzf \
+	git-delta \
+	lsd \
+	neovim \
+	ripgrep \
+	sd \
+	p7zip \
+	unrar-free \
+	zoxide \
+	yt-dlp && \
     dnf clean all
 
-RUN rm /toolbox-packages
+RUN   ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/git && \
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \ 
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree
diff --git a/toolboxes/fedora-toolbox/packages.fedora b/toolboxes/fedora-toolbox/packages.fedora
deleted file mode 100644
index 2652bf7..0000000
--- a/toolboxes/fedora-toolbox/packages.fedora
+++ /dev/null
@@ -1,2 +0,0 @@
-vim
-ripgrep
diff --git a/toolboxes/ubuntu-toolbox/Containerfile.ubuntu b/toolboxes/ubuntu-toolbox/Containerfile.ubuntu
index 6e6c3e3..bae9ea1 100644
--- a/toolboxes/ubuntu-toolbox/Containerfile.ubuntu
+++ b/toolboxes/ubuntu-toolbox/Containerfile.ubuntu
@@ -15,6 +15,7 @@ RUN apt-get update && apt-get upgrade -y && \
     apt-get update && apt-get upgrade -y && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \
 	codium \
+	cargo \
 	adb \
 	fastboot && \
     rm -rd /var/lib/apt/lists/*
@@ -23,7 +24,8 @@ COPY ./toolboxes/ubuntu-toolbox/files /
 
 RUN rm /toolbox-packages
 
-RUN   ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
+RUN   ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/git && \
+      ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak && \ 
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman && \
       ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree