Merge pull request #9590 from Profpatsch/dm-lid-management

`desktopManagerHandlesLidAndPower default `false`
This commit is contained in:
lethalman
2015-09-01 13:50:27 +02:00
7 changed files with 8 additions and 2 deletions
@@ -0,0 +1 @@
Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`.
@@ -62,6 +62,7 @@ in
waitPID=$! waitPID=$!
''; '';
}]; }];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidPrograms = [ "e19_freqset" ]; security.setuidPrograms = [ "e19_freqset" ];
@@ -111,6 +111,7 @@ in
exec ${kde_workspace}/bin/startkde exec ${kde_workspace}/bin/startkde
''; '';
}; };
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton security.setuidOwners = singleton
{ program = "kcheckpass"; { program = "kcheckpass";
@@ -78,6 +78,7 @@ in
bgSupport = true; bgSupport = true;
start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; start = ''exec ${plasma5.plasma-workspace}/bin/startkde;'';
}; };
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidOwners = singleton { security.setuidOwners = singleton {
program = "kcheckpass"; program = "kcheckpass";
@@ -25,6 +25,7 @@ in
waitPID=$! waitPID=$!
''; '';
}]; }];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = [ pkgs.kodi ]; environment.systemPackages = [ pkgs.kodi ];
}; };
@@ -37,6 +37,7 @@ in
exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc}
''; '';
}; };
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = environment.systemPackages =
[ pkgs.gtk # To get GTK+'s themes. [ pkgs.gtk # To get GTK+'s themes.
@@ -229,7 +229,7 @@ in
desktopManagerHandlesLidAndPower = mkOption { desktopManagerHandlesLidAndPower = mkOption {
type = types.bool; type = types.bool;
default = true; default = false;
description = '' description = ''
Whether the display manager should prevent systemd from handling Whether the display manager should prevent systemd from handling
lid and power events. This is normally handled by the desktop lid and power events. This is normally handled by the desktop