apps/nogui/default.nix

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

apps/nogui/git.nix

@@ -1,27 +1,18 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
+{config, ...}: let
+  key = "0xB853ADA5DA7BBF7A";
   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 = "git@jolheiser.com";
+    userEmail = "john.olheiser@gmail.com";
+    signing = {
+      signByDefault = true;
+      key = key;
+    };
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
@@ -39,32 +30,37 @@ in {
     };
     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";
-      }
-      // sshSigning;
-    difftastic = {
+    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 = {
       enable = true;
+      options = {
+        features = "ctp-mocha";
+        navigate = true;
+        light = false;
+        line-numbers = true;
+        side-by-side = true;
+      };
     };
     includes = [
       {

apps/nogui/jj.nix

@@ -1,20 +0,0 @@
-{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";
-      };
-    };
-  };
-}