summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/x11/display-managers
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-18 11:16:21 -0400
committerGitHub <noreply@github.com>2019-09-18 11:16:21 -0400
commit760b677c19ba6b1e6988e72c912270a561516939 (patch)
tree544d26a373aad55916a07b03c7350c7ecf8ca120 /nixos/modules/services/x11/display-managers
parentee29fbd9a2f6b6f8222e4a0711baeb404406aedd (diff)
parent5e936cab202fc356bf727d1d6f188bcf876a4c07 (diff)
Merge pull request #68729 from worldofpeace/elementary-greeter/master
nixos/pantheon: use Pantheon's greeter
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix14
1 files changed, 1 insertions, 13 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
index bfba174144a1..29cb6ccbc06b 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix
@@ -8,11 +8,6 @@ let
ldmcfg = dmcfg.lightdm;
cfg = ldmcfg.greeters.pantheon;
- xgreeters = pkgs.linkFarm "pantheon-greeter-xgreeters" [{
- path = "${pkgs.pantheon.elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop";
- name = "io.elementary.greeter.desktop";
- }];
-
in
{
options = {
@@ -33,17 +28,10 @@ in
config = mkIf (ldmcfg.enable && cfg.enable) {
- warnings = [
- ''
- The Pantheon greeter is suboptimal in NixOS and can possibly put you in
- a situation where you cannot start a session when switching desktopManagers.
- ''
- ];
-
services.xserver.displayManager.lightdm.greeters.gtk.enable = false;
services.xserver.displayManager.lightdm.greeter = mkDefault {
- package = xgreeters;
+ package = pkgs.pantheon.elementary-greeter.xgreeters;
name = "io.elementary.greeter";
};