From 751f3746c706df64c287f9e88a979a6ed075fb6e Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Mon, 14 Nov 2022 19:28:38 +0100
Subject: [PATCH 1/2] base: switch to gpg-agent for ssh agent

---
 base/programs.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/base/programs.nix b/base/programs.nix
index a18695f..554ec02 100644
--- a/base/programs.nix
+++ b/base/programs.nix
@@ -3,16 +3,11 @@
     fish.enable = true;
     gnupg.agent = {
       enable = true;
+      enableSSHSupport = true;
       pinentryFlavor = "gnome3";
     };
     less.enable = true;
     mosh.enable = true;
-    ssh = {
-      startAgent = true;
-      extraConfig = ''
-        AddKeysToAgent yes
-      '';
-    };
 
     # setcap wrapper for network permissions
     bandwhich.enable = true;

From 25d28d0ace0fbcd1b9003cabe2b290fd5bc0dacd Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Mon, 14 Nov 2022 19:28:56 +0100
Subject: [PATCH 2/2] base: use yubikey ssh key for login

---
 base/users.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/users.nix b/base/users.nix
index 6f5e441..9d4e68c 100644
--- a/base/users.nix
+++ b/base/users.nix
@@ -22,7 +22,7 @@ in {
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3rrF3VSWI4n4cpguvlmLAaU3uftuX4AVV/39S/8GO9 alarsyo@thinkpad"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMbf1C55Hgprm4Y7iNHae2UhZbLa6SNeurDTOyq2tr1G alarsyo@yubikey"
     ];
   };
 }