diff options
| author | Rostislav Beneš <r.dee.b.b@gmail.com> | 2017-05-07 23:01:20 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-28 00:18:57 +0200 |
| commit | 0cad98dde1cef69e847cb2b1ccfb9c583016a1fb (patch) | |
| tree | 1d670e328f63779521a9fcb5304a82693a0eae1e | |
| parent | 4ef82339c9a32548d2432ca71e8aac87abe79777 (diff) | |
| download | nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar.gz nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar.bz2 nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar.lz nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar.xz nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.tar.zst nixlib-0cad98dde1cef69e847cb2b1ccfb9c583016a1fb.zip | |
nixos/xserver,gdm: let GDM handle X server verbosity.
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e68bc816aad2..83c5c95dae7e 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -102,6 +102,7 @@ in # GDM needs different xserverArgs, presumable because using wayland by default. services.xserver.tty = null; services.xserver.display = null; + services.xserver.verbose = null; services.xserver.displayManager.job = { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 3ce124d3da27..d4fe475690ce 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -480,6 +480,15 @@ in ''; }; + verbose = mkOption { + type = types.nullOr types.int; + default = 3; + example = 7; + description = '' + Controls verbosity of X logging. + ''; + }; + useGlamor = mkOption { type = types.bool; default = false; @@ -631,10 +640,11 @@ in [ "-config ${configFile}" "-xkbdir" "${cfg.xkbDir}" # Log at the default verbosity level to stderr rather than /var/log/X.*.log. - "-verbose" "3" "-logfile" "/dev/null" + "-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.verbose != null) "-verbose ${toString cfg.verbose}" ++ optional (!cfg.enableTCP) "-nolisten tcp" ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}" ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}" |