Merge pull request #111551 from xaverdh/xserver-modern-drivers

nixos/xserver: use modern video drivers
2021-03-09 08:14:24 +01:00
parent 29b0d4d0b6 e3d705e601
commit af6037b338
3 changed files with 13 additions and 15 deletions
@@ -251,11 +251,10 @@ in

      videoDrivers = mkOption {
        type = types.listOf types.str;
-        # !!! We'd like "nv" here, but it segfaults the X server.
-        default = [ "radeon" "cirrus" "vesa" "modesetting" ];
+        default = [ "amdgpu" "radeon" "nouveau" "modesetting" "fbdev" ];
        example = [
-          "ati_unfree" "amdgpu" "amdgpu-pro"
-          "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"
+          "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"
+          "amdgpu-pro"
        ];
        # TODO(@oxij): think how to easily add the rest, like those nvidia things
        relatedPackages = concatLists