diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-02-01 19:17:16 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-02-01 19:22:04 +0100 |
| commit | e00317be13ec9230444564ec2e7eb45a3f6d3005 (patch) | |
| tree | 1c5fd37ca13fc910e45459faca8f804d2ce7904c | |
| parent | f5bdd2b8f89b3c08c810bef9825fd9cc1678706f (diff) | |
| download | nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar.gz nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar.bz2 nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar.lz nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar.xz nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.tar.zst nixpkgs-e00317be13ec9230444564ec2e7eb45a3f6d3005.zip | |
nixos/nvidia: remove obsolete GDM on Wayland assertion
GDM enables Wayland on supported platforms automatically (see ${gnome.gdm}/lib/udev/rules.d/61-gdm.rules), so we removed the `gdm.nvidiaWayland` option.
You will still need `hardware.nvidia.modesetting.enable = true;` with `nvidia` driver, though.
| -rw-r--r-- | nixos/modules/hardware/video/nvidia.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index ff4225dc29a..c0ba60e49a7 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -179,11 +179,6 @@ in in mkIf enabled { assertions = [ { - assertion = with config.services.xserver.displayManager; (gdm.enable && gdm.nvidiaWayland) -> cfg.modesetting.enable; - message = "You cannot use wayland with GDM without modesetting enabled for NVIDIA drivers, set `hardware.nvidia.modesetting.enable = true`"; - } - - { assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; message = '' You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor. |