WIP: add jujutsu (w/ Delta)
This commit is contained in:
parent
ac90f1604d
commit
4553f1a7d4
3 changed files with 113 additions and 0 deletions
|
|
@ -14,6 +14,10 @@ in
|
|||
git = {
|
||||
enable = my.mkDisableOption "git integration";
|
||||
};
|
||||
|
||||
jujutsu = {
|
||||
enable = my.mkDisableOption "jujutsu integration";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
@ -75,5 +79,23 @@ in
|
|||
}
|
||||
];
|
||||
};
|
||||
|
||||
programs.jujutsu = lib.mkIf cfg.jujutsu.enable {
|
||||
settings = {
|
||||
merge-tools = {
|
||||
delta = {
|
||||
# Errors are signaled with exit codes greater or equal to 2
|
||||
diff-expected-exit-codes = [ 0 1 ];
|
||||
};
|
||||
};
|
||||
|
||||
ui = {
|
||||
# Delta expects a `git diff` input
|
||||
diff-formatter = ":git";
|
||||
|
||||
pager = [ (lib.getExe cfg.package) "--config=${configPath}" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue