diff options
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index db60e47c3ea6..f5ed52338182 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -547,19 +547,18 @@ in }; }; - services.xserver.displayManager.xserverArgs = mkDefault ( - [ #"-terminate" + services.xserver.displayManager.xserverArgs = + [ "-terminate" "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" # Log at the default verbosity level to stderr rather than /var/log/X.*.log. - #"-verbose" "3" "-logfile" "/dev/null" - ] #++ optional (cfg.display != null) ":${toString cfg.display}" - #++ optional (cfg.tty != null) "vt${toString cfg.tty}" + "-verbose" "3" "-logfile" "/dev/null" + ] ++ optional (cfg.display != null) ":${toString cfg.display}" + ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" - #++ optional (!cfg.enableTCP) "-nolisten tcp"); + ++ 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}"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ |