From ddc1ff63afdf6a0faaefeda89d7b88fe7ef0de99 Mon Sep 17 00:00:00 2001
From: karasu <karasu@antergos.com>
Date: Wed, 16 Nov 2016 12:24:37 +0100
Subject: [PATCH] Do not setup a 20-nvidia.conf file. Do not install
 xf86-video-nouveau when installing nvidia.

---
 cnchi/hardware/nvidia.py       | 11 ++---------
 cnchi/hardware/nvidia_304xx.py | 11 ++---------
 cnchi/hardware/nvidia_340xx.py | 11 ++---------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/cnchi/hardware/nvidia.py b/cnchi/hardware/nvidia.py
index 9abd0d12c..9b09c71a7 100644
--- a/cnchi/hardware/nvidia.py
+++ b/cnchi/hardware/nvidia.py
@@ -109,7 +109,7 @@ def get_packages():
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl"]
+        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
         if os.uname()[-1] == "x86_64":
             pkgs.append("lib32-mesa-libgl")
         return pkgs
@@ -117,14 +117,7 @@ def get_conflicts():
     @staticmethod
     def post_install(dest_dir):
         """ Post install commands """
-        path = os.path.join(dest_dir, "etc/X11/xorg.conf.d/20-nvidia.conf")
-        with open(path, 'w') as nvidia:
-            nvidia.write('Section "Device"\n')
-            nvidia.write('    Identifier "Nvidia Card"\n')
-            nvidia.write('    Driver "nvidia"\n')
-            nvidia.write('    VendorName "NVIDIA Corporation"\n')
-            nvidia.write('    Option "NoLogo" "true"\n')
-            nvidia.write('EndSection\n')
+        pass
 
     @staticmethod
     def is_proprietary():
diff --git a/cnchi/hardware/nvidia_304xx.py b/cnchi/hardware/nvidia_304xx.py
index 8cac56998..2f291a992 100644
--- a/cnchi/hardware/nvidia_304xx.py
+++ b/cnchi/hardware/nvidia_304xx.py
@@ -145,7 +145,7 @@ def get_packages():
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl"]
+        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
         if os.uname()[-1] == "x86_64":
             pkgs.append("lib32-mesa-libgl")
         return pkgs
@@ -153,14 +153,7 @@ def get_conflicts():
     @staticmethod
     def post_install(dest_dir):
         """ Post install commands """
-        path = os.path.join(dest_dir, "etc/X11/xorg.conf.d/20-nvidia.conf")
-        with open(path, 'w') as nvidia:
-            nvidia.write('Section "Device"\n')
-            nvidia.write('    Identifier "Nvidia Card"\n')
-            nvidia.write('    Driver "nvidia"\n')
-            nvidia.write('    VendorName "NVIDIA Corporation"\n')
-            nvidia.write('    Option "NoLogo" "true"\n')
-            nvidia.write('EndSection\n')
+        pass
 
     @staticmethod
     def is_proprietary():
diff --git a/cnchi/hardware/nvidia_340xx.py b/cnchi/hardware/nvidia_340xx.py
index 2cd9a7f2c..f89f2dd83 100644
--- a/cnchi/hardware/nvidia_340xx.py
+++ b/cnchi/hardware/nvidia_340xx.py
@@ -143,7 +143,7 @@ def get_packages():
     @staticmethod
     def get_conflicts():
         """ Get conflicting packages """
-        pkgs = ["mesa-libgl"]
+        pkgs = ["mesa-libgl", "xf86-video-nouveau"]
         if os.uname()[-1] == "x86_64":
             pkgs.append("lib32-mesa-libgl")
         return pkgs
@@ -151,14 +151,7 @@ def get_conflicts():
     @staticmethod
     def post_install(dest_dir):
         """ Post install commands """
-        path = os.path.join(dest_dir, "etc/X11/xorg.conf.d/20-nvidia.conf")
-        with open(path, 'w') as nvidia:
-            nvidia.write('Section "Device"\n')
-            nvidia.write('    Identifier "Nvidia Card"\n')
-            nvidia.write('    Driver "nvidia"\n')
-            nvidia.write('    VendorName "NVIDIA Corporation"\n')
-            nvidia.write('    Option "NoLogo" "true"\n')
-            nvidia.write('EndSection\n')
+        pass
 
     @staticmethod
     def is_proprietary():