diff --git a/modules/gui/phosh.nix b/modules/gui/phosh.nix index b4a5f196..1cf145a5 100644 --- a/modules/gui/phosh.nix +++ b/modules/gui/phosh.nix @@ -77,9 +77,10 @@ in } (mkIf cfg.useGreeter { services.xserver.enable = true; + services.xserver.displayManager.lightdm.greeters.gtk.enable = false; # gtk greeter overrides our own? services.xserver.displayManager.lightdm.greeter = { enable = true; - package = pkgs.lightdm-mobile-greeter; + package = pkgs.lightdm-mobile-greeter.xgreeters; name = "lightdm-mobile-greeter"; }; # services.xserver.displayManager.lightdm.enable = true; diff --git a/pkgs/lightdm-mobile-greeter/default.nix b/pkgs/lightdm-mobile-greeter/default.nix index b42dbd12..3fae29e3 100644 --- a/pkgs/lightdm-mobile-greeter/default.nix +++ b/pkgs/lightdm-mobile-greeter/default.nix @@ -3,6 +3,8 @@ , gtk3 , libhandy_0 , lightdm +, pkgs +, linkFarm , pkg-config , rustPlatform }: @@ -36,6 +38,11 @@ rustPlatform.buildRustPackage rec { --replace lightdm-mobile-greeter $out/bin/lightdm-mobile-greeter ''; + passthru.xgreeters = linkFarm "lightdm-mobile-greeter-xgreeters" [{ + path = "${pkgs.lightdm-mobile-greeter}/share/applications/lightdm-mobile-greeter.desktop"; + name = "lightdm-mobile-greeter.desktop"; + }]; + meta = with lib; { description = "A simple log in screen for use on touch screens."; homepage = "https://git.uninsane.org/colin/lightdm-mobile-greeter"; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 67a6796b..6f1f9e2c 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -39,7 +39,7 @@ #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED kaiteki = prev.callPackage ./kaiteki { }; - lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { }; + lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { pkgs = next; }; # kaiteki = prev.kaiteki; # TODO: upstream, or delete nabla nabla = prev.callPackage ./nabla { };