1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/config.nix b/config.nix
index 17110a96d9dbce0aebf8ee7d46db2d8e06224869..1548d6fe45ea87008731fbd0e0e50ce6b58ec622 100644
--- a/config.nix
+++ b/config.nix
@@ -14,4 +14,9 @@   catppuccin = {
     flavor = "mocha";
     accent = "lavender";
   };
+  git = {
+    username = "jolheiser";
+    email = "git@jolheiser.com";
+    sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
+  };
 }

 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

diff --git a/home/nogui/git.nix b/home/nogui/git.nix
index 85699056418ee4e3946a31afccae8b3af8ec5c8b..65eb46a8aa6e10f96d13c1a7a265b998b6aa7953 100644
--- a/home/nogui/git.nix
+++ b/home/nogui/git.nix
@@ -1,17 +1,21 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  jolheiser,
+  ...
+}:
 let
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
-  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
   sshSigning = {
-    user.signingkey = key;
+    user.signingkey = jolheiser.git.sshKey;
     commit.gpgSign = true;
     tag.gpgSign = true;
     gpg = {
       format = "ssh";
-      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
+      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
     };
   };
 in
@@ -19,8 +23,8 @@ {
   age.secrets.git-send-email.file = ../../secrets/git-send-email.age;
   programs.git = {
     enable = true;
-    userName = "jolheiser";
-    userEmail = "git@jolheiser.com";
+    userName = jolheiser.git.username;
+    userEmail = jolheiser.git.email;
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";

 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

diff --git a/home/nogui/jj.nix b/home/nogui/jj.nix
index baac13ee18764603ddb355dfad536a095392f2fd..36e8a5c01e1d56fccdaffd49dca539b0247c2f8e 100644
--- a/home/nogui/jj.nix
+++ b/home/nogui/jj.nix
@@ -1,11 +1,11 @@
-{ pkgs, ... }:
+{ pkgs, jolheiser, ... }:
 {
   programs.jujutsu = {
     enable = true;
     settings = {
       user = {
-        name = "jolheiser";
-        email = "git@jolheiser.com";
+        name = jolheiser.git.username;
+        email = jolheiser.git.email;
       };
       ui = {
         diff-formatter = [
@@ -17,6 +17,7 @@         ];
         editor = "hx";
         paginate = "never";
         default-command = "status";
+        show-cryptographic-signatures = true;
       };
       templates = {
         git_push_bookmark = ''"change/" ++ change_id.short()'';
@@ -32,10 +33,14 @@             diff.git(),
           )
         '';
       };
+      template-aliases = {
+        "format_timestamp(timestamp)" = "timestamp.ago()";
+      };
       signing = {
         behavior = "own";
         backend = "ssh";
-        key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
+        key = jolheiser.git.sshKey;
+        backends.ssh.allowed-signers = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
       };
       revsets.log = "ancestors(present(@), 5) | ancestors(immutable_heads().., 2) | present(trunk())";
       revset-aliases = {