From d8af9efc9bfec2ae3178135da0c6e6ea6d7aa65a Mon Sep 17 00:00:00 2001
From: Bruno Carlin <dev@mail.bcarlin.net>
Date: Tue, 11 Feb 2025 15:23:05 +0100
Subject: [PATCH] feat(jujutsu): add jj conf

---
 jujutsu/.config/jj/config.toml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 jujutsu/.config/jj/config.toml

diff --git a/jujutsu/.config/jj/config.toml b/jujutsu/.config/jj/config.toml
new file mode 100644
index 0000000..30d58ff
--- /dev/null
+++ b/jujutsu/.config/jj/config.toml
@@ -0,0 +1,28 @@
+
+[user]
+name = "Bruno Carlin"
+email = "dev@mail.bcarlin.net"
+
+[ui]
+default-command = "log"
+graph.style = "curved"
+editor = "nvim"
+diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
+merge-editor = "nvim"
+diff.tool = ["delta", "--syntax-theme", "Solarized (dark)", "$left", "$right"]
+
+[merge-tools.nvim]
+diff-args = ["-d", "$left", "$right"]
+merge-args = ["-d", "$left", "$base", "$right", "-c", "wincmd l"]
+merge-tool-edits-conflict-markers = true
+
+[colors]
+"rest" = "bright green"
+"working_copy empty" = "green"
+"working_copy empty description placeholder" = "green"
+"working_copy commit_id" = "blue"
+"working_copy change_id" = "magenta"
+"working_copy timestamp" = "cyan"
+
+[git]
+subprocess = true