From 2870a5aaf154dd33ae1d8592dc2ad8a3e75a6021 Mon Sep 17 00:00:00 2001
From: joshua-stone <joshua.gage.stone@gmail.com>
Date: Mon, 6 Mar 2023 23:38:05 -0500
Subject: [PATCH] feat: Add justfile support (#58)

---
 Containerfile |  6 ++++++
 justfile      | 30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 justfile

diff --git a/Containerfile b/Containerfile
index 9ac1a28..94ec19d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -16,6 +16,10 @@ RUN rpm-ostree install \
         akmods mock \
         xorg-x11-drv-$(cat /tmp/nvidia-package-name.txt)-{,cuda,devel,kmodsrc,power}*:${NVIDIA_MAJOR_VERSION}.*.fc$(rpm -E '%fedora.%_arch')
 
+COPY --from=ghcr.io/ublue-os/config:latest /build /tmp/build
+COPY justfile /tmp/build/ublue-os-just/justfile
+RUN /tmp/build/ublue-os-just/build.sh
+
 
 # alternatives cannot create symlinks on its own during a container build
 RUN ln -s /usr/bin/ld.bfd /etc/alternatives/ld && ln -s /etc/alternatives/ld /usr/bin/ld
@@ -71,6 +75,7 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}
 
 ARG IMAGE_NAME="${IMAGE_NAME}"
 
+COPY --from=builder /tmp/ublue-os /tmp/ublue-os
 COPY --from=builder /var/cache/akmods /tmp/akmods
 COPY --from=builder /tmp/ublue-os-nvidia-addons /tmp/ublue-os-nvidia-addons
 
@@ -88,6 +93,7 @@ RUN KERNEL_VERSION="$(rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}
             nvidia-container-toolkit nvidia-vaapi-driver \
             "/tmp/akmods/${NVIDIA_PACKAGE_NAME}/kmod-${NVIDIA_PACKAGE_NAME}-${KERNEL_VERSION}-${NVIDIA_FULL_VERSION#*:}.rpm" \
             /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons-*.rpm \
+            /tmp/ublue-os/rpmbuild/RPMS/noarch/ublue-os-just-*.noarch.rpm \
     && \
         mv /etc/nvidia-container-runtime/config.toml{,.orig} && \
         cp /etc/nvidia-container-runtime/config{-rootless,}.toml \
diff --git a/justfile b/justfile
new file mode 100644
index 0000000..2acb233
--- /dev/null
+++ b/justfile
@@ -0,0 +1,30 @@
+default:
+    @just --list
+
+set-kargs:
+    rpm-ostree kargs \
+        --append=rd.driver.blacklist=nouveau \
+        --append=modprobe.blacklist=nouveau \
+        --append=nvidia-drm.modeset=1
+
+enroll-secure-boot-key:
+    sudo mokutil --import /etc/pki/akmods/certs/akmods-nvidia.der
+
+test-cuda:
+    podman run \
+        --user 1000:1000 \
+        --security-opt=no-new-privileges \
+        --cap-drop=ALL \
+        --security-opt label=type:nvidia_container_t  \
+        docker.io/mirrorgooglecontainers/cuda-vector-add:v0.1
+
+setup-firefox-flatpak-vaapi:
+    flatpak override \
+        --user \
+        --filesystem=host-os \
+        --env=LIBVA_DRIVER_NAME=nvidia \
+        --env=LIBVA_DRIVERS_PATH=/run/host/usr/lib64/dri \
+        --env=LIBVA_MESSAGING_LEVEL=1 \
+        --env=MOZ_DISABLE_RDD_SANDBOX=1 \
+        --env=NVD_BACKEND=direct \
+        org.mozilla.firefox