From e00317be13ec9230444564ec2e7eb45a3f6d3005 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 1 Feb 2022 19:17:16 +0100 Subject: [PATCH] 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. --- nixos/modules/hardware/video/nvidia.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index ff4225dc29ad..c0ba60e49a73 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -178,11 +178,6 @@ in igpuBusId = if pCfg.intelBusId != "" then pCfg.intelBusId else pCfg.amdgpuBusId; 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 = ''