nixos/xserver: introduce attr display to xserver.drivers
Specifically for NVIDIA so that only the device section would be created
This commit is contained in:
parent
e8daa1e35c
commit
632a8a7bb2
|
@ -30,7 +30,7 @@ in
|
|||
nixpkgs.config.xorg.abiCompat = "1.19";
|
||||
|
||||
services.xserver.drivers = singleton
|
||||
{ name = "amdgpu"; modules = [ package ]; };
|
||||
{ name = "amdgpu"; modules = [ package ]; display = true; };
|
||||
|
||||
hardware.opengl.package = package;
|
||||
hardware.opengl.package32 = package32;
|
||||
|
|
|
@ -21,7 +21,7 @@ in
|
|||
nixpkgs.config.xorg.abiCompat = "1.17";
|
||||
|
||||
services.xserver.drivers = singleton
|
||||
{ name = "fglrx"; modules = [ ati_x11 ]; };
|
||||
{ name = "fglrx"; modules = [ ati_x11 ]; display = true; };
|
||||
|
||||
hardware.opengl.package = ati_x11;
|
||||
hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };
|
||||
|
|
|
@ -125,8 +125,7 @@ in
|
|||
}
|
||||
|
||||
{
|
||||
assertion = !syncCfg.enable ||
|
||||
(pCfg.nvidiaBusId != "" && pCfg.intelBusId != "");
|
||||
assertion = syncCfg.enable -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";
|
||||
message = ''
|
||||
When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.
|
||||
'';
|
||||
|
@ -145,9 +144,17 @@ in
|
|||
# - Configure the display manager to run specific `xrandr` commands which will
|
||||
# configure/enable displays connected to the Intel GPU.
|
||||
|
||||
services.xserver.drivers = singleton {
|
||||
services.xserver.drivers = optional syncCfg.enable {
|
||||
name = "modesetting";
|
||||
display = false;
|
||||
deviceSection = ''
|
||||
BusID "${pCfg.intelBusId}"
|
||||
Option "AccelMethod" "none"
|
||||
'';
|
||||
} ++ singleton {
|
||||
name = "nvidia";
|
||||
modules = [ nvidia_x11.bin ];
|
||||
display = true;
|
||||
deviceSection = optionalString syncCfg.enable
|
||||
''
|
||||
BusID "${pCfg.nvidiaBusId}"
|
||||
|
@ -160,18 +167,8 @@ in
|
|||
'';
|
||||
};
|
||||
|
||||
services.xserver.extraConfig = optionalString syncCfg.enable
|
||||
''
|
||||
Section "Device"
|
||||
Identifier "nvidia-optimus-intel"
|
||||
Driver "modesetting"
|
||||
BusID "${pCfg.intelBusId}"
|
||||
Option "AccelMethod" "none"
|
||||
EndSection
|
||||
'';
|
||||
services.xserver.serverLayoutSection = optionalString syncCfg.enable
|
||||
''
|
||||
Inactive "nvidia-optimus-intel"
|
||||
services.xserver.serverLayoutSection = optionalString syncCfg.enable ''
|
||||
Inactive "Device-modesetting[0]"
|
||||
'';
|
||||
|
||||
services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''
|
||||
|
|
|
@ -574,7 +574,7 @@ in
|
|||
then { modules = [xorg.${"xf86video" + name}]; }
|
||||
else null)
|
||||
knownVideoDrivers;
|
||||
in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
|
||||
in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver));
|
||||
|
||||
assertions = [
|
||||
{ assertion = config.security.polkit.enable;
|
||||
|
@ -749,7 +749,7 @@ in
|
|||
${cfg.serverLayoutSection}
|
||||
# Reference the Screen sections for each driver. This will
|
||||
# cause the X server to try each in turn.
|
||||
${flip concatMapStrings cfg.drivers (d: ''
|
||||
${flip concatMapStrings (filter (d: d.display) cfg.drivers) (d: ''
|
||||
Screen "Screen-${d.name}[0]"
|
||||
'')}
|
||||
EndSection
|
||||
|
@ -773,6 +773,7 @@ in
|
|||
${driver.deviceSection or ""}
|
||||
${xrandrDeviceSection}
|
||||
EndSection
|
||||
${optionalString driver.display ''
|
||||
|
||||
Section "Screen"
|
||||
Identifier "Screen-${driver.name}[0]"
|
||||
|
@ -809,6 +810,7 @@ in
|
|||
)}
|
||||
|
||||
EndSection
|
||||
''}
|
||||
'')}
|
||||
|
||||
${xrandrMonitorSections}
|
||||
|
|
Loading…
Reference in a new issue