Revert "nixos/desktop-managers/xterm: Disable by default"

This reverts commit f140dfb. This reverts commit cf56cef. This reverts commit 456c42c.
NixOS · Oct 1, 2019 · eafcb18 · eafcb18
1 parent 7f8e417
commit eafcb18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -870,11 +870,6 @@
      The old deprecated <literal>emacs</literal> package sets have been dropped. 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. It was not useful except for debugging purposes and was confusingly set as default in some circumstances.
-    </para>
-   </listitem>
    <listitem>
     <para>
      The WeeChat plugin <literal>pkgs.weechatScripts.weechat-xmpp</literal> has been removed as it doesn't receive any updates from upstream and depends on outdated Python2-based modules.

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -5,6 +5,7 @@ with lib;
 let
 
   cfg = config.services.xserver.desktopManager.xterm;
+  xserverEnabled = config.services.xserver.enable;
 
 in
 
@@ -13,7 +14,7 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       type = types.bool;
-      default = false;
+      default = xserverEnabled;
       defaultText = "config.services.xserver.enable";
       description = "Enable a xterm terminal as a desktop manager.";
     };