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
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102

diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index b3718693327658a941817a05798169e21f908b48..c7637ee716745b79d0c1c87e811de2d5f707569f 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -1,18 +1,26 @@
-{config, ...}: let
-  key = "0xB853ADA5DA7BBF7A";
+{
+  pkgs,
+  config,
+  ...
+}: let
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
+  sshSigning = {
+    commit.gpgsign = true;
+    user.signingkey = key;
+    gpg = {
+      format = "ssh";
+      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
+    };
+  };
 in {
   programs.git = {
     enable = true;
     userName = "jolheiser";
-    userEmail = "john.olheiser@gmail.com";
-    signing = {
-      signByDefault = true;
-      key = key;
-    };
+    userEmail = "git@jolheiser.com";
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
@@ -30,37 +38,33 @@       tui = "!lazygit";
     };
     lfs.enable = true;
     ignores = [".idea/" "result" "node_modules" "ve"];
-    extraConfig = {
-      init.defaultBranch = "main";
-      merge.conflictstyle = "zdiff3";
-      diff.colorMoved = "default";
-      core.editor = "hx";
-      push = {
-        sutoSetupRemote = true;
-        default = "current";
-        gpgSign = "if-asked";
-      };
-      rerere.enabled = true;
-      pull.rebase = true;
-      diff.algorithm = "histogram";
-      merge.tool = "hx";
-      url =
-        insteadOf "jo" "git.jolheiser.com"
-        // insteadOf "gh" "github.com"
-        // insteadOf "jj" "git.jojodev.com"
-        // insteadOf "gt" "gitea.com"
-        // insteadOf "gl" "gitlab.com"
-        // insteadOf "cb" "codeberg.org";
-    };
-    delta = {
+    extraConfig =
+      {
+        commit.gpgsign = true;
+        init.defaultBranch = "main";
+        merge.conflictstyle = "zdiff3";
+        diff.colorMoved = "default";
+        core.editor = "hx";
+        push = {
+          sutoSetupRemote = true;
+          default = "current";
+          gpgSign = "if-asked";
+        };
+        rerere.enabled = true;
+        pull.rebase = true;
+        diff.algorithm = "histogram";
+        merge.tool = "hx";
+        url =
+          insteadOf "jo" "git.jolheiser.com"
+          // insteadOf "gh" "github.com"
+          // insteadOf "jj" "git.jojodev.com"
+          // insteadOf "gt" "gitea.com"
+          // insteadOf "gl" "gitlab.com"
+          // insteadOf "cb" "codeberg.org";
+      }
+      // sshSigning;
+    difftastic = {
       enable = true;
-      options = {
-        features = "ctp-mocha";
-        navigate = true;
-        light = false;
-        line-numbers = true;
-        side-by-side = true;
-      };
     };
     includes = [
       {

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

diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index ae1983ab9539368ff463ef7ec1fcf6d14d802561..5d6b9f41e4004334dd33f73823e3f9c92809ccf4 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -4,7 +4,7 @@     enable = true;
     settings = {
       user = {
         name = "jolheiser";
-        email = "john@jolheiser.com";
+        email = "git@jolheiser.com";
       };
       ui = {
         diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];