From 67e9571ba4bd7b27c26363f719531ed0b4ce17df Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 17 Sep 2018 05:02:21 -0400
Subject: [PATCH] nixos/lightdm: use systemd.tmpfiles (#46734)
This also makes logs appear at /var/log/lightdm
---
.../services/x11/display-managers/lightdm.nix | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index cd9c3d81a0fb..ae2b05797fd0 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -197,7 +197,7 @@ in
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = ''
export PATH=${lightdm}/sbin:$PATH
- exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run
+ exec ${lightdm}/sbin/lightdm
'';
};
@@ -246,12 +246,19 @@ in
'';
users.users.lightdm = {
- createHome = true;
- home = "/var/lib/lightdm-data";
+ home = "/var/lib/lightdm";
group = "lightdm";
uid = config.ids.uids.lightdm;
};
+ systemd.tmpfiles.rules = [
+ "d /var/run/lightdm 0711 lightdm lightdm 0"
+ "d /var/cache/lightdm 0711 root lightdm -"
+ "d /var/lib/lightdm 1770 lightdm lightdm -"
+ "d /var/lib/lightdm-data 1775 lightdm lightdm -"
+ "d /var/log/lightdm 0711 root lightdm -"
+ ];
+
users.groups.lightdm.gid = config.ids.gids.lightdm;
services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..
services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there