diff options
| author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2017-03-05 01:32:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-05 01:32:23 +0100 |
| commit | f5d81ed79b7e9085aa24d8b3006d6da7718e5694 (patch) | |
| tree | afccd5b777472009a20c2c31e2884527ad919f81 /nixos/modules/services/x11/xserver.nix | |
| parent | 3f817d09b9ea4361b51106a659d9ce349f29c011 (diff) | |
| parent | b72f8ccc5cb86a8f81768a74dd2beb5022f50969 (diff) | |
| download | nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar.gz nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar.bz2 nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar.lz nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar.xz nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.tar.zst nixpkgs-f5d81ed79b7e9085aa24d8b3006d6da7718e5694.zip | |
Merge pull request #20904 from offlinehacker/nixos/xserver/xpra
Add xpra 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 7ac776571a0..8438e6dcc70 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. + ''; + }; }; }; @@ -550,8 +558,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" @@ -560,7 +567,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) ++ |