diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index dafd62e8779..a1f715a3adf 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -212,6 +212,14 @@
hardware.ckb-next.*.
+
+
+ The option services.xserver.displayManager.job.logToFile which was
+ previously set to true when using the display managers
+ lightdm, sddm or xpra has been
+ reset to the default value (false).
+
+
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index a685dbfff2a..e1688c45104 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -208,15 +208,11 @@ in
}
];
- services.xserver.displayManager.job = {
- logToFile = true;
-
- # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
- execCmd = ''
- export PATH=${lightdm}/sbin:$PATH
- exec ${lightdm}/sbin/lightdm
- '';
- };
+ # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
+ services.xserver.displayManager.job.execCmd = ''
+ export PATH=${lightdm}/sbin:$PATH
+ exec ${lightdm}/sbin/lightdm
+ '';
environment.etc."lightdm/lightdm.conf".source = lightdmConf;
environment.etc."lightdm/users.conf".source = usersConf;
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 522a0dc92d6..b7511dfd5a8 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -209,8 +209,6 @@ in
];
services.xserver.displayManager.job = {
- logToFile = true;
-
environment = {
# Load themes from system environment
QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index b46ede550c1..a4b57cfdab6 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -219,30 +219,26 @@ in
VideoRam 192000
'';
- services.xserver.displayManager.job = {
- logToFile = true;
-
- execCmd = ''
- ${optionalString (cfg.pulseaudio)
- "export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"}
- exec ${pkgs.xpra}/bin/xpra start \
- --daemon=off \
- --log-dir=/var/log \
- --log-file=xpra.log \
- --opengl=on \
- --clipboard=on \
- --notifications=on \
- --speaker=yes \
- --mdns=no \
- --pulseaudio=no \
- ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
- --socket-dirs=/var/run/xpra \
- --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
- ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
- --auth=${cfg.auth} \
- ${concatStringsSep " " cfg.extraOptions}
- '';
- };
+ services.xserver.displayManager.job.execCmd = ''
+ ${optionalString (cfg.pulseaudio)
+ "export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"}
+ exec ${pkgs.xpra}/bin/xpra start \
+ --daemon=off \
+ --log-dir=/var/log \
+ --log-file=xpra.log \
+ --opengl=on \
+ --clipboard=on \
+ --notifications=on \
+ --speaker=yes \
+ --mdns=no \
+ --pulseaudio=no \
+ ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
+ --socket-dirs=/var/run/xpra \
+ --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
+ ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
+ --auth=${cfg.auth} \
+ ${concatStringsSep " " cfg.extraOptions}
+ '';
services.xserver.terminateOnReset = false;