From 3b0f5058645dc4bab31a99e56acd903f5e7d3f2b Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Wed, 2 Nov 2022 04:13:41 -0700
Subject: [PATCH] moby: move lightdm-mobile-greeter stuff into nixpkgs

---
 modules/gui/phosh.nix | 31 ++++++++++++++-----------------
 nixpatches/list.nix   | 11 +++++++++++
 pkgs/overlay.nix      |  2 +-
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/modules/gui/phosh.nix b/modules/gui/phosh.nix
index a6176aeb..ba1e7c12 100644
--- a/modules/gui/phosh.nix
+++ b/modules/gui/phosh.nix
@@ -85,23 +85,20 @@ in
       services.xserver.displayManager.job.preStart = ''
         ${pkgs.systemd}/bin/busctl call org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts CacheUser s colin
       '';
-      # services.xserver.displayManager.defaultSession = "sm.puri.Phosh";  # XXX: not sure why this doesn't propagate correctly.
-      services.xserver.displayManager.lightdm.extraSeatDefaults = ''
-        user-session = phosh
-      '';
-      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.xgreeters;
-        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
+      # # services.xserver.displayManager.defaultSession = "sm.puri.Phosh";  # XXX: not sure why this doesn't propagate correctly.
+      # services.xserver.displayManager.lightdm.extraSeatDefaults = ''
+      #   user-session = phosh
+      # '';
+      # 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.xgreeters;
+      #   name = "lightdm-mobile-greeter";
+      # };
+      # # services.xserver.displayManager.lightdm.enable = true;
+
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.displayManager.lightdm.greeters.mobile.enable = true;
 
       systemd.services.phosh.wantedBy = lib.mkForce [];  # disable auto-start
     })
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 163c093d..b9077b78 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -13,6 +13,17 @@ fetchpatch: [
     sha256 = "sha256-FOAZYaMpSPMYwU26xYD+V/f+df0JjlbuVtqjlcBFW5Q=";
   })
 
+  # lightdm-mobile-greeter: init at 2022-10-30
+  (fetchpatch {
+    url = "https://git.uninsane.org/colin/nixpkgs/commit/0a9018c8879d8fe871ee03bc386f8d148e4f88b8.diff";
+    sha256 = "sha256-h1+K8UO4+G6yvl6JFd8xBGitPgOCIY7BunW49eGkXQQ=";
+  })
+  # lightdm: add `greeters.mobile` config option
+  (fetchpatch {
+    url = "https://git.uninsane.org/colin/nixpkgs/commit/1144d6cfe976e7bcfb9611b1d0a66071e17cd569.diff";
+    sha256 = "sha256-ZEvLPqrkpr79yXrsBxgxELR2Awtqk3675jkYZqx2AfY=";
+  })
+
   # # kaiteki: init at 2022-09-03
   # vendorHash changes too frequently (might not be reproducible).
   # using local package defn until stabilized
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
index 6ad90cd6..f26694c6 100644
--- a/pkgs/overlay.nix
+++ b/pkgs/overlay.nix
@@ -41,7 +41,7 @@
 
   #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
   kaiteki = prev.callPackage ./kaiteki { };
-  lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { pkgs = next; };
+  # lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { pkgs = next; };
   browserpass-extension = prev.callPackage ./browserpass-extension { };
   gopass-native-messaging-host = prev.callPackage ./gopass-native-messaging-host { };
   # kaiteki = prev.kaiteki;