Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0e751e665522
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1169336cd9aa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 6, 2019

  1. nixos/lightdm: improve systemd service 

    These improvements come from shopping around
at what other downstreams have done with their
systemd units and recent changes like [0] to gdm.

Note there's no requries or after on dbus.socket because
settings BusName will set this up automaticallly and
give it a type of dbus.

[0]: https://gitlab.gnome.org/GNOME/gdm/commit/2d57f45962dca4975424c20312d7e04f6ff5d55e
    @worldofpeace
    worldofpeace committed Oct 6, 2019

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: E35C2D7C2C6AC724
    Expired
    Learn about vigilant mode
    Copy the full SHA
    67ac11e View commit details

Commits on Oct 9, 2019

  1. Merge pull request #70448 from worldofpeace/lightdm-improve-systemd 

    nixos/lightdm: improve systemd service
    @worldofpeace
    worldofpeace authored Oct 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1169336 View commit details
Showing with 36 additions and 0 deletions.
  1. +36 −0 nixos/modules/services/x11/display-managers/lightdm.nix
36 changes: 36 additions & 0 deletions nixos/modules/services/x11/display-managers/lightdm.nix
View file
Original file line number Diff line number Diff line change
@@ -220,6 +220,42 @@ in
exec ${lightdm}/sbin/lightdm
'';

# Replaces getty and plymouth quit since it quits plymouth on it's own.
systemd.services.display-manager.conflicts = [
"getty@tty7.service"
"plymouth-quit.service"
];

# Pull in dependencies of services we replace.
systemd.services.display-manager.after = [
"rc-local.service"
"systemd-machined.service"
"systemd-user-sessions.service"
"getty@tty7.service"
"user.slice"
];

# user.slice needs to be present
systemd.services.display-manager.requires = [
"user.slice"
];

# lightdm stops plymouth so when it fails make sure plymouth stops.
systemd.services.display-manager.onFailure = [
"plymouth-quit.service"
];

systemd.services.display-manager.serviceConfig = {
BusName = "org.freedesktop.DisplayManager";
IgnoreSIGPIPE = "no";
# This allows lightdm to pass the LUKS password through to PAM.
# login keyring is unlocked automatic when autologin is used.
KeyringMode = "shared";
KillMode = "mixed";
StandardError = "inherit";
StandardOutput = "syslog";
};

environment.etc."lightdm/lightdm.conf".source = lightdmConf;
environment.etc."lightdm/users.conf".source = usersConf;