From cede02596274a50ff179760b26f82bb7010bb73a Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 2 Jun 2018 00:01:15 +0200
Subject: [PATCH] nouveau_fix

---
 arch-install            |  2 +-
 make_mksquashfs-auto.sh |  2 +-
 packages_libre.txt      | 27 +++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/arch-install b/arch-install
index c10f213..af1e8ae 100755
--- a/arch-install
+++ b/arch-install
@@ -361,7 +361,7 @@ function installation {
 
     echo ""
     if [ "${version}" == "libre" ] || [ "${version}" == "manjaro" ]; then
-        echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
+        echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${mountpoint}/etc/mkinitcpio.conf
         echo "HOOKS=\"${parameter}\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "COMPRESSION=\"lz4\"" >> ${mountpoint}/etc/mkinitcpio.conf
         echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${mountpoint}/etc/mkinitcpio.conf
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index d77d9a8..7e74fea 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -141,7 +141,7 @@ function system() {
             echo "blacklist nouveau" > ${work_dir}/${arch}/airootfs/etc/modprobe.d/blacklist_nouveau.conf
 
             if [ "${version}" == "libre" ] || [ "${version}" == "lite" ] || [ "${version}" == "manjaro" ]; then
-                echo "MODULES=\"i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
+                echo "MODULES=\"nouveau i915 radeon ata_generic ata_piix nls_cp437 vfat ext4 btrfs\"" > ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "HOOKS=\"base udev archiso block filesystems keyboard plymouth\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "COMPRESSION=\"lz4\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
                 echo "FILES=\"/etc/modprobe.d/blacklist-floppy.conf\"" >> ${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf
diff --git a/packages_libre.txt b/packages_libre.txt
index 57414e2..a42e6af 100644
--- a/packages_libre.txt
+++ b/packages_libre.txt
@@ -937,3 +937,30 @@ zlib
 zsh
 zstd
 zvbi
+lib32-libxxf86vm
+libxxf86misc
+libxxf86vm
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-keyboard
+xf86-input-libinput
+xf86-input-mouse
+xf86-input-void
+packages_gnome.txt:lib32-libxxf86vm
+packages_gnome.txt:libxxf86misc
+packages_gnome.txt:libxxf86vm
+packages_gnome.txt:xf86-input-elographics
+packages_gnome.txt:xf86-input-evdev
+packages_gnome.txt:xf86-input-keyboard
+packages_gnome.txt:xf86-input-libinput
+packages_gnome.txt:xf86-input-mouse
+packages_gnome.txt:xf86-input-void
+packages_xfce4.txt:lib32-libxxf86vm
+packages_xfce4.txt:libxxf86misc
+packages_xfce4.txt:libxxf86vm
+packages_xfce4.txt:xf86-input-elographics
+packages_xfce4.txt:xf86-input-evdev
+packages_xfce4.txt:xf86-input-keyboard
+packages_xfce4.txt:xf86-input-libinput
+packages_xfce4.txt:xf86-input-mouse
+packages_xfce4.txt:xf86-input-void