Andrew/configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use VSCodium merge tool

Browse source
This commit is contained in:
Andrew Kvalheim 2022-08-18 16:28:29 -07:00
parent 866aacd5b5
commit f161dcd95f
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/components/editor.nix
View file

@ -296,4 +296,6 @@ in
};
programs.zsh.shellAliases.code = "codium";
programs.git.extraConfig."mergetool \"code\"".cmd = "${pkgs.vscodium}/bin/codium --wait --merge $REMOTE $LOCAL $BASE $MERGED";
}

1
common/components/git.nix
View file

@ -76,6 +76,7 @@
init.defaultBranch = "main";
merge.commit = false;
merge.conflictStyle = "zdiff3";
merge.tool = "code";
push.followTags = true;
diff.image.command = "${pkgs.git-diff-image}/bin/git_diff_image";