Compare commits
3 commits
b08d2ffe38
...
e962441ce1
Author | SHA1 | Date | |
---|---|---|---|
e962441ce1 | |||
77c73c2ea9 | |||
fe00695bde |
2 changed files with 14 additions and 1 deletions
|
@ -123,9 +123,21 @@ in
|
||||||
# Jujutsu (alternative DVCS (git-compatible))
|
# Jujutsu (alternative DVCS (git-compatible))
|
||||||
jujutsu = {
|
jujutsu = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
# Use the more up to date version of jj
|
||||||
package = pkgs.unstable.jujutsu;
|
package = pkgs.unstable.jujutsu;
|
||||||
settings = {
|
settings = {
|
||||||
ui.pager = "bat";
|
ui = lib.mkMerge [
|
||||||
|
# If `bat` is available use it as the pager
|
||||||
|
(lib.mkIf config.programs.bat.enable { pager = "bat"; })
|
||||||
|
# if hunk.nvim is enabled use it as a diff editor
|
||||||
|
(lib.mkIf config.programs.nixvim.plugins.hunk.enable {
|
||||||
|
diff-editor = [
|
||||||
|
"nvim"
|
||||||
|
"-c"
|
||||||
|
"DiffEditor $left $right $output"
|
||||||
|
];
|
||||||
|
})
|
||||||
|
];
|
||||||
fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
|
fix.tools = builtins.mapAttrs (tool: cmd: jjFormatters.${tool} cmd) nvimFormatters;
|
||||||
# mimic git commit --verbose by adding a diff
|
# mimic git commit --verbose by adding a diff
|
||||||
templates.draft_commit_description = ''
|
templates.draft_commit_description = ''
|
||||||
|
|
|
@ -174,6 +174,7 @@ in
|
||||||
mode = "virtualtext";
|
mode = "virtualtext";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
hunk.enable = true;
|
||||||
otter.enable = true;
|
otter.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue