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"]