From 5554d7aad69cb7a1924dfcd2670d52e058903a91 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 Oct 2019 11:21:25 -0400
Subject: [PATCH] Revert "nixos/desktop-managers/xterm: Disable by default"

This reverts commit f140dfb161804871048c00f2c51485dd55b50efa.
This reverts commit cf56cefd95eb6f0ead3856ed69299b8ae7153712.
This reverts commit 456c42c3e8787d83d577526af90263de9b3d512d.
---
 nixos/doc/manual/release-notes/rl-1909.xml            | 7 -------
 nixos/modules/services/x11/desktop-managers/xterm.nix | 6 +++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index e4dcc90cdd307..76f1dbd0e9412 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -447,13 +447,6 @@
        What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
      </para>
    </listitem>
-   <listitem>
-     <para>
-       <option>services.xserver.desktopManager.xterm</option> is now disabled by default if <literal>stateVersion</literal> is 19.09 or higher.
-       Previously the xterm desktopManager was enabled when xserver was enabled, but it isn't useful for all people so it didn't make sense to
-       have any desktopManager enabled default.
-     </para>
-   </listitem>
    <listitem>
     <para>
      The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index f76db278a927d..ea441fbbe715c 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,7 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
-  xSessionEnabled = config.services.xserver.enable;
+  xserverEnabled = config.services.xserver.enable;
 
 in
 
@@ -14,8 +14,8 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       type = types.bool;
-      default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled;
-      defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false";
+      default = xserverEnabled;
+      defaultText = "config.services.xserver.enable";
       description = "Enable a xterm terminal as a desktop manager.";
     };