Do not setup a 20-nvidia.conf file. Do not install xf86-video-nouveau…

… when installing nvidia.
Antergos · Nov 16, 2016 · ddc1ff6 · ddc1ff6 · karasu · Nov 16, 2016
1 parent 03cbdc5
commit ddc1ff6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 27 deletions.
diff --git a/cnchi/hardware/nvidia.py b/cnchi/hardware/nvidia.py
@@ -109,22 +109,15 @@ 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
 
     @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
@@ -145,22 +145,15 @@ 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
 
     @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
@@ -143,22 +143,15 @@ 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
 
     @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():