turn off powerline characters in ariline, and set vimdiff as difftool

This commit is contained in:
Paul Trowbridge 2020-12-04 20:44:41 -05:00
parent bd26fd665e
commit 001b176294
2 changed files with 4 additions and 2 deletions

View File

@ -12,3 +12,5 @@
date = format:%Y-%m-%d %H:%M:%S date = format:%Y-%m-%d %H:%M:%S
[format] [format]
pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s' pretty = format:'%C(yellow)%h %Cred%ad %Cblue%an %Cgreen%d %Creset%s'
[diff]
tool = vimdiff

4
.vimrc
View File

@ -37,8 +37,8 @@ let g:netrw_winsize = 25
"----airline tabs for buffers------- "----airline tabs for buffers-------
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
let g:airline_theme = 'dark' let g:airline_theme = 'dark'
"let g:tmuxline_powerline_separators = 0 let g:tmuxline_powerline_separators = 0
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 0
let mapleader = ";" let mapleader = ";"
set showcmd set showcmd
map <Leader>a :bn<cr> map <Leader>a :bn<cr>