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

`desktopManagerHandlesLidAndPower default `false`

lethalman 37979018 61cad61e

+8 -2
+1
nixos/modules/services/x11/desktop-managers/README
···
··· 1 + Each desktop manager should explicitly specify a value for `services.xserver.displayManager.desktopManagerHandlesLidAndPower`.
+1
nixos/modules/services/x11/desktop-managers/e19.nix
··· 62 waitPID=$! 63 ''; 64 }]; 65 66 security.setuidPrograms = [ "e19_freqset" ]; 67
··· 62 waitPID=$! 63 ''; 64 }]; 65 + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; 66 67 security.setuidPrograms = [ "e19_freqset" ]; 68
+1
nixos/modules/services/x11/desktop-managers/kde4.nix
··· 111 exec ${kde_workspace}/bin/startkde 112 ''; 113 }; 114 115 security.setuidOwners = singleton 116 { program = "kcheckpass";
··· 111 exec ${kde_workspace}/bin/startkde 112 ''; 113 }; 114 + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; 115 116 security.setuidOwners = singleton 117 { program = "kcheckpass";
+1
nixos/modules/services/x11/desktop-managers/kde5.nix
··· 78 bgSupport = true; 79 start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; 80 }; 81 82 security.setuidOwners = singleton { 83 program = "kcheckpass";
··· 78 bgSupport = true; 79 start = ''exec ${plasma5.plasma-workspace}/bin/startkde;''; 80 }; 81 + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; 82 83 security.setuidOwners = singleton { 84 program = "kcheckpass";
+2 -1
nixos/modules/services/x11/desktop-managers/kodi.nix
··· 25 waitPID=$! 26 ''; 27 }]; 28 29 environment.systemPackages = [ pkgs.kodi ]; 30 }; 31 - }
··· 25 waitPID=$! 26 ''; 27 }]; 28 + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; 29 30 environment.systemPackages = [ pkgs.kodi ]; 31 }; 32 + }
+1
nixos/modules/services/x11/desktop-managers/xfce.nix
··· 37 exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} 38 ''; 39 }; 40 41 environment.systemPackages = 42 [ pkgs.gtk # To get GTK+'s themes.
··· 37 exec ${pkgs.stdenv.shell} ${pkgs.xfce.xinitrc} 38 ''; 39 }; 40 + services.xserver.displayManager.desktopManagerHandlesLidAndPower = true; 41 42 environment.systemPackages = 43 [ pkgs.gtk # To get GTK+'s themes.
+1 -1
nixos/modules/services/x11/display-managers/default.nix
··· 229 230 desktopManagerHandlesLidAndPower = mkOption { 231 type = types.bool; 232 - default = true; 233 description = '' 234 Whether the display manager should prevent systemd from handling 235 lid and power events. This is normally handled by the desktop
··· 229 230 desktopManagerHandlesLidAndPower = mkOption { 231 type = types.bool; 232 + default = false; 233 description = '' 234 Whether the display manager should prevent systemd from handling 235 lid and power events. This is normally handled by the desktop