From 099cc0482bc6d2857dc056a9f964b8ab7f3a67e9 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:29:59 -0400
Subject: [PATCH] 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 @@
     <note>
      <para>
       <varname>services.xserver.desktopManager.pantheon</varname> default
-      enables lightdm as a display manager and using Pantheon's greeter.
+      enables lightdm as a display manager.
      </para>
      <para>
       This is because of limitations with the screenlocking implementation,
@@ -50,7 +50,7 @@
       </listitem>
       <listitem>
        <para>
-        <option>services.xserver.displayManager.lightdm.greeters.pantheon.enable</option>
+        <option>services.xserver.displayManager.lightdm.greeters.gtk.enable</option>
        </para>
       </listitem>
      </itemizedlist>
@@ -58,6 +58,11 @@
       to <literal>false</literal> and enable your preferred display manager.
      </para>
     </note>
+    <para>
+      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.
+    </para>
    </listitem>
    <listitem>
     <para>
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