| 12345678910111213141516171819202122 |
- #!/usr/bin/fish
- # Customize vim configuration
- cp --link ./Templates/vimrc ~/.vim/vimrc
- # Set bat color theme
- set --export --universal BAT_THEME GitHub
- # Configure git
- git config --global user.email "dev@jovian-hersemeule.eu"
- git config --global user.name "DricomDragon"
- git config --global core.editor "vim"
- git config --global push.followTags true
- git config --global diff.tool vimdiff
- git config --global core.excludesfile '~/.config/gitignore'
- # Git two-ways merge tool (look for whiteinge/diffconflicts in vimrc)
- git config --global merge.tool diffconflicts
- git config --global mergetool.diffconflicts.cmd 'vim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
- git config --global mergetool.diffconflicts.trustExitCode true
- git config --global mergetool.keepBackup false
|
