logistic-bot/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jj: update configuration

Browse source
This commit is contained in:
Khaïs COLIN 2024-12-24 13:05:59 +01:00
parent 2225278847
commit 8ef6734e25
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
home.nix
View file

@ -115,9 +115,12 @@ in {
name = "Khaïs COLIN";
};
ui = {
editor = "nvim";
diff-editor = ["nvim" "-c" "DiffEditor $left $right $output"];
merge-editor = ["nvim" "-c" "DiffEditor $left $right $output"];
editor = "emacsclient";
default-command = "log";
};
merge-tools.ediff = {
program = "sh";
merge-args = ["-c" "emacsclient -c --eval (ediff-merge-files-with-anscestor \"$0\" \"$1\" \"$2\" nil \"$3\")" "$left" "$right" "$base" "$output"];
};
};
};