diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-09-09 18:50:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-09 18:50:20 +0100 |
| commit | b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b (patch) | |
| tree | 11505e2be068823dca795f5006fcd1f830e7d2ae /nixos | |
| parent | 7256d10d009a22738793641d25e57ad78af14232 (diff) | |
| parent | 456c42c3e8787d83d577526af90263de9b3d512d (diff) | |
| download | nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar.gz nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar.bz2 nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar.lz nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar.xz nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.tar.zst nixlib-b8f2f6ff9d426d4be827d2ee9ae80bbe4b46c36b.zip | |
Merge pull request #68363 from worldofpeace/xterm-stateversion
nixos/xterm: stateVersion disable by default
Diffstat (limited to 'nixos')
| -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, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index db4629443002..f9cea242c153 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -449,8 +449,9 @@ </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. + <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> diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 93987bd1dfc5..1408df312950 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -13,8 +13,7 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = false; - defaultText = "config.services.xserver.enable"; + default = (versionOlder config.system.stateVersion "19.09"); description = "Enable a xterm terminal as a desktop manager."; }; |