diff options
| author | Linus Heckemann <git@sphalerite.org> | 2017-06-25 17:59:23 +0100 |
|---|---|---|
| committer | Tom Hunger <tehunger@gmail.com> | 2017-08-28 15:32:49 +0100 |
| commit | b73e3b6095e5d8d952682d4b868e9ac7f633f0c2 (patch) | |
| tree | b4dc3e28424b6c9a7026f96a02b1c81b4f5e2f4f /nixos/modules/services/x11/display-managers/gdm.nix | |
| parent | 9eafe6706d119d124d2ef5b34876e8e54e8a7559 (diff) | |
| download | nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar.gz nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar.bz2 nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar.lz nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar.xz nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.tar.zst nixpkgs-b73e3b6095e5d8d952682d4b868e9ac7f633f0c2.zip | |
GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from: * Jan Tojnar (@jtojnar) * Linus Heckemann (@lheckemann) * Ryan Mulligan (@ryantm) * romildo (@romildo) * Tom Hunger (@teh)
Diffstat (limited to 'nixos/modules/services/x11/display-managers/gdm.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/gdm.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6c63fede857..0e3b05cc592 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -103,14 +103,29 @@ in (filter (arg: arg != "-terminate") cfg.xserverArgs); GDM_SESSIONS_DIR = "${cfg.session.desktops}"; # Find the mouse - XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons"; + XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons"; }; execCmd = "exec ${gdm}/bin/gdm"; }; # Because sd_login_monitor_new requires /run/systemd/machines systemd.services.display-manager.wants = [ "systemd-machined.service" ]; - systemd.services.display-manager.after = [ "systemd-machined.service" ]; + systemd.services.display-manager.after = [ + "rc-local.service" + "systemd-machined.service" + "systemd-user-sessions.service" + "getty@tty1.service" + ]; + + systemd.services.display-manager.conflicts = [ "getty@tty1.service" ]; + systemd.services.display-manager.serviceConfig = { + # Restart = "always"; - already defined in xserver.nix + KillMode = "mixed"; + IgnoreSIGPIPE = "no"; + BusName = "org.gnome.DisplayManager"; + StandardOutput = "syslog"; + StandardError = "inherit"; + }; systemd.services.display-manager.path = [ gnome3.gnome_session ]; |