nixos/nvidia: don't assume x11 is used..

Changed files
+4 -5
nixos
modules
hardware
video
+4 -5
nixos/modules/hardware/video/nvidia.nix
···
pkgs,
...
}: let
-
x11Enabled = config.services.xserver.enable
-
&& (lib.elem "nvidia" config.services.xserver.videoDrivers);
+
nvidiaEnabled = (lib.elem "nvidia" config.services.xserver.videoDrivers);
nvidia_x11 =
-
if x11Enabled || cfg.datacenter.enable
+
if nvidiaEnabled || cfg.datacenter.enable
then cfg.package
else null;
···
({
assertions = [
{
-
assertion = !(x11Enabled && cfg.datacenter.enable);
+
assertion = !(nvidiaEnabled && cfg.datacenter.enable);
message = "You cannot configure both X11 and Data Center drivers at the same time.";
}
];
···
];
})
# X11
-
(lib.mkIf x11Enabled {
+
(lib.mkIf nvidiaEnabled {
assertions = [
{
assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == "";