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 +1
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9f7c3e6466 - Show all commits

1
home/.gitconfig
View file

@ -24,6 +24,7 @@
[mergetool "nvim-merge"] [mergetool "nvim-merge"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
keepBackup = false
[diff] [diff]
prompt = false prompt = false