diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-12-04 22:30:42 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-12-04 22:38:10 +0100 |
| commit | b72f8ccc5cb86a8f81768a74dd2beb5022f50969 (patch) | |
| tree | 4d40f781e538d0961a5863fc16a079691cf286d9 /nixos/modules/services/x11/xserver.nix | |
| parent | 7fd8dfc6216f6dc2ff21163f55144dbda77d7fb8 (diff) | |
| download | nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar.gz nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar.bz2 nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar.lz nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar.xz nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.tar.zst nixpkgs-b72f8ccc5cb86a8f81768a74dd2beb5022f50969.zip | |
xpra module: add xpra, as xserver display-manager
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f5ed5233818..127577875af 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -435,6 +435,14 @@ in by default. ''; }; + + terminateOnReset = mkOption { + type = types.bool; + default = true; + description = '' + Whether to terminate X upon server reset. + ''; + }; }; }; @@ -548,8 +556,7 @@ in }; services.xserver.displayManager.xserverArgs = - [ "-terminate" - "-config ${configFile}" + [ "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" # Log at the default verbosity level to stderr rather than /var/log/X.*.log. "-verbose" "3" "-logfile" "/dev/null" @@ -558,7 +565,8 @@ in ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" ++ optional (!cfg.enableTCP) "-nolisten tcp" ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}" - ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"; + ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}" + ++ optional cfg.terminateOnReset "-terminate"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ |