FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
pull from: nix
merge into: FunctionalHacker:main
Conversation 0 Commits 1349 Files changed 333 +4 -1
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 82d7b1fbca - Show all commits

5
home/.config/git/config
View file

@ -21,7 +21,7 @@
[merge] [merge]
prompt = false prompt = false
conflictstyle = diff3 conflictstyle = diff3
tool = meld tool = nvim
[mergetool] [mergetool]
keepBackup = false keepBackup = false
@ -30,6 +30,9 @@
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[diff]
tool = nvim
[difftool] [difftool]
prompt = false prompt = false