From 121eeb538003302558197423e35c9fec3e3f1709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= <khais.colin@gmail.com>
Date: Mon, 30 Sep 2024 21:36:36 +0200
Subject: [PATCH] fingerprint: try using open-fprintd

---
 flake.lock | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
 flake.nix  |  8 ++++++++
 t470.nix   |  8 ++------
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index a50aea6..df1e256 100644
--- a/flake.lock
+++ b/flake.lock
@@ -437,22 +437,39 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
+    "nixos-06cb-009a-fingerprint-sensor": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1722087241,
-        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
+        "lastModified": 1702831324,
+        "narHash": "sha256-bpDHKBDBcuMO14FFdBCEfsW26hzu2lby6xtfoU0jKW4=",
+        "owner": "ahbnr",
+        "repo": "nixos-06cb-009a-fingerprint-sensor",
+        "rev": "58a01fe62f5a71778bffaeb9929a118b4be0d222",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
+        "owner": "ahbnr",
+        "repo": "nixos-06cb-009a-fingerprint-sensor",
         "type": "github"
       }
     },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1720535198,
+        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.11",
+        "type": "indirect"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1719876945,
@@ -480,6 +497,22 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1722087241,
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -599,7 +632,8 @@
       "inputs": {
         "breezex-cursor": "breezex-cursor",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
+        "nixos-06cb-009a-fingerprint-sensor": "nixos-06cb-009a-fingerprint-sensor",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "other-transcode": "other-transcode",
diff --git a/flake.nix b/flake.nix
index 59dadc1..d397280 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,10 @@
       url = "github:logistic-bot/other_video_transcoding_nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nixos-06cb-009a-fingerprint-sensor = {
+      url = "github:ahbnr/nixos-06cb-009a-fingerprint-sensor";
+    };
   };
   outputs = {
     nixpkgs,
@@ -42,6 +46,7 @@
     river-shifttags,
     breezex-cursor,
     other-transcode,
+    nixos-06cb-009a-fingerprint-sensor,
     ...
   }: let
     system = "x86_64-linux";
@@ -92,6 +97,9 @@
 
         stylix.nixosModules.stylix
         ./stylix.nix
+
+        nixos-06cb-009a-fingerprint-sensor.nixosModules.open-fprintd
+        nixos-06cb-009a-fingerprint-sensor.nixosModules.python-validity
       ];
       specialArgs = {
         pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
diff --git a/t470.nix b/t470.nix
index 33b9177..cff33c2 100644
--- a/t470.nix
+++ b/t470.nix
@@ -86,10 +86,6 @@
   };
 
   # fingerprint sensor setup
-  systemd.services.fprintd = {
-    wantedBy = ["multi-user.target"];
-    serviceConfig.type = "simple";
-  };
-
-  services.fprintd.enable = true;
+  services.open-fprintd.enable = true;
+  services.python-validity.enable = true;
 }