nixos/{lightdm,sddm,xpra}: remove enabling of logToFile

This commit is contained in:
Tobias Happ 2018-11-09 16:47:16 +01:00
parent 2823b5e698
commit 4839403dd6
4 changed files with 33 additions and 35 deletions

View File

@ -212,6 +212,14 @@
<literal>hardware.ckb-next.*</literal>. <literal>hardware.ckb-next.*</literal>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The option <literal>services.xserver.displayManager.job.logToFile</literal> which was
previously set to <literal>true</literal> when using the display managers
<literal>lightdm</literal>, <literal>sddm</literal> or <literal>xpra</literal> has been
reset to the default value (<literal>false</literal>).
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

View File

@ -208,15 +208,11 @@ in
} }
]; ];
services.xserver.displayManager.job = {
logToFile = true;
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = '' services.xserver.displayManager.job.execCmd = ''
export PATH=${lightdm}/sbin:$PATH export PATH=${lightdm}/sbin:$PATH
exec ${lightdm}/sbin/lightdm exec ${lightdm}/sbin/lightdm
''; '';
};
environment.etc."lightdm/lightdm.conf".source = lightdmConf; environment.etc."lightdm/lightdm.conf".source = lightdmConf;
environment.etc."lightdm/users.conf".source = usersConf; environment.etc."lightdm/users.conf".source = usersConf;

View File

@ -209,8 +209,6 @@ in
]; ];
services.xserver.displayManager.job = { services.xserver.displayManager.job = {
logToFile = true;
environment = { environment = {
# Load themes from system environment # Load themes from system environment
QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix; QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;

View File

@ -219,10 +219,7 @@ in
VideoRam 192000 VideoRam 192000
''; '';
services.xserver.displayManager.job = { services.xserver.displayManager.job.execCmd = ''
logToFile = true;
execCmd = ''
${optionalString (cfg.pulseaudio) ${optionalString (cfg.pulseaudio)
"export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"} "export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"}
exec ${pkgs.xpra}/bin/xpra start \ exec ${pkgs.xpra}/bin/xpra start \
@ -242,7 +239,6 @@ in
--auth=${cfg.auth} \ --auth=${cfg.auth} \
${concatStringsSep " " cfg.extraOptions} ${concatStringsSep " " cfg.extraOptions}
''; '';
};
services.xserver.terminateOnReset = false; services.xserver.terminateOnReset = false;