summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/gdm.nix
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-10-04 22:39:43 +0200
committerTor Hedin Brønner <torhedinbronner@gmail.com>2019-10-05 05:15:29 +0200
commit9be5321097c16d10df0b41b92ccee0a682fb0bff (patch)
treef65112e7a8c15f2313c3464e3c2826e8ad44f4df /nixos/modules/services/x11/display-managers/gdm.nix
parent1efac91ca4d8df849f4f657c1879021671fd9302 (diff)
downloadnixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar.gz
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar.bz2
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar.lz
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar.xz
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.tar.zst
nixpkgs-9be5321097c16d10df0b41b92ccee0a682fb0bff.zip
nixos/gdm: follow upstream's service config
Diffstat (limited to 'nixos/modules/services/x11/display-managers/gdm.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/gdm.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 46c57405c5c..3b4723ce9fe 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -166,9 +166,15 @@ in
       "systemd-machined.service"
       "systemd-user-sessions.service"
       "getty@tty1.service"
+      "plymouth-quit.service"
+      "plymouth-start.service"
     ];
     systemd.services.display-manager.conflicts = [
       "getty@tty1.service"
+      "plymouth-quit.service"
+    ];
+    systemd.services.display-manager.onFailure = [
+      "plymouth-quit.service"
     ];
 
     systemd.services.display-manager.serviceConfig = {
@@ -178,6 +184,9 @@ in
       BusName = "org.gnome.DisplayManager";
       StandardOutput = "syslog";
       StandardError = "inherit";
+      ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
+      KeyringMode = "shared";
+      EnvironmentFile = "-/etc/locale.conf";
     };
 
     systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];