From 02d763228d8aff317e6e5a319474b6d4d9d826a5 Mon Sep 17 00:00:00 2001 From: ners Date: Sat, 24 Jan 2026 17:23:48 +0100 Subject: [PATCH] difftastic: add jujutsu integration --- modules/programs/difftastic.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/programs/difftastic.nix b/modules/programs/difftastic.nix index 1898f7b7..c703fd42 100644 --- a/modules/programs/difftastic.nix +++ b/modules/programs/difftastic.nix @@ -104,6 +104,16 @@ in ''; }; }; + + jujutsu = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable jujutsu integration for difftastic. + ''; + }; + }; }; config = @@ -142,5 +152,18 @@ in ]; }; }) + + (mkIf (cfg.enable && cfg.jujutsu.enable) { + programs.jujutsu.settings.ui.diff-formatter = [ + (lib.getExe cfg.package) + ] + ++ (lib.cli.toCommandLineGNU { } cfg.options) + ++ [ + "--color=always" + "--sort-paths" + "$left" + "$right" + ]; + }) ]; }