From 31e8edd34ea44c9afa474ebadb9ba9a9b1c46d8f Mon Sep 17 00:00:00 2001
From: Simon Rieger <srieger@spectreos.de>
Date: Tue, 4 Oct 2022 19:55:42 +0200
Subject: [PATCH] [-] Remove nvidia by default

---
 arch-install.sh         | 4 ++--
 make_mksquashfs-auto.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch-install.sh b/arch-install.sh
index 7a14b1d..b0a354d 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -598,12 +598,12 @@ function installation {
     parameter="${parameter}keyboard fsck "
 
     if [ "${nvidia}" == "y" ]; then
-        echo "MODULES=\"amdgpu nvidia i915 radeon\"" > ${mountpoint}/etc/mkinitcpio.conf
+        echo "MODULES=\"amdgpu i915 nvidia\"" > ${mountpoint}/etc/mkinitcpio.conf
         echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "COMPRESSION=\"zstd\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "blacklist nouveau" > ${mountpoint}/etc/modprobe.d/blacklist-nouveau.conf
     else
-        echo "MODULES=\"amdgpu i915 radeon nouveau\"" > ${mountpoint}/etc/mkinitcpio.conf
+        echo "MODULES=\"amdgpu i915 nouveau\"" > ${mountpoint}/etc/mkinitcpio.conf
         echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "COMPRESSION=\"zstd\"" >> ${mountpoint}/etc/mkinitcpio.conf
     fi
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index eef1bcd..410486d 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+<#!/usr/bin/env bash
 #
 set -ex
 
@@ -95,7 +95,7 @@ function system() {
         echo "install dell-smbios /bin/false" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist-dell-smbios.conf
         
         # modules
-        echo "MODULES=\"amdgpu i915 radeon nvidia fuse loop\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+        echo "MODULES=\"amdgpu i915 nouveau fuse loop\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
         echo "HOOKS=\"base udev keyboard keymap consolefont modconf archiso block filesystems\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
         echo "COMPRESSION=\"zstd\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
     fi