diff --git a/base/programs.nix b/base/programs.nix
index 554ec02..a18695f 100644
--- a/base/programs.nix
+++ b/base/programs.nix
@@ -3,11 +3,16 @@
     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;
diff --git a/base/users.nix b/base/users.nix
index 9d4e68c..6f5e441 100644
--- a/base/users.nix
+++ b/base/users.nix
@@ -22,7 +22,7 @@ in {
     ];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMbf1C55Hgprm4Y7iNHae2UhZbLa6SNeurDTOyq2tr1G alarsyo@yubikey"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3rrF3VSWI4n4cpguvlmLAaU3uftuX4AVV/39S/8GO9 alarsyo@thinkpad"
     ];
   };
 }