diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
| commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
| tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /nixos/modules/services/x11 | |
| parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
| parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) | |
| download | nixlib-595a72589f038e4512ca12232009c97a47fba044.tar nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.gz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.bz2 nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.lz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.xz nixlib-595a72589f038e4512ca12232009c97a47fba044.tar.zst nixlib-595a72589f038e4512ca12232009c97a47fba044.zip | |
Merge master into staging
Diffstat (limited to 'nixos/modules/services/x11')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/mate.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index fb907618d35b..2596ec4ad85c 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -61,6 +61,8 @@ in environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.upower.enable = config.powerManagement.enable; }; + } diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 0117dc9d132b..db83aaf3c19f 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -108,6 +108,8 @@ in services.gnome3.gnome-keyring.enable = true; services.upower.enable = config.powerManagement.enable; + security.pam.services."mate-screensaver".unixAuth = true; + environment.pathsToLink = [ "/share" ]; }; |