Remove testing packages and add nvidia-driver

Author: TriangularDev

Trixie/config/includes.chroot_after_packages/etc/trios/Install-GPU-Drivers.sh

@@ -1,18 +1,18 @@
 #!/bin/bash
 # ─────────────────────────────────────────────────────────────
-#  TriOS GPU Driver Installer (v6.1 - Hotfix)
-#  Safely installs and maintains up-to-date GPU drivers
-#  Supports all hybrid GPU setups (Intel+NVIDIA, AMD+NVIDIA, AMD+Intel)
+#  TriOS GPU Driver Installer (v7 - Compatibility)
+#  Safely installs GPU drivers
+#  Supports NVIDIA, AMD, Intel, and all hybrid combinations
 #  Designed for Debian 13 "Trixie" (Stable)
-#  Only GPU-related packages are allowed from Debian Testing
+#  No repositories added; installs GPU drivers directly
 # ─────────────────────────────────────────────────────────────
 
 set -e
 
-echo "=== TriOS GPU Driver Installer v6 ==="
+echo "=== TriOS GPU Driver Installer v7 ==="
 echo
 echo "Supports NVIDIA, AMD, Intel, and all hybrid combinations."
-echo "Stable base preserved; GPU drivers sourced safely from Testing."
+echo "No external repositories added, drivers installed directly."
 echo
 read -rp "Press any key to continue, or Ctrl+C to cancel... " -n1 -s
 echo -e "\n"
@@ -24,67 +24,11 @@ if [ "$EUID" -ne 0 ]; then
 fi
 
 # ─── Helper Functions ────────────────────────────────────────
-add_repo() {
-    local _file="$1"
-    local _marker="$2"
-    local _content="$3"
-    if ! grep -Rq "$_marker" /etc/apt/sources.list*; then
-        echo "[*] Adding repository: $_marker"
-        echo "$_content" > "/etc/apt/sources.list.d/${_file}.list"
-        _needs_update=true
-    fi
-}
-
-prompt_yn() {
-    local _prompt="$1"
-    read -rp "$_prompt [y/N]: " _ans
-    [[ "$_ans" =~ ^[Yy]$ ]]
-}
-
 install_pkg() {
     local _pkg="$1"
-    dpkg -s "$_pkg" &>/dev/null || apt-get install -y "$_pkg"
+    dpkg -s "$_pkg" &>/dev/null || apt-get install -y --install-recommends "$_pkg"
 }
 
-# ─── Enable 32-bit Multiarch ─────────────────────────────────
-if ! dpkg --print-foreign-architectures | grep -q i386; then
-    echo "[*] Enabling 32-bit multiarch support..."
-    dpkg --add-architecture i386
-    _needs_update=true
-fi
-
-# ─── Repositories ────────────────────────────────────────────
-echo "[*] Ensuring Debian repositories are configured..."
-
-add_repo "testing" "deb.debian.org/debian testing" \
-"deb http://deb.debian.org/debian testing main contrib non-free non-free-firmware"
-
-# ─── Strict APT Pinning ──────────────────────────────────────
-cat >/etc/apt/preferences.d/gpu-drivers.pref <<'EOF'
-# Default: Debian Stable (Trixie)
-Package: *
-Pin: release a=trixie
-Pin-Priority: 990
-
-# Testing disabled by default
-Package: *
-Pin: release a=testing
-Pin-Priority: 100
-
-# GPU packages allowed from Testing
-Package: nvidia-driver nvidia-settings nvidia-kernel-dkms libnvidia-gl* \
- libnvidia-egl* libnvidia-compute* libnvidia-encode* libnvidia-decode* \
- mesa* libgl1-mesa* libegl* libgbm* vulkan* firmware-amd* firmware-linux* \
- intel-media* xserver-xorg-video-intel libvulkan* libdrm* clinfo \
- amd64-microcode intel-microcode
-Pin: release a=testing
-Pin-Priority: 900
-EOF
-
-# ─── Update Once ─────────────────────────────────────────────
-apt-get update -y
-apt-get upgrade -y
-
 # ─── Base Utilities ──────────────────────────────────────────
 install_pkg pciutils
 install_pkg curl
@@ -115,50 +59,25 @@ install_nvidia() {
 
     echo "[*] Installing driver package: $_driver"
 
-    # Install all NVIDIA packages from Testing together to satisfy dependencies
-    apt-get install -y -t testing \
-        "$_driver" \
-        nvidia-driver-libs \
-        nvidia-driver-bin \
-        xserver-xorg-video-nvidia \
-        nvidia-alternative \
-        nvidia-vdpau-driver \
-        nvidia-persistenced \
-        nvidia-settings \
-        nvidia-smi \
-        nvidia-vulkan-icd \
-        libcuda1 libcuda1:i386 \
-        libegl-nvidia0 libegl-nvidia0:i386 \
-        libgl1-nvidia-glvnd-glx libgl1-nvidia-glvnd-glx:i386 \
-        libgles-nvidia1 libgles-nvidia1:i386 \
-        libgles-nvidia2 libgles-nvidia2:i386 \
-        libnvcuvid1 libnvcuvid1:i386 \
-        nvidia-kernel-dkms nvidia-kernel-support \
-        nvidia-modprobe \
-        console-setup console-setup-linux kbd keyboard-configuration || true
+    # Install the nvidia-driver package and other recommended NVIDIA packages
+    apt-get install -y --install-recommends nvidia-driver nvidia-driver-libs nvidia-driver-bin xserver-xorg-video-nvidia nvidia-settings nvidia-smi
 }
 
-
-
 install_amd() {
     echo "[*] Installing AMD drivers..."
-    apt-get install -y -t testing mesa-vulkan-drivers mesa-opencl-icd clinfo \
-        vulkan-validationlayers mesa-vulkan-drivers:i386 mesa-opencl-icd:i386 \
-        firmware-amd-graphics
+    apt-get install -y --install-recommends mesa-vulkan-drivers mesa-opencl-icd clinfo vulkan-validationlayers
 }
 
 install_intel() {
     echo "[*] Installing Intel drivers..."
-    apt-get install -y -t testing xserver-xorg-video-intel \
-        intel-media-va-driver-non-free intel-gpu-tools \
-        mesa-vulkan-drivers mesa-vulkan-drivers:i386
+    apt-get install -y --install-recommends xserver-xorg-video-intel intel-media-va-driver-non-free intel-gpu-tools mesa-vulkan-drivers
 }
 
 configure_hybrid() {
     echo "[*] Configuring hybrid GPU environment..."
 
-    # Always install hybrid control tools (nvidia-prime removed)
-    apt-get install -y switcheroo-control bbswitch-dkms
+    # Always install hybrid control tools
+    apt-get install -y --install-recommends switcheroo-control bbswitch-dkms
 
     # Detect combo type
     if $HAS_NVIDIA && $HAS_INTEL; then
@@ -174,7 +93,6 @@ configure_hybrid() {
 }
 
 # ─── Install in Safe Order ───────────────────────────────────
-# Mesa first, proprietary last
 if $HAS_INTEL; then install_intel; fi
 if $HAS_AMD; then install_amd; fi
 if $HAS_NVIDIA; then install_nvidia; fi
@@ -190,5 +108,5 @@ apt-get clean
 
 echo
 echo "=== GPU Driver Installation Complete ==="
-echo "Stable base preserved — hybrid setups configured automatically."
+echo "Hybrid setups configured automatically."
 echo "Reboot to apply changes."