chore: sign tags and commits by default

Signed-off-by: jolheiser <git@jolheiser.com>

apps/nogui/default.nix

@@ -14,6 +14,7 @@
     ./go.nix
     ./gpg.nix
     #./helix.nix
+    ./jj.nix
     ./jq.nix
     ./lazygit.nix
     ./nushell.nix

apps/nogui/git.nix

@@ -1,18 +1,27 @@
-{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 = {
+    user.signingkey = key;
+    commit.gpgSign = true;
+    tag.gpgSign = true;
+    gpg = {
+      format = "ssh";
+      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
+    };
+  };
 in {
   programs.git = {
     enable = true;
     userName = "jolheiser";
-    userEmail = "john.olheiser@gmail.com";
+    userEmail = "git@jolheiser.com";
-    signing = {
-      signByDefault = true;
-      key = key;
-    };
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
@@ -30,37 +39,32 @@ in {
     };
     lfs.enable = true;
     ignores = [".idea/" "result" "node_modules" "ve"];
-    extraConfig = {
+    extraConfig =
-      init.defaultBranch = "main";
+      {
-      merge.conflictstyle = "zdiff3";
+        init.defaultBranch = "main";
-      diff.colorMoved = "default";
+        merge.conflictstyle = "zdiff3";
-      core.editor = "hx";
+        diff.colorMoved = "default";
-      push = {
+        core.editor = "hx";
-        sutoSetupRemote = true;
+        push = {
-        default = "current";
+          sutoSetupRemote = true;
-        gpgSign = "if-asked";
+          default = "current";
-      };
+          gpgSign = "if-asked";
-      rerere.enabled = true;
+        };
-      pull.rebase = true;
+        rerere.enabled = true;
-      diff.algorithm = "histogram";
+        pull.rebase = true;
-      merge.tool = "hx";
+        diff.algorithm = "histogram";
-      url =
+        merge.tool = "hx";
-        insteadOf "jo" "git.jolheiser.com"
+        url =
-        // insteadOf "gh" "github.com"
+          insteadOf "jo" "git.jolheiser.com"
-        // insteadOf "jj" "git.jojodev.com"
+          // insteadOf "gh" "github.com"
-        // insteadOf "gt" "gitea.com"
+          // insteadOf "jj" "git.jojodev.com"
-        // insteadOf "gl" "gitlab.com"
+          // insteadOf "gt" "gitea.com"
-        // insteadOf "cb" "codeberg.org";
+          // insteadOf "gl" "gitlab.com"
-    };
+          // insteadOf "cb" "codeberg.org";
-    delta = {
+      }
+      // sshSigning;
+    difftastic = {
       enable = true;
-      options = {
-        features = "ctp-mocha";
-        navigate = true;
-        light = false;
-        line-numbers = true;
-        side-by-side = true;
-      };
     };
     includes = [
       {

apps/nogui/jj.nix

@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  programs.jujutsu = {
+    enable = true;
+    settings = {
+      user = {
+        name = "jolheiser";
+        email = "git@jolheiser.com";
+      };
+      ui = {
+        diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
+        editor = "hx";
+      };
+      signing = {
+        sign-all = true;
+        backend = "ssh";
+        key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
+      };
+    };
+  };
+}