Compare commits
1 commit
e962441ce1
...
b08d2ffe38
Author | SHA1 | Date | |
---|---|---|---|
b08d2ffe38 |
2 changed files with 1 additions and 14 deletions
|
@ -123,21 +123,9 @@ 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 = lib.mkMerge [
|
ui.pager = "bat";
|
||||||
# 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,7 +174,6 @@ 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