WIP: add jujutsu (w/ Delta)
This commit is contained in:
parent
946eab9ec0
commit
a0a8dde6ee
3 changed files with 120 additions and 0 deletions
|
|
@ -11,6 +11,10 @@ in
|
|||
git = {
|
||||
enable = my.mkDisableOption "git integration";
|
||||
};
|
||||
|
||||
jujutsu = {
|
||||
enable = my.mkDisableOption "jujutsu integration";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
|
@ -23,6 +27,13 @@ in
|
|||
properly configured.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.jujutsu.enable -> cfg.git.enable;
|
||||
message = ''
|
||||
`config.my.home.delta.jujutsu` relies on `config.my.home.delta.git`
|
||||
being enabled.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
home.packages = [ cfg.package ];
|
||||
|
|
@ -57,5 +68,25 @@ 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 = {
|
||||
diff = {
|
||||
# Delta expects a `git diff` input
|
||||
format = "git";
|
||||
};
|
||||
|
||||
pager = "delta";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue