softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-09-03 08:06:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to use nvim for mergetool & battery config update

Browse source
This commit is contained in:
Salar Rahmanian 2022-09-21 20:13:17 -07:00
parent 90571fac9e
commit 285f132d14
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
programs/git/default.nix
View file

@ -7,16 +7,16 @@ let
pager = "diff-so-fancy | less --tabs=4 -RFX";
};
init.defaultBranch = "main";
merge.conflictStyle = "diff3";
merge.tool = "intellij";
mergetool = {
cmd = "idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";
trustExitCode = true;
merge.conflictstyle = "diff3";
merge.tool = "nvim";
mergetool.nvim = {
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
prompt = false;
keepBackup = false;
};
diff.tool = "intellij";
difftool = {
cmd = "idea diff \"$LOCAL\" \"$REMOTE\"";
diff.tool = "nvim";
difftool.nvim = {
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"";
prompt = false;
};
url = {