Compare commits
7 commits
2a6b013a4c
...
6ba5ad7988
| Author | SHA1 | Date | |
|---|---|---|---|
| 6ba5ad7988 | |||
| 134ccd1805 | |||
| 9b9c611097 | |||
| 3d975fbed7 | |||
| 4654c02625 | |||
| fcb4c7ff9e | |||
| 3992c862e9 |
1 changed files with 3 additions and 1 deletions
|
|
@ -50,6 +50,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
# `jj log -p` does not use `delta`
|
||||
# https://github.com/jj-vcs/jj/issues/4142
|
||||
programs.jujutsu = lib.mkIf cfg.jujutsu.enable {
|
||||
settings = {
|
||||
merge-tools = {
|
||||
|
|
@ -64,7 +66,7 @@ in
|
|||
diff-formatter = ":git";
|
||||
|
||||
# `finalPackage` automatically applied `--config` if necessary
|
||||
pager = [ config.programs.delta.finalPackage ];
|
||||
pager = [ (lib.getExe config.programs.delta.finalPackage) ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue