[pull] main from bluefin-main

.github/workflows/build.yml

@@ -185,3 +185,12 @@ jobs:
         if: github.event_name != 'pull_request'
         run: |
           echo "${{ toJSON(steps.push.outputs) }}"
+
+  check:
+    name: Check all builds successful
+    runs-on: ubuntu-latest
+    needs: [push-ghcr]
+    steps:
+      - name: Exit
+        shell: bash
+        run: exit 0

Containerfile

@@ -28,6 +28,12 @@ RUN wget https://copr.fedorainfracloud.org/coprs/rhcontainerbot/bootc/repo/fedor
 RUN rpm-ostree install bootc
 RUN rm -f /etc/yum.repos.d/bootc-"${FEDORA_MAJOR_VERSION}".repo
 
+# Starship Shell Prompt
+RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases/latest/download/starship-x86_64-unknown-linux-gnu.tar.gz" && \
+  tar -xzf /tmp/starship.tar.gz -C /tmp && \
+  install -c -m 0755 /tmp/starship /usr/bin && \
+  echo 'eval "$(starship init bash)"' >> /etc/bashrc
+
 RUN /tmp/build.sh && \
     pip install --prefix=/usr yafti && \
     systemctl enable rpm-ostree-countme.service && \
@@ -92,8 +98,6 @@ RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr
     wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubens -O /usr/bin/kubens && \
     chmod +x /usr/bin/kubectx /usr/bin/kubens
 
-
-
 RUN systemctl enable podman.socket
 RUN systemctl disable pmie.service
 RUN systemctl disable pmlogger.service

packages.json

@@ -111,7 +111,9 @@
 	},
 	"39": {
 		"include": {
-			"bluefin": [],
+			"bluefin": [
+				"input-leap"	
+			],
 			"bluefin-dx": [],
 			"bluefin-framework": []
 		},

toolboxes/Containerfile.wolfi

@@ -8,9 +8,51 @@ LABEL com.github.containers.toolbox="true" \
 
 COPY ./toolboxes/packages.wolfi /toolbox-packages
 
+# Update image & add dependencies
 RUN apk update && \
-    apk upgrade && \
-    grep -v '^#' /toolbox-packages | xargs apk add
+    apk upgrade
+
+# Add Distrobox specific packages
+# Remove procps due to conflict with coreutils
+RUN apk del procps && \
+    apk add sudo-rs \
+        coreutils \
+        bash \
+        bzip2 \
+        curl \
+        diffutils \
+        findmnt \
+        findutils \
+        git \
+        gpg \
+        iproute2 \
+        iputils \
+        keyutils \
+        libcap \
+        ncurses \
+        ncurses-terminfo \
+        net-tools \
+        openssh-client \
+        posix-libc-utils \
+        rsync \
+        tcpdump \
+        tree \
+        umount \
+        util-linux \
+        util-linux-misc \
+        wget \
+        xz \
+        zip
+
+# 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 && \
+
+# Add optional packages
+RUN grep -v '^#' /toolbox-packages | xargs apk add
 
 RUN rm /toolbox-packages
 

usr/etc/distrobox/distrobox.ini

@@ -3,7 +3,7 @@ image=ghcr.io/bobslept/ubuntu-toolbox:latest
 #additional_packages=" " 
 #export=" "
 init=false
-nvidia=false
+nvidia=true
 pull=true
 root=false
 replace=true
@@ -15,19 +15,19 @@ replace=true
 # See https://distrobox.privatedns.org/usage/distrobox-assemble/
 
 #[fedora]
-#image=registry.fedoraproject.org/fedora-toolbox:latest
+#image=ghcr.io/ublue-os/fedora-toolbox:latest
 #additional_packages="ansible lynx chromium neofetch cmus"
 #export="app chromium"
 #init=false
-#nvidia=false
+#nvidia=true
 #pull=true
 #root=false
 #replace=true
 
 #[wolfi]
 #image=ghcr.io/ublue-os/wolfi-toolbox:latest
 #init=false
-#nvidia=false
+#nvidia=true
 #pull=true
 #root=false
 #replace=true

usr/share/ublue-os/just/custom.just → usr/share/ublue-os/just/60-custom.just

@@ -1,3 +1,5 @@
+# vim: set ft=make :
+
 # Run a one minute system benchmark
 benchmark:
   echo 'Running a 1 minute benchmark ...'
@@ -103,10 +105,6 @@ distrobox-universal:
   echo 'Creating Universal Development distrobox ...'
   distrobox create --image mcr.microsoft.com/devcontainers/universal:latest -n universal -Y
 
-# Add boot parameters needed for a Framework 13 laptop
-framework-13:
-  rpm-ostree kargs --append="module_blacklist=hid_sensor_hub" --append="nvme.noacpi=1" --append="tpm_tis.interrupts=0" --append="rd.luks.options=discard"
-
 # Switch to the fish shell
 fish:
   sudo lchsh $USER /usr/bin/fish 
@@ -198,7 +196,7 @@ distrobox-git:
 
 # Run the yafti setup tool
 yafti:
-  yafti /etc/yafti.yml
+  yafti /etc/yafti.yml --force
 
 # Switch to the zsh shell
 zsh: