diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-01 11:21:25 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-10-01 11:39:27 -0400 |
| commit | eafcb18d7351f8c4c6d17424bd30efc22e40cff1 (patch) | |
| tree | f5610d098a8af4210958ab626847966509624489 | |
| parent | ledger-live-desktop: 1.12.0 -> 1.15.0 (diff) | |
| download | nixpkgs-origin/revert-67355-19.09.tar.gz | |
Revert "nixos/desktop-managers/xterm: Disable by default"origin/revert-67355-19.09
This reverts commit f140dfb161804871048c00f2c51485dd55b50efa.
This reverts commit cf56cefd95eb6f0ead3856ed69299b8ae7153712.
This reverts commit 456c42c3e8787d83d577526af90263de9b3d512d.
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1909.xml | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xterm.nix | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 4220a9500b0e..9e02c0197693 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -872,11 +872,6 @@ </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. </para> </listitem> diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 93987bd1dfc5..ea441fbbe715 100644 --- 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."; }; |