feat(diff): use fancy hunk.nvim for jj diffing
This commit is contained in:
parent
a21d65df11
commit
06f697ff33
2 changed files with 9 additions and 5 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -491,11 +491,11 @@
|
||||||
"nixvim": "nixvim_2"
|
"nixvim": "nixvim_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1724674505,
|
"lastModified": 1725301518,
|
||||||
"narHash": "sha256-QB4MH0l0Pb57F+ClG0NR9xZJdUExT/S1VDFey2bh2y8=",
|
"narHash": "sha256-npglSAZFxmeOQD1RvSvqz39nL8Qjw1DmG+/HZp+yezg=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "f4ea68f9faf9221859a9d3f2a6a7dbecc38edeeb",
|
"rev": "0fab5cc043ae269839c6a2692d1c75a12b10eaf6",
|
||||||
"revCount": 1,
|
"revCount": 3,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/nixvim"
|
"url": "ssh://gitsrht@git.sourcehut.005540.xyz/~logistic-bot/nixvim"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
6
home.nix
6
home.nix
|
|
@ -76,7 +76,11 @@ in {
|
||||||
email = "khais.colin@gmail.com";
|
email = "khais.colin@gmail.com";
|
||||||
name = "Khaïs COLIN";
|
name = "Khaïs COLIN";
|
||||||
};
|
};
|
||||||
ui.editor = "nvim";
|
ui = {
|
||||||
|
editor = "nvim";
|
||||||
|
diff-editor = [ "nvim" "-c" "DiffEditor $left $right $output" ];
|
||||||
|
merge-editor = [ "nvim" "-c" "DiffEditor $left $right $output" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue