about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2024-03-25 16:56:11 +0100
committerNaïm Favier <n@monade.li>2024-03-25 16:56:11 +0100
commitfb613a3a41cab4cd098765d1d2c7c92fd9b1762d (patch)
tree8bf82275932c91da8e8d74ae259cc8602d0b01a3 /nixos
parenta01132bc4648327e179607b0f783d3f9bf4bc9aa (diff)
downloadnixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar.gz
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar.bz2
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar.lz
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar.xz
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.tar.zst
nixlib-fb613a3a41cab4cd098765d1d2c7c92fd9b1762d.zip
nixos/nvidia: update manual
Remove the `nvidiaLegacy*` video drivers from the manual: not only are
they deprecated, their deprecation notice was removed in
https://github.com/NixOS/nixpkgs/pull/244060.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/configuration/x-windows.chapter.md10
-rw-r--r--nixos/modules/services/x11/xserver.nix2
2 files changed, 5 insertions, 7 deletions
diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md
index bf1872ae01ac..0e8e38b83dcd 100644
--- a/nixos/doc/manual/configuration/x-windows.chapter.md
+++ b/nixos/doc/manual/configuration/x-windows.chapter.md
@@ -146,14 +146,12 @@ default because it's not free software. You can enable it as follows:
 services.xserver.videoDrivers = [ "nvidia" ];
 ```
 
-Or if you have an older card, you may have to use one of the legacy
-drivers:
+If you have an older card, you may have to use one of the legacy drivers:
 
 ```nix
-services.xserver.videoDrivers = [ "nvidiaLegacy470" ];
-services.xserver.videoDrivers = [ "nvidiaLegacy390" ];
-services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
-services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
+hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
+hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_390;
+hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_340;
 ```
 
 You may need to reboot after enabling this driver to prevent a clash
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 4e0235f9ad1d..453f414e2a86 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -303,7 +303,7 @@ in
         type = types.listOf types.str;
         default = [ "modesetting" "fbdev" ];
         example = [
-          "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304"
+          "nvidia"
           "amdgpu-pro"
         ];
         # TODO(@oxij): think how to easily add the rest, like those nvidia things