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

Merge pull request #67355 from adisbladis/xterm-de-disable

Browse Source 
nixos/desktop-managers/xterm: Disable by default
This commit is contained in:
adisbladis 2019-09-01 22:35:00 +01:00 committed by GitHub
commit 9db42e19ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/release-notes/rl-1909.xml
View File

@ -348,6 +348,12 @@
What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>. What used to be called <literal>emacsPackagesNg</literal> is now simply called <literal>emacsPackages</literal>.
</para> </para>
</listitem> </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>
</itemizedlist> </itemizedlist>
</section> </section>

3
nixos/modules/services/x11/desktop-managers/xterm.nix
View File

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