ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-21 12:52:41 +03:00
Code Issues Projects Releases Wiki Activity

xsession: add config option to let systemd handle lid/power events

Browse Source
This commit is contained in:
Mathijs Kwik 2013-04-01 10:43:46 +02:00
parent fd6b48783d
commit 57dc4b9188
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/services/x11/display-managers/default.nix
View File

@ -39,12 +39,15 @@ let
exec > ~/.xsession-errors 2>&1 exec > ~/.xsession-errors 2>&1
''} ''}
# Stop systemd from handling the power button and lid switch, ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower ''
# since presumably the desktop environment will handle these. # Stop systemd from handling the power button and lid switch,
if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then # since presumably the desktop environment will handle these.
export _INHIBITION_LOCK_TAKEN=1 if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType" export _INHIBITION_LOCK_TAKEN=1
fi exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType"
fi
''}
${optionalString cfg.startOpenSSHAgent '' ${optionalString cfg.startOpenSSHAgent ''
if test -z "$SSH_AUTH_SOCK"; then if test -z "$SSH_AUTH_SOCK"; then
@ -185,6 +188,16 @@ in
description = "Shell commands executed just before the window or desktop manager is started."; description = "Shell commands executed just before the window or desktop manager is started.";
}; };
desktopManagerHandlesLidAndPower = mkOption {
default = true;
description = ''
Whether the display manager should prevent systemd from handling
lid and power events. This is normally handled by the desktop
environment's power manager. Turn this off when using a minimal
X11 setup without a full power manager.
'';
};
session = mkOption { session = mkOption {
default = []; default = [];
example = [ example = [