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

Merge pull request #58858 from worldofpeace/pantheon/lightdm-gtk-greeter

Browse Source 
nixos/pantheon: enable lightdm gtk greeter
This commit is contained in:
Linus Heckemann 2019-04-10 09:36:20 +02:00 committed by GitHub
commit 4557373d68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nixos/doc/manual/release-notes/rl-1903.xml
View File

@ -31,33 +31,22 @@
</para> </para>
<note> <note>
<para> <para>
<varname>services.xserver.desktopManager.pantheon</varname> default By default, <varname>services.xserver.desktopManager.pantheon</varname>
enables lightdm as a display manager and using Pantheon's greeter. enables LightDM as a display manager, as pantheon's screen locking
implementation relies on it.
</para> </para>
<para> <para>
This is because of limitations with the screenlocking implementation, Because of that it is recommended to leave LightDM enabled. If you'd like
whereas the screenlocker would be non-functional without it. to disable it anyway, set
</para> <option>services.xserver.displayManager.lightdm.enable</option> to
<para> <literal>false</literal> and enable your preferred display manager.
Because of that it is recommended to retain this precaution, however if
you'd like to change this set:
</para>
<itemizedlist>
<listitem>
<para>
<option>services.xserver.displayManager.lightdm.enable</option>
</para>
</listitem>
<listitem>
<para>
<option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
</para>
</listitem>
</itemizedlist>
<para>
to <literal>false</literal> and enable your preferred display manager.
</para> </para>
</note> </note>
<para>
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.
</para>
</listitem> </listitem>
<listitem> <listitem>
<para> <para>

8
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -73,8 +73,14 @@ in
# Ensure lightdm is used when Pantheon is enabled # Ensure lightdm is used when Pantheon is enabled
# Without it screen locking will be nonfunctional because of the use of lightlocker # 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.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 # If not set manually Pantheon session cannot be started
# Known issue of https://github.com/NixOS/nixpkgs/pull/43992 # Known issue of https://github.com/NixOS/nixpkgs/pull/43992

7
nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
View File

@ -33,6 +33,13 @@ in
config = mkIf (ldmcfg.enable && cfg.enable) { 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.greeters.gtk.enable = false;
services.xserver.displayManager.lightdm.greeter = mkDefault { services.xserver.displayManager.lightdm.greeter = mkDefault {