From f9fb7b7457e636f4f7edff866cee1c1812aa9501 Mon Sep 17 00:00:00 2001 From: Jack Cummings Date: Tue, 8 Oct 2013 22:34:05 -0700 Subject: [PATCH] new systemd can't inhibit lid switches Conflicts (repos merge): modules/services/x11/display-managers/default.nix --- .../modules/services/x11/display-managers/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c4fce3706dc..bb86786f0f2 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -39,16 +39,6 @@ let exec > ~/.xsession-errors 2>&1 ''} - ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower '' - # Stop systemd from handling the power button and lid switch, - # since presumably the desktop environment will handle these. - if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then - export _INHIBITION_LOCK_TAKEN=1 - exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key "$0" "$sessionType" - fi - - ''} - ${optionalString cfg.startOpenSSHAgent '' if test -z "$SSH_AUTH_SOCK"; then # Restart this script as a child of the SSH agent. (It is