From e6cae7085712ef4cef326b10437474d187efdffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 1 Aug 2025 20:27:20 +0200 Subject: [PATCH] feat(jj): add difft as default diff --- modules/moritz/profiles/jujutsu.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/moritz/profiles/jujutsu.nix b/modules/moritz/profiles/jujutsu.nix index 0a9f016..7f41ea2 100644 --- a/modules/moritz/profiles/jujutsu.nix +++ b/modules/moritz/profiles/jujutsu.nix @@ -11,6 +11,9 @@ in { options.my.profiles.jujutsu.enable = mkEnableOption "jujutsu profile"; config = mkIf cfg.enable { + users.users.moritz.packages = with pkgs; [ + difftastic + ]; home-manager.users.moritz.programs.jujutsu = { enable = true; package = inputs.jj.packages.${pkgs.system}.default; @@ -19,9 +22,12 @@ in { email = "mail@moritzboeh.me"; name = "Moritz Böhme"; }; - ui.pager.command = ["less" "-FRX"]; - ui.pager.env.LESSCHARSET = "utf-8"; - ui.default-command = "log"; + ui = { + pager.command = ["less" "-FRX"]; + pager.env.LESSCHARSET = "utf-8"; + default-command = "log"; + diff-formatter = ["difft" "--color=always" "$left" "$right"]; + }; signing = { behavior = "drop"; backend = "gpg";