From 56dcc319cffc18411fd9bda020f0fbd197d3e8ff Mon Sep 17 00:00:00 2001
From: Aaron Janse <aaron@ajanse.me>
Date: Tue, 12 Mar 2019 22:23:05 -0700
Subject: [PATCH 1/2] nixos/manual: document auto-login

fix #29526
---
 nixos/doc/manual/configuration/x-windows.xml | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index e7d66f391f55..4d27375142fc 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -59,6 +59,32 @@
 <screen>
 # systemctl start display-manager.service
 </screen>
+  <simplesect xml:id="sec-x11-auto-login">
+  <title>Auto-login</title>
+  <para>
+  The x11 login screen can be skipped entirely, automatically logging you into
+  your window manager and desktop environment when you boot your computer.
+  </para>
+  <para>
+  This is especially helpful if you have disk encryption enabled. Since you
+  already have to provide a password to decrypt your disk, entering a second
+  password to login can be redundant.
+  </para>
+  <para>
+  To enable auto-login, you need to define your default window manager and
+  desktop environment. If you wanted no desktop environment and i3 as your your
+  windowzmanager, you'd define:
+<programlisting>
+<xref linkend="opt-services.xserver.desktopManager.default"/> = "none";
+<xref linkend="opt-services.xserver.windowManager.default"/> = "i3";
+</programlisting>
+  And, finally, to enable auto-login for a user <literal>johndoe</literal>:
+<programlisting>
+<xref linkend="opt-services.xserver.displayManager.auto.enable"/> = true;
+<xref linkend="opt-services.xserver.displayManager.auto.user"/> = "johndoe";
+</programlisting>
+  </para>
+ </simplesect>
  </para>
  <simplesect xml:id="sec-x11-graphics-cards-nvidia">
   <title>NVIDIA Graphics Cards</title>

From bd9b82dece4f652dc27e66e0d62b200accf4cb88 Mon Sep 17 00:00:00 2001
From: Aaron Janse <aaron@ajanse.me>
Date: Thu, 14 Mar 2019 02:17:31 +0000
Subject: [PATCH 2/2] nixos/manual: fix typo

---
 nixos/doc/manual/configuration/x-windows.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 4d27375142fc..39b69ce238a3 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -73,7 +73,7 @@
   <para>
   To enable auto-login, you need to define your default window manager and
   desktop environment. If you wanted no desktop environment and i3 as your your
-  windowzmanager, you'd define:
+  window manager, you'd define:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.default"/> = "none";
 <xref linkend="opt-services.xserver.windowManager.default"/> = "i3";