Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthewbauer wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions nixos/doc/manual/release-notes/rl-1909.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions nixos/modules/services/x11/desktop-managers/xterm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ with lib;
let

cfg = config.services.xserver.desktopManager.xterm;
xSessionEnabled = config.services.xserver.enable;
xserverEnabled = config.services.xserver.enable;

in

Expand All @@ -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.";
};

Expand Down