FEAT: merge nvidia changes from 42

Containerfile

@@ -1,7 +1,7 @@
 FROM scratch AS ctx
 COPY build_files /
 
-FROM ghcr.io/ublue-os/base-main:42
+FROM ghcr.io/ublue-os/base-main:43
 
 RUN rm -r /opt && mkdir /opt
 

README.md

@@ -54,12 +54,8 @@ It is possible to keep a revision by pinning it: `ostree admin pin 0`
 - ffmpeg
 - pandoc
 - ansible
-- sqlite
-- netcat
-- tor & torbrowser-launcher
 - Flatpak (with default repository configured)
 - Chromium
-- Veracrypt
 - VSCode
 - NVIDIA Drivers
 

build_files/build.sh

@@ -8,7 +8,7 @@ dnf5 update -y --setopt=install_weak_deps=False
 dnf5 install -y man-pages man-db glibc-langpack-en glibc-langpack-de plymouth
 dnf5 install -y --setopt=exclude=gnome-tour,malcontent-control gnome-shell gnome-keyring gnome-keyring-pam gnome-bluetooth gnome-terminal nautilus seahorse evolution totem gstreamer1-plugin-libav gnome-extensions-app gnome-browser-connector gnome-shell-extension-appindicator
 dnf5 install -y gnome-calculator gnome-disk-utility gnome-backgrounds
-dnf5 install -y curl git btop nvtop tmux flatpak pciutils tailscale make fzf direnv xsel chromium pandoc-common pandoc-pdf texlive-collection-langgerman ansible-core ansible-collection-community-general vlc sqlite netcat tor torbrowser-launcher
+dnf5 install -y curl git btop nvtop tmux flatpak pciutils tailscale make fzf direnv xsel chromium 7zip pandoc-common pandoc-pdf texlive-collection-langgerman ansible-core ansible-collection-community-general vlc
 git clone https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator.git /usr/share/gnome-shell/extensions/clipboard-indicator@tudmotu.com
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 echo "LANG=de_DE.UTF-8" >> /etc/default/locale
@@ -21,7 +21,8 @@ curl -fsSLo /etc/yum.repos.d/vscode.repo https://packages.microsoft.com/yumrepos
 rpm-ostree install code
 rm /etc/yum.repos.d/vscode.repo
 
-# Install Veracrypt: https://veracrypt.io/en/Downloads.html
-curl -fsSLo /tmp/veracrypt.rpm "https://launchpad.net/veracrypt/trunk/1.26.24/+download/veracrypt-1.26.24-Fedora-40-x86_64.rpm"
-rpm-ostree install -y /tmp/veracrypt.rpm
-rm /tmp/veracrypt.rpm
+dnf5 install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
+                https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+dnf5 install -y --allowerasing ffmpeg x265-libs
+dnf5 remove  -y rpmfusion-free-release rpmfusion-nonfree-release
+dnf5 clean all

build_files/nvidia.sh

@@ -5,7 +5,7 @@ echo "::group:: ===$(basename "$0")==="
 
 # Set Variables
 export AKMODS_FLAVOR=main
-export KERNEL="6.17.9-200.fc42.x86_64"
+export KERNEL="6.17.9-300.fc43.x86_64"
 export IMAGE_NAME=""
 
 set -eoux pipefail
@@ -53,7 +53,7 @@ if ! grep -q negativo17 <(rpm -qi mesa-dri-drivers); then
 fi
 
 # Install Nvidia RPMs
-curl -sSL "https://raw.githubusercontent.com/ublue-os/main/0454e5857ac43c47e8d0b365a1c6a3912a5f9859/build_files/nvidia-install.sh" -o /tmp/nvidia-install.sh
+curl -sSL "https://raw.githubusercontent.com/ublue-os/main/main/build_files/nvidia-install.sh" -o /tmp/nvidia-install.sh
 chmod +x /tmp/nvidia-install.sh
 /tmp/nvidia-install.sh
 rm -f /usr/share/vulkan/icd.d/nouveau_icd.*.json

build_files/os-release

@@ -2,4 +2,4 @@ NAME="ManInDark bootc Linux"
 ID=manindark-linux
 PRETTY_NAME="ManInDark's bootc Linux"
 VARIANT_ID=desktop
-VERSION_ID=42
+VERSION_ID=43