From f66c0bd2763e56c3cb3c78208d5b18911d03ffd8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 19 Jan 2024 00:16:10 +0100
Subject: [PATCH] chore(just): cleanup in prep for just reorg in
 ublue-os/config (#817)

Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>
---
 dx/usr/etc/distrobox/distrobox.ini              | 15 ---------------
 just/custom.just                                | 17 +++++++++--------
 .../{distrobox.ini => distrobox.example}        |  0
 3 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 dx/usr/etc/distrobox/distrobox.ini
 rename usr/etc/distrobox/{distrobox.ini => distrobox.example} (100%)

diff --git a/dx/usr/etc/distrobox/distrobox.ini b/dx/usr/etc/distrobox/distrobox.ini
deleted file mode 100644
index 79dcb567878..00000000000
--- a/dx/usr/etc/distrobox/distrobox.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[ubuntu]
-image=ghcr.io/ublue-os/ubuntu-toolbox:latest
-init=false
-nvidia=false
-pull=true
-root=false
-replace=true
-
-[fedora]
-image=ghcr.io/ublue-os/fedora-toolbox:latest
-init=false
-nvidia=false
-pull=true
-root=false
-replace=true
diff --git a/just/custom.just b/just/custom.just
index c5c0a11f6c5..d117ffd06fe 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -5,11 +5,6 @@ benchmark:
     echo 'Running a 1 minute benchmark ...'
     stress-ng --matrix 0 -t 1m --times
 
-# Assemble distrobox containers
-assemble:
-    echo 'Assembling and replacing distroboxes ...'
-    distrobox assemble create --replace --file /etc/distrobox/distrobox.ini
-
 # Install aqua | https://aquaproj.github.io
 aqua:
     #!/usr/bin/env bash
@@ -92,18 +87,24 @@ devmode:
 
 # Assemble a Pytorch distrobox (Nvidia only)
 distrobox-mlbox:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
     echo 'Assembling pytorch-nvidia mlbox distrobox ...'
-    distrobox assemble create --file /usr/share/ublue-os/distrobox/pytorch-nvidia.ini
+    AssembleList create "/usr/share/ublue-os/distrobox/pytorch-nvidia.ini" "mlbox"
 
 # Create a Wolfi OS container | https://github.com/wolfi-dev
 distrobox-wolfi:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
     echo 'Creating WolfiOS distrobox ...'
-    distrobox create --image ghcr.io/ublue-os/wolfi-toolbox:latest -n wolfi
+    Distrobox "ghcr.io/ublue-os/wolfi-toolbox:latest" "wolfi"
 
 # Create a universal developer container
 distrobox-universal:
+    #!/usr/bin/bash
+    source /usr/lib/ujust/ujust.sh
     echo 'Creating Universal Development distrobox ...'
-    distrobox create --image mcr.microsoft.com/devcontainers/universal:latest -n universal -Y
+    Distrobox "mcr.microsoft.com/devcontainers/universal:latest" "universal"
 
 # Switch to the fish shell
 fish:
diff --git a/usr/etc/distrobox/distrobox.ini b/usr/etc/distrobox/distrobox.example
similarity index 100%
rename from usr/etc/distrobox/distrobox.ini
rename to usr/etc/distrobox/distrobox.example