1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51

diff --git a/home/nogui/git.nix b/home/nogui/git.nix
index e45ec8446a8f4c6e9af986035367af8545e0487c..1576e254c6bf014fbd1e555e591357271d5291b0 100644
--- a/home/nogui/git.nix
+++ b/home/nogui/git.nix
@@ -9,15 +9,6 @@   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
-  sshSigning = {
-    user.signingkey = jolheiser.git.sshKey;
-    commit.gpgSign = true;
-    tag.gpgSign = true;
-    gpg = {
-      format = "ssh";
-      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
-    };
-  };
 in
 {
   age.secrets.git-send-email.file = ../../secrets/git-send-email.age;
@@ -34,6 +25,7 @@     settings = {
       user = {
         name = jolheiser.git.username;
         email = jolheiser.git.email;
+        signingkey = jolheiser.git.sshKey;
       };
       alias = {
         wt = "worktree";
@@ -69,6 +61,12 @@       format = {
         coverLetter = "auto";
         useAutoBase = "whenAble";
       };
+      commit.gpgSign = true;
+      tag.gpgSign = true;
+      gpg = {
+        format = "ssh";
+        ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
+      };
       url =
         insteadOf "jo" "git.jolheiser.com"
         // insteadOf "gh" "github.com"
@@ -76,8 +74,7 @@         // insteadOf "gt" "gitea.com"
         // insteadOf "gl" "gitlab.com"
         // insteadOf "cb" "codeberg.org"
         // insteadOf "tngl" "tangled.sh";
-    }
-    // sshSigning;
+    };
     includes = [ { inherit (config.age.secrets.git-send-email) path; } ];
   };
 }