From c2922a9157a8d8db62cee763e254113c3766461e Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 3 Oct 2016 17:04:29 +0200 Subject: [PATCH] xserverArgs fuckup gnome-x-session provides good defaults which we really should not override. We have to add assertions to gdm.nix if the user specified one of those. enableTCP must be configured through a gnome setting dunno why we have terminate but it probably breaks stuff We should expose configFile so we can use it from gdm module. --- nixos/modules/services/x11/xserver.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index e34f0c21663..298f30858ce 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -546,18 +546,19 @@ in }; }; - services.xserver.displayManager.xserverArgs = - [ "-terminate" + services.xserver.displayManager.xserverArgs = mkDefault ( + [ #"-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) ++