diff --git a/jj/config.toml b/jj/config.toml index 02ca32b..e1d3eb6 100644 --- a/jj/config.toml +++ b/jj/config.toml @@ -7,6 +7,7 @@ tug = ["bookmark", "move", "--from", "heads(::@- & bookmarks())", "--to", "@-"] [ui] default-command = ["log", "--no-pager"] should-sign-off = true +diff-formatter = ["difft", "--color=always", "--syntax-highlight=off", "$left", "$right"] # diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"] # merge-editor = "vimdiff" # conflict-marker-style = "git" diff --git a/nix/flake.nix b/nix/flake.nix index 97d6c6b..8174ec2 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -55,6 +55,7 @@ pkgs.bacon pkgs.bleve-cli pkgs.btop + pkgs.difftastic pkgs.direnv pkgs.dust pkgs.eza