diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-06-08 01:01:22 -0400 |
---|---|---|
committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-06-08 01:01:22 -0400 |
commit | fd0f8adaab91a68190631ab9991ebe73c17d05bc (patch) | |
tree | 6ee7a17106820b1c3e35e7cae4836a199e30b884 /nixos/modules | |
parent | 1dc26c32edffdb73adb0a82b430834d3404aa8f3 (diff) | |
download | nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar.gz nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar.bz2 nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar.lz nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar.xz nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.tar.zst nixpkgs-fd0f8adaab91a68190631ab9991ebe73c17d05bc.zip |
nixos/desktop-managers/xterm: Defaults to xserver's state
This enhances #61423, which removed the gating of desktop-managers from being linked to the xserver's state. This, though, brought in xterm into all systems, even those without X servers. This change sets the *default* of the xterm desktop-manager to the state of the xserver, keeping it enabled by default as a sane fallback. The xterm desktop-manager can still be enabled or disabled as needed, without it being affected by xserver's state.
Diffstat (limited to 'nixos/modules')
-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 f386ebc4d3c..ea441fbbe71 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,8 @@ in services.xserver.desktopManager.xterm.enable = mkOption { type = types.bool; - default = true; + default = xserverEnabled; + defaultText = "config.services.xserver.enable"; description = "Enable a xterm terminal as a desktop manager."; }; |