From 41f3ade99f1fb2385ab1bde5f3c7b7a05c2f02d4 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Mon, 18 Sep 2023 18:11:38 +0200
Subject: [PATCH] Install jujutsu git frontend

---
 home/modules/git.nix       | 5 +++++
 home/modules/jjconfig.toml | 8 ++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 home/modules/jjconfig.toml

diff --git a/home/modules/git.nix b/home/modules/git.nix
index a0ea0af..a9fbf6c 100644
--- a/home/modules/git.nix
+++ b/home/modules/git.nix
@@ -56,12 +56,17 @@ in
       };
     };
 
+    home.file.".jjconfig.toml".source = ./jjconfig.toml;
+
     home.packages = with pkgs; [
       delta
+      git-branchless
       git-lfs
       gitAndTools.hub
       gitAndTools.lab
       gitAndTools.git-absorb
+      jujutsu
+      meld
     ];
   };
 }
diff --git a/home/modules/jjconfig.toml b/home/modules/jjconfig.toml
new file mode 100644
index 0000000..43fbcbd
--- /dev/null
+++ b/home/modules/jjconfig.toml
@@ -0,0 +1,8 @@
+[user]
+name = "Tim Schubert"
+email = "dadada@dadada.li"
+
+[ui]
+diff-editor = ["scm-diff-editor", "--dir-diff", "$left", "$right"]
+diff-instructions = false
+merge-editor = ["meld"]