From dae375bd2c37b332a3acb682ea07f05e74c0dcb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev>
Date: Sat, 13 Dec 2025 20:15:49 +0100
Subject: [PATCH] Use diff-so-fancy for JJ diffs

---
 modules/jj.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/jj.nix b/modules/jj.nix
index abe6f59..a256b37 100644
--- a/modules/jj.nix
+++ b/modules/jj.nix
@@ -10,6 +10,9 @@
         default-command = ["log" "--template=log_compact"];
 
         conflict-marker-style = "git";
+
+        pager = ["sh" "-c" "${pkgs.diff-so-fancy}/bin/diff-so-fancy | less '--tabs=4' -RFX"];
+        diff-formatter = ":git";
       };
 
       merge-tools = {
-- 
2.51.2