colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Edward Tjörnhammar 2023-09-13 17:59:45 +02:00
parent 52351762b7
commit 903ebdc0a0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/hardware/video/nvidia.nix
View File

@ -4,10 +4,9 @@
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;
@ -256,7 +255,7 @@ in {
({
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.";
}
];
@ -289,7 +288,7 @@ in {
];
})
# X11
(lib.mkIf x11Enabled {
(lib.mkIf nvidiaEnabled {
assertions = [
{
assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == "";