commit 632a8a7bb27b5e852becf0c4cd451cde18237f1b · pyrox.dev/nixpkgs

+1 -1

nixos/modules/hardware/video/amdgpu-pro.nix

···

       30
       30
        
           nixpkgs.config.xorg.abiCompat = "1.19";

     

       31
       31
        
       

     

       32
       32
        
           services.xserver.drivers = singleton

     

       33
       33
       -
             { name = "amdgpu"; modules = [ package ]; };

     

       33
       33
       +
             { name = "amdgpu"; modules = [ package ]; display = true; };

     

       34
       34
        
       

     

       35
       35
        
           hardware.opengl.package = package;

     

       36
       36
        
           hardware.opengl.package32 = package32;

+1 -1

nixos/modules/hardware/video/ati.nix

···

       21
       21
        
           nixpkgs.config.xorg.abiCompat = "1.17";

     

       22
       22
        
       

     

       23
       23
        
           services.xserver.drivers = singleton

     

       24
       24
       -
             { name = "fglrx"; modules = [ ati_x11 ]; };

     

       24
       24
       +
             { name = "fglrx"; modules = [ ati_x11 ]; display = true; };

     

       25
       25
        
       

     

       26
       26
        
           hardware.opengl.package = ati_x11;

     

       27
       27
        
           hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.ati_drivers_x11.override { libsOnly = true; kernel = null; };

+13 -16

nixos/modules/hardware/video/nvidia.nix

···

       125
       125
        
             }

     

       126
       126
        
       

     

       127
       127
        
             {

     

       128
       128
       -
               assertion = !syncCfg.enable ||

     

       129
       129
       -
                 (pCfg.nvidiaBusId != "" && pCfg.intelBusId != "");

     

       128
       128
       +
               assertion = syncCfg.enable -> pCfg.nvidiaBusId != "" && pCfg.intelBusId != "";

     

       130
       129
        
               message = ''

     

       131
       130
        
                 When NVIDIA Optimus via PRIME is enabled, the GPU bus IDs must configured.

     

       132
       131
        
               '';

     
···

       145
       144
        
           # - Configure the display manager to run specific `xrandr` commands which will

     

       146
       145
        
           #   configure/enable displays connected to the Intel GPU.

     

       147
       146
        
       

     

       148
       148
       -
           services.xserver.drivers = singleton {

     

       147
       147
       +
           services.xserver.drivers = optional syncCfg.enable {

     

       148
       148
       +
             name = "modesetting";

     

       149
       149
       +
             display = false;

     

       150
       150
       +
             deviceSection = ''

     

       151
       151
       +
               BusID "${pCfg.intelBusId}"

     

       152
       152
       +
               Option "AccelMethod" "none"

     

       153
       153
       +
             '';

     

       154
       154
       +
           } ++ singleton {

     

       149
       155
        
             name = "nvidia";

     

       150
       156
        
             modules = [ nvidia_x11.bin ];

     

       157
       157
       +
             display = true;

     

       151
       158
        
             deviceSection = optionalString syncCfg.enable

     

       152
       159
        
               ''

     

       153
       160
        
                 BusID "${pCfg.nvidiaBusId}"

     
···

       160
       167
        
               '';

     

       161
       168
        
           };

     

       162
       169
        
       

     

       163
       163
       -
           services.xserver.extraConfig = optionalString syncCfg.enable

     

       164
       164
       -
             ''

     

       165
       165
       -
               Section "Device"

     

       166
       166
       -
                 Identifier "nvidia-optimus-intel"

     

       167
       167
       -
                 Driver "modesetting"

     

       168
       168
       -
                 BusID  "${pCfg.intelBusId}"

     

       169
       169
       -
                 Option "AccelMethod" "none"

     

       170
       170
       -
               EndSection

     

       171
       171
       -
             '';

     

       172
       172
       -
           services.xserver.serverLayoutSection = optionalString syncCfg.enable

     

       173
       173
       -
             ''

     

       174
       174
       -
               Inactive "nvidia-optimus-intel"

     

       175
       175
       -
             '';

     

       170
       170
       +
           services.xserver.serverLayoutSection = optionalString syncCfg.enable ''

     

       171
       171
       +
             Inactive "Device-modesetting[0]"

     

       172
       172
       +
           '';

     

       176
       173
        
       

     

       177
       174
        
           services.xserver.displayManager.setupCommands = optionalString syncCfg.enable ''

     

       178
       175
        
             # Added by nvidia configuration module for Optimus/PRIME.

+35 -33

nixos/modules/services/x11/xserver.nix

···

       574
       574
        
                  then { modules = [xorg.${"xf86video" + name}]; }

     

       575
       575
        
                  else null)

     

       576
       576
        
                 knownVideoDrivers;

     

       577
       577
       -
             in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));

     

       577
       577
       +
             in optional (driver != null) ({ inherit name; modules = []; driverName = name; display = true; } // driver));

     

       578
       578
        
       

     

       579
       579
        
           assertions = [

     

       580
       580
        
             { assertion = config.security.polkit.enable;

     
···

       749
       749
        
                 ${cfg.serverLayoutSection}

     

       750
       750
        
                 # Reference the Screen sections for each driver.  This will

     

       751
       751
        
                 # cause the X server to try each in turn.

     

       752
       752
       -
                 ${flip concatMapStrings cfg.drivers (d: ''

     

       752
       752
       +
                 ${flip concatMapStrings (filter (d: d.display) cfg.drivers) (d: ''

     

       753
       753
        
                   Screen "Screen-${d.name}[0]"

     

       754
       754
        
                 '')}

     

       755
       755
        
               EndSection

     
···

       773
       773
        
                   ${driver.deviceSection or ""}

     

       774
       774
        
                   ${xrandrDeviceSection}

     

       775
       775
        
                 EndSection

     

       776
       776
       +
                 ${optionalString driver.display ''

     

       776
       777
        
       

     

       777
       777
       -
                 Section "Screen"

     

       778
       778
       -
                   Identifier "Screen-${driver.name}[0]"

     

       779
       779
       -
                   Device "Device-${driver.name}[0]"

     

       780
       780
       -
                   ${optionalString (cfg.monitorSection != "") ''

     

       781
       781
       -
                     Monitor "Monitor[0]"

     

       782
       782
       -
                   ''}

     

       778
       778
       +
                   Section "Screen"

     

       779
       779
       +
                     Identifier "Screen-${driver.name}[0]"

     

       780
       780
       +
                     Device "Device-${driver.name}[0]"

     

       781
       781
       +
                     ${optionalString (cfg.monitorSection != "") ''

     

       782
       782
       +
                       Monitor "Monitor[0]"

     

       783
       783
       +
                     ''}

     

       783
       784
        
       

     

       784
       784
       -
                   ${cfg.screenSection}

     

       785
       785
       -
                   ${driver.screenSection or ""}

     

       785
       785
       +
                     ${cfg.screenSection}

     

       786
       786
       +
                     ${driver.screenSection or ""}

     

       786
       787
        
       

     

       787
       787
       -
                   ${optionalString (cfg.defaultDepth != 0) ''

     

       788
       788
       -
                     DefaultDepth ${toString cfg.defaultDepth}

     

       789
       789
       -
                   ''}

     

       788
       788
       +
                     ${optionalString (cfg.defaultDepth != 0) ''

     

       789
       789
       +
                       DefaultDepth ${toString cfg.defaultDepth}

     

       790
       790
       +
                     ''}

     

       790
       791
        
       

     

       791
       791
       -
                   ${optionalString

     

       792
       792
       -
                       (driver.name != "virtualbox" &&

     

       793
       793
       -
                        (cfg.resolutions != [] ||

     

       794
       794
       -
                         cfg.extraDisplaySettings != "" ||

     

       795
       795
       -
                         cfg.virtualScreen != null))

     

       796
       796
       -
                     (let

     

       797
       797
       -
                       f = depth:

     

       798
       798
       -
                         ''

     

       799
       799
       -
                           SubSection "Display"

     

       800
       800
       -
                             Depth ${toString depth}

     

       801
       801
       -
                             ${optionalString (cfg.resolutions != [])

     

       802
       802
       -
                               "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}

     

       803
       803
       -
                             ${cfg.extraDisplaySettings}

     

       804
       804
       -
                             ${optionalString (cfg.virtualScreen != null)

     

       805
       805
       -
                               "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}

     

       806
       806
       -
                           EndSubSection

     

       807
       807
       -
                         '';

     

       808
       808
       -
                     in concatMapStrings f [8 16 24]

     

       809
       809
       -
                   )}

     

       792
       792
       +
                     ${optionalString

     

       793
       793
       +
                         (driver.name != "virtualbox" &&

     

       794
       794
       +
                         (cfg.resolutions != [] ||

     

       795
       795
       +
                           cfg.extraDisplaySettings != "" ||

     

       796
       796
       +
                           cfg.virtualScreen != null))

     

       797
       797
       +
                       (let

     

       798
       798
       +
                         f = depth:

     

       799
       799
       +
                           ''

     

       800
       800
       +
                             SubSection "Display"

     

       801
       801
       +
                               Depth ${toString depth}

     

       802
       802
       +
                               ${optionalString (cfg.resolutions != [])

     

       803
       803
       +
                                 "Modes ${concatMapStrings (res: ''"${toString res.x}x${toString res.y}"'') cfg.resolutions}"}

     

       804
       804
       +
                               ${cfg.extraDisplaySettings}

     

       805
       805
       +
                               ${optionalString (cfg.virtualScreen != null)

     

       806
       806
       +
                                 "Virtual ${toString cfg.virtualScreen.x} ${toString cfg.virtualScreen.y}"}

     

       807
       807
       +
                             EndSubSection

     

       808
       808
       +
                           '';

     

       809
       809
       +
                       in concatMapStrings f [8 16 24]

     

       810
       810
       +
                     )}

     

       810
       811
        
       

     

       811
       811
       -
                 EndSection

     

       812
       812
       +
                   EndSection

     

       813
       813
       +
                 ''}

     

       812
       814
        
               '')}

     

       813
       815
        
       

     

       814
       816
        
               ${xrandrMonitorSections}