Commit 4822d80c5785

Vincent Demeester <vincent@sbr.pm>
2025-04-17 18:21:21
systems: fix yubikey.nix more
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent da792ae
Changed files (1)
systems
common
hardware
yubikey.nix
systems/common/hardware/yubikey.nix
@@ -1,4 +1,5 @@
-{ pkgs
+{ lib
+, pkgs
 , desktop
 , ...
 }:
@@ -7,7 +8,7 @@
     yubico-piv-tool
     yubikey-personalization
     yubikey-manager
-  ] ++ lib.optional (builtins.isString desktop) [
+  ] ++ lib.optionals (builtins.isString desktop) [
     yubioath-flutter # Maybe not necessary
   ];
 
@@ -28,12 +29,14 @@
 
   security.pam.u2f = {
     enable = true;
-    origin = "pam://yubi";
-    authFile = pkgs.writeText "u2f-mappings" (lib.concatStrings [
-      "vincent"
-      ":4IiWZI9g6D8W6LeAW13ug4CnS8PreNRcHdcebkUDny3gWGfmpMJg4TgBWaZSIdh+sgg4jQA4MxYwTCmmP/ipWQ==,qOl+ouBRk6MMEJiE7H5LuTAirhBhN0UQrCNlLQoRsVttp6IBKG4yq4zDwm4fmYlfy1MFhvh7oOapMOmodMKJpQ==,es256,+presence" # yubikey5-a
-      ":Sz4J2qMhoE7bE/uzwUzjJxG/bE0s+cw18zXcQjRsLIdJTVbuMad1ivKlYeLZW6vWV0lYiODlRW21HTSaFzu06A==,p7OZ3z5fiAIuJRHVzm56Y8Ti934+4cVHjsG7kaapmz8cWPfXfXfj5c8QiyIz3EQ0hOoxVV5cbkzUTxe7hdQIsA==,es256,+presence" # yubikey5-c1
-    ]);
+    settings = {
+      origin = "pam://yubi";
+      authfile = pkgs.writeText "u2f-mappings" (lib.concatStrings [
+        "vincent"
+        ":4IiWZI9g6D8W6LeAW13ug4CnS8PreNRcHdcebkUDny3gWGfmpMJg4TgBWaZSIdh+sgg4jQA4MxYwTCmmP/ipWQ==,qOl+ouBRk6MMEJiE7H5LuTAirhBhN0UQrCNlLQoRsVttp6IBKG4yq4zDwm4fmYlfy1MFhvh7oOapMOmodMKJpQ==,es256,+presence" # yubikey5-a
+        ":Sz4J2qMhoE7bE/uzwUzjJxG/bE0s+cw18zXcQjRsLIdJTVbuMad1ivKlYeLZW6vWV0lYiODlRW21HTSaFzu06A==,p7OZ3z5fiAIuJRHVzm56Y8Ti934+4cVHjsG7kaapmz8cWPfXfXfj5c8QiyIz3EQ0hOoxVV5cbkzUTxe7hdQIsA==,es256,+presence" # yubikey5-c1
+      ]);
+    };
   };
 
   programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gnome3;