diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-19 13:05:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 13:05:49 -0400 |
| commit | db3d31b903da12bc471e91d811d231dfe5b662ef (patch) | |
| tree | 5c9b9466886eb5f90af58cc4ec0a9e8ff8fbb0ca | |
| parent | 07d78691da23038caef6c7c23c6565c731c72cec (diff) | |
| parent | cf56cefd95eb6f0ead3856ed69299b8ae7153712 (diff) | |
| download | nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar.gz nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar.bz2 nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar.lz nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar.xz nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.tar.zst nixlib-db3d31b903da12bc471e91d811d231dfe5b662ef.zip | |
Merge pull request #69093 from alexarice/xterm-default
nixos/xterm: Set default to xserver.enable
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/xterm.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 1408df312950..f76db278a927 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; + xSessionEnabled = config.services.xserver.enable; in @@ -13,7 +14,8 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = (versionOlder config.system.stateVersion "19.09"); + default = (versionOlder config.system.stateVersion "19.09") && xSessionEnabled; + defaultText = if versionOlder config.system.stateVersion "19.09" then "config.services.xserver.enable" else "false"; description = "Enable a xterm terminal as a desktop manager."; }; |