summary refs log tree commit diff
path: root/nixos/modules/services/x11
diff options
context:
space:
mode:
authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com>2021-03-09 08:14:24 +0100
committerGitHub <noreply@github.com>2021-03-09 08:14:24 +0100
commitaf6037b338b5aec2f10d3b8afbdfb3116077497d (patch)
tree450dced966a901936054d666b710dfdec0b8e2d3 /nixos/modules/services/x11
parent29b0d4d0b600f8f5dd0b86e3362a33d4181938f9 (diff)
parente3d705e60162def9493eaff758b753143e09cd57 (diff)
downloadnixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar.gz
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar.bz2
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar.lz
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar.xz
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.tar.zst
nixpkgs-af6037b338b5aec2f10d3b8afbdfb3116077497d.zip
Merge pull request #111551 from xaverdh/xserver-modern-drivers
nixos/xserver: use modern video drivers
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r--nixos/modules/services/x11/xserver.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 8858559d8f2..35bd4dabb67 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -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