1 files changed, 60 insertions, 3 deletions

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index ca8a745..159b5dd 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -88,8 +88,65 @@ _inputs:
   ];
 
   # TODO: move common to NixOS' programs.git.config
-  home-manager.users.minijackson.programs.git.signing = {
-    signByDefault = true;
-    key = "minijackson@riseup.net";
+  home-manager.users.minijackson.programs = {
+    git.signing = {
+      signByDefault = true;
+      key = "minijackson@riseup.net";
+    };
+
+    jujutsu = {
+      enable = true;
+      package = pkgs.unstable.jujutsu;
+      settings = {
+        merge-tools = {
+          difft.diff-args = [
+            "--color=always"
+            "$left"
+            "$right"
+          ];
+          nvim = {
+            diff-args = [ "-d" ];
+            diff-invocation-mode = "file-by-file";
+            merge-args = [
+              "-f"
+              "-d"
+              "$output"
+              "-M"
+              "$left"
+              "$base"
+              "$right"
+              "-c"
+              "wincmd J"
+              "-c"
+              "set modifiable"
+              "-c"
+              "set write"
+            ];
+            merge-tool-edits-conflict-markers = true;
+          };
+        };
+
+        ui = {
+          default-command = [
+            "log"
+            "--reversed"
+          ];
+          # TODO: setup hunk.nvim as diff-editor
+          diff-editor = "nvim";
+          diff.tool = "difft";
+        };
+
+        signing = {
+          sign-all = true;
+          backend = "gpg";
+          key = "minijackson@riseup.net";
+        };
+
+        user = {
+          email = "minijackson@riseup.net";
+          name = "Minijackson";
+        };
+      };
+    };
   };
 }