alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #131416 from Artturin/x11-module-fixes

Browse source
This commit is contained in:
Artturi 2021-11-19 18:55:37 +02:00 committed by GitHub
parent ec75160946 670f5474b9
commit 5de36a0410
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/modules/services/x11/display-managers/startx.nix
View file

@ -35,10 +35,7 @@ in
config = mkIf cfg.enable {
services.xserver = {
exportConfiguration = true;
displayManager.job.execCmd = "";
displayManager.lightdm.enable = lib.mkForce false;
};
systemd.services.display-manager.enable = false;
# Other displayManagers log to /dev/null because they're services and put
# Xorg's stdout in the journal

5
nixos/modules/services/x11/display-managers/sx.nix
View file

@ -26,13 +26,8 @@ in {
environment.systemPackages = [ pkgs.sx ];
services.xserver = {
exportConfiguration = true;
displayManager = {
job.execCmd = "";
lightdm.enable = mkForce false;
};
logFile = mkDefault null;
};
systemd.services.display-manager.enable = false;
};
meta.maintainers = with maintainers; [ figsoda ];

24
nixos/modules/services/x11/xserver.nix
View file

@ -588,11 +588,22 @@ in
config = mkIf cfg.enable {
services.xserver.displayManager.lightdm.enable =
let dmconf = cfg.displayManager;
default = !(dmconf.gdm.enable
|| dmconf.sddm.enable
|| dmconf.xpra.enable );
in mkIf (default) true;
let dmConf = cfg.displayManager;
default = !(dmConf.gdm.enable
|| dmConf.sddm.enable
|| dmConf.xpra.enable
|| dmConf.sx.enable
|| dmConf.startx.enable);
in mkIf (default) (mkDefault true);
# so that the service won't be enabled when only startx is used
systemd.services.display-manager.enable =
let dmConf = cfg.displayManager;
noDmUsed = !(dmConf.gdm.enable
|| dmConf.sddm.enable
|| dmConf.xpra.enable
|| dmConf.lightdm.enable);
in mkIf (noDmUsed) (mkDefault false);
hardware.opengl.enable = mkDefault true;
@ -702,7 +713,8 @@ in
rm -f /tmp/.X0-lock
'';
script = "${cfg.displayManager.job.execCmd}";
# TODO: move declaring the systemd service to its own mkIf
script = mkIf (config.systemd.services.display-manager.enable == true) "${cfg.displayManager.job.execCmd}";
# Stop restarting if the display manager stops (crashes) 2 times
# in one minute. Starting X typically takes 3-4s.