public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`desktopManagerHandlesLidAndPower default `false` 

Changes the option and explicitely sets it for each desktopManager.

Reasoning: Currently,
services.xserver.displayManager.desktopManagerHandlesLidAndPower is set
to true by default. This creates a problem for users without desktop
environments activated, since lid management simply doesn't work
(and they have to be lucky to find this option).

See issue #9671
This commit is contained in:
Profpatsch 2015-09-01 12:14:44 +02:00
parent ea7b5bb8b0
commit 44c12dc0ff
7 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/README Normal file
View File

@ -0,0 +1 @@
Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`.

1
nixos/modules/services/x11/desktop-managers/e19.nix
View File

@ -62,6 +62,7 @@ in
waitPID=$! waitPID=$!
''; '';
}]; }];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
security.setuidPrograms = [ "e19_freqset" ]; security.setuidPrograms = [ "e19_freqset" ];

1
nixos/modules/services/x11/desktop-managers/kde4.nix
View File

@ -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";

1
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -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";

3
nixos/modules/services/x11/desktop-managers/kodi.nix
View File

@ -25,7 +25,8 @@ in
waitPID=$! waitPID=$!
''; '';
}]; }];
services.xserver.displayManager.desktopManagerHandlesLidAndPower = true;
environment.systemPackages = [ pkgs.kodi ]; environment.systemPackages = [ pkgs.kodi ];
}; };
} }

1
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -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.

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

@ -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