diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-16 17:15:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 17:15:05 +0200 |
commit | 6f8fe25ccfb138d716d3b1c0cea25e6f11208d45 (patch) | |
tree | df4b2de307ea49d1efe917660da5fae0f4965b83 /nixos/modules | |
parent | ed2148b5af8b4d4f6f5ecbc4bd72ecabe1c25acc (diff) | |
parent | 7fbdd7fcf4242f406182c4b2671f25e1d2c86397 (diff) | |
download | nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar.gz nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar.bz2 nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar.lz nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar.xz nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.tar.zst nixlib-6f8fe25ccfb138d716d3b1c0cea25e6f11208d45.zip |
Merge pull request #45107 from mnacamura/lightdm-accountsservice
lightdm: enable the accounts daemon to find dbus interface
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/desktops/accountsservice.nix | 10 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index 2a7450669ea0..933b9da2c83c 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -32,15 +32,21 @@ with lib; environment.systemPackages = [ pkgs.accountsservice ]; + # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice + environment.pathsToLink = [ "/share/accountsservice" ]; + services.dbus.packages = [ pkgs.accountsservice ]; systemd.packages = [ pkgs.accountsservice ]; - systemd.services.accounts-daemon= { + systemd.services.accounts-daemon = { wantedBy = [ "graphical.target" ]; - } // (mkIf (!config.users.mutableUsers) { + # Accounts daemon looks for dbus interfaces in $XDG_DATA_DIRS/accountsservice + environment.XDG_DATA_DIRS = "${config.system.path}/share"; + + } // (optionalAttrs (!config.users.mutableUsers) { environment.NIXOS_USERS_PURE = "true"; }); }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 6be15d8cdf46..dc82f7086c82 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -15,7 +15,7 @@ let inherit (pkgs) lightdm writeScript writeText; - # lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup + # lightdm runs with clearenv(), but we need a few things in the environment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' #! ${pkgs.bash}/bin/bash @@ -209,9 +209,12 @@ in services.dbus.enable = true; services.dbus.packages = [ lightdm ]; - # lightdm uses the accounts daemon to rember language/window-manager per user + # lightdm uses the accounts daemon to remember language/window-manager per user services.accounts-daemon.enable = true; + # Enable the accounts daemon to find lightdm's dbus interface + environment.systemPackages = [ lightdm ]; + security.pam.services.lightdm = { allowNullPassword = true; startSession = true; |