chandlerswift/machine-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sam: Add additional opts from old gitconfig

Browse source
This commit is contained in:
Chandler Swift 2025-07-10 14:44:42 -05:00
parent c6b1107a78
commit a3ac063e28
No known key found for this signature in database
GPG key ID: B123483B24A4D579
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sam/configuration.nix
View file

@ -90,15 +90,16 @@
# TODO: delta or diff-so-fancy or difftastic # TODO: delta or diff-so-fancy or difftastic
extraConfig = { extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
diff.wsErrorHighlight = "all";
pull.ff = "only"; pull.ff = "only";
url."https://aur.archlinux.org/".insteadOf = "aur:";
url."ssh://aur@aur.archlinux.org/".pushInsteadOf = "aur:";
url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:"; url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:";
url."ssh://forgejo@bert/chandlerswift/".insteadOf = "forgejo:"; url."ssh://forgejo@bert/chandlerswift/".insteadOf = "forgejo:";
push.autoSetupRemote = true; push.autoSetupRemote = true;
rebase.autosquash = true; rebase.autosquash = true;
rebase.autostash = true; rebase.autostash = true;
fetch.parallel = 0; # "some reasonable default" fetch.parallel = 0; # "some reasonable default"
fetch.prune = true;
merge.conflictstyle = "diff3";
}; };
ignores = [ ignores = [
"*.kate-swp" "*.kate-swp"