From 099cc0482bc6d2857dc056a9f964b8ab7f3a67e9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 29 Mar 2019 21:29:59 -0400 Subject: [PATCH 1/4] nixos/pantheon: enable lightdm gtk greeter Pantheon's greeter has numerous issues that cannot be fixed in a timely manner, and users are better off if they just didn't use it by default. --- nixos/doc/manual/release-notes/rl-1903.xml | 9 +++++++-- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 7d40637df93..3821fa59e47 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -32,7 +32,7 @@ services.xserver.desktopManager.pantheon default - enables lightdm as a display manager and using Pantheon's greeter. + enables lightdm as a display manager. This is because of limitations with the screenlocking implementation, @@ -50,7 +50,7 @@ - + @@ -58,6 +58,11 @@ to false and enable your preferred display manager. + + Also be aware that we haven't enabled lightdm with Pantheon's greeter by + default. That's because it has numerous issues in NixOS and isn't optimal + for use here yet. + diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index d0278271409..69b0cdc986b 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -74,7 +74,7 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker services.xserver.displayManager.lightdm.enable = mkDefault true; - services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true; # If not set manually Pantheon session cannot be started # Known issue of https://github.com/NixOS/nixpkgs/pull/43992 From d3d5c674ba5c8b9348e642f59485926efab8b7af Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 7 Apr 2019 17:51:19 -0400 Subject: [PATCH 2/4] nixos/lightdm-greeters/pantheon: add warning --- .../x11/display-managers/lightdm-greeters/pantheon.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 05011b999f2..bfba174144a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -33,6 +33,13 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { + warnings = [ + '' + The Pantheon greeter is suboptimal in NixOS and can possibly put you in + a situation where you cannot start a session when switching desktopManagers. + '' + ]; + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; services.xserver.displayManager.lightdm.greeter = mkDefault { From 8f93650fe4a39a41c20a47a17c3c8f7c49a9cb3e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 7 Apr 2019 17:51:41 -0400 Subject: [PATCH 3/4] nixos/pantheon: add warning when not using LightDM --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 69b0cdc986b..e81aea68ae9 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -73,6 +73,12 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker + + warnings = optional (config.services.xserver.displayManager.lightdm.enable != true) + '' + Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. + ''; + services.xserver.displayManager.lightdm.enable = mkDefault true; services.xserver.displayManager.lightdm.greeters.gtk.enable = mkDefault true; From 0ce382d86889921989a1888524f59945d595be62 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 8 Apr 2019 21:45:33 +0200 Subject: [PATCH 4/4] rl-1903: pantheon notes phrasing/organisation --- nixos/doc/manual/release-notes/rl-1903.xml | 36 ++++++---------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 3821fa59e47..893608cbbcd 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -31,37 +31,21 @@ - services.xserver.desktopManager.pantheon default - enables lightdm as a display manager. + By default, services.xserver.desktopManager.pantheon + enables LightDM as a display manager, as pantheon's screen locking + implementation relies on it. - This is because of limitations with the screenlocking implementation, - whereas the screenlocker would be non-functional without it. - - - Because of that it is recommended to retain this precaution, however if - you'd like to change this set: - - - - - - - - - - - - - - - to false and enable your preferred display manager. + Because of that it is recommended to leave LightDM enabled. If you'd like + to disable it anyway, set + to + false and enable your preferred display manager. - Also be aware that we haven't enabled lightdm with Pantheon's greeter by - default. That's because it has numerous issues in NixOS and isn't optimal - for use here yet. + Also note that Pantheon's LightDM greeter is not enabled by default, + because it has numerous issues in NixOS and isn't optimal for use here + yet.