@@ -32,6 +32,23 @@ ];
 
   programs.zed-editor.package = null;
 
+  programs.git = {
+    signing = {
+      format = "ssh";
+      key = "${config.home.homeDirectory}/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/7ddf377f63c957d7c69185c07ab98a7b.pub";
+      signByDefault = true;
+    };
+    extraConfig.gpg = {
+      ssh = {
+        allowedSignersFile = toString (
+          pkgs.writeText "allowed-signers" ''
+            ${config.programs.git.userEmail} ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJVREjPey2TOIPzfYJoG9yIR4Rui7tNJK2QIKa+pbgsyXg31hhPIw37LRRIic+l53mW8eahHxX3Y1IeTjcMw8IU= alan@alanpearce.eu
+          ''
+        );
+      };
+    };
+  };
+
   home.sessionPath = [
     "/Library/Developer/CommandLineTools/usr/bin"
   ];

@@ -88,6 +88,9 @@
     stat = "stat -x";
   };
 
+  home.sessionVariables = {
+    SSH_AUTH_SOCK = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
+  };
   programs.ssh.extraConfig = ''
     IdentityAgent ~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
   '';

@@ -90,9 +90,6 @@ "branch.main" = {
         rebase = false;
       };
     };
-    signing = {
-      key = "0xCD4BEB92A8D46583";
-    };
     aliases = {
       authors = "shortlog -s -n";
       mup = "merge FETCH_HEAD";