diff --git a/modules/gui/phosh.nix b/modules/gui/phosh.nix index f7605565c..b4a5f1969 100644 --- a/modules/gui/phosh.nix +++ b/modules/gui/phosh.nix @@ -15,7 +15,7 @@ in launch phosh via a greeter (like lightdm-mobile-greeter). phosh is usable without a greeter, but skipping the greeter means no PAM session. ''; - default = false; + default = true; type = types.bool; }; }; @@ -77,13 +77,18 @@ in } (mkIf cfg.useGreeter { services.xserver.enable = true; - services.xserver.displayManager.lightdm.enable = true; - # services.xserver.displayManager.lightdm.greeters.enso.enable = true; # tried (with reboot); got a mouse then died. next time was black - # services.xserver.displayManager.lightdm.greeters.gtk.enable = true; # tried (with reboot); unusable without OSK - # services.xserver.displayManager.lightdm.greeters.mini.enable = true; # tried (with reboot); unusable without OSK - # services.xserver.displayManager.lightdm.greeters.pantheon.enable = true; # tried (no reboot); unusable without OSK - services.xserver.displayManager.lightdm.greeters.slick.enable = true; # tried; unusable without OSK (a11y -> OSK doesn't work) - # services.xserver.displayManager.lightdm.greeters.tiny.enable = true; # tried; block screen + services.xserver.displayManager.lightdm.greeter = { + enable = true; + package = pkgs.lightdm-mobile-greeter; + name = "lightdm-mobile-greeter"; + }; + # services.xserver.displayManager.lightdm.enable = true; + # # services.xserver.displayManager.lightdm.greeters.enso.enable = true; # tried (with reboot); got a mouse then died. next time was black + # # services.xserver.displayManager.lightdm.greeters.gtk.enable = true; # tried (with reboot); unusable without OSK + # # services.xserver.displayManager.lightdm.greeters.mini.enable = true; # tried (with reboot); unusable without OSK + # # services.xserver.displayManager.lightdm.greeters.pantheon.enable = true; # tried (no reboot); unusable without OSK + # services.xserver.displayManager.lightdm.greeters.slick.enable = true; # tried; unusable without OSK (a11y -> OSK doesn't work) + # # services.xserver.displayManager.lightdm.greeters.tiny.enable = true; # tried; block screen systemd.services.phosh.wantedBy = lib.mkForce []; # disable auto-start }) diff --git a/pkgs/lightdm-mobile-greeter/default.nix b/pkgs/lightdm-mobile-greeter/default.nix index 56c688123..609356dc6 100644 --- a/pkgs/lightdm-mobile-greeter/default.nix +++ b/pkgs/lightdm-mobile-greeter/default.nix @@ -3,28 +3,31 @@ , gtk3 , libhandy_0 , lightdm +, pkg-config , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "lightdm-mobile-greeter"; - version = "6"; + version = "0.1.1"; src = fetchFromGitea { domain = "git.uninsane.org"; owner = "colin"; repo = "lightdm-mobile-greeter"; - # rev = version; # TODO: tag/bump release in rust repo - rev = "93f34bac631e583e4d384eeb19f9f96da8672048"; - hash = "sha256-77J/qLYliXPvYJLtHPvu1P67I2eOxVwYV3JozbG6aZs="; + rev = "v${version}"; + hash = "sha256-jcILF7i+1kZKgAx5YoOBRPI66gadpSZXkn617ZcKnR8="; }; - cargoHash = "sha256-yMXe+K1HolvW/+pSEVHT4Xz9ON50/EkBioytA3E4bYI="; + cargoHash = "sha256-KUJZzbE6nKBITO0iTuFGVOEKyA+RfcBiC1G+Rg0/00w="; buildInputs = [ gtk3 libhandy_0 lightdm ]; + nativeBuildInputs = [ + pkg-config + ]; meta = with lib; { description = "A simple log in screen for use on touch screens.";