serguzim/.dotfiles
1
0
Fork 0
Code Issues Pull requests Activity

fix: alias, arch-updates (polybar)

Browse source 
add: vim mergetool
This commit is contained in:
Tobias Reisinger 2020-06-26 18:21:39 +02:00
parent f37f66248f
commit 544bb9ed2c
7 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.config/vim/vimrc
View file

@ -38,12 +38,12 @@ endif
call plug#begin('~/.config/vim/plugged')
Plug 'editorconfig/editorconfig-vim'
Plug 'airblade/vim-gitgutter'
Plug 'samoshkin/vim-mergetool'
Plug 'fidian/hexmode'
Plug 'scrooloose/nerdtree'
Plug 'itchyny/lightline.vim'
Plug 'nanotech/jellybeans.vim'
Plug 'scrooloose/syntastic'
Plug 'tpope/vim-fugitive'
Plug 'sersorrel/vim-lilypond'
Plug 'vim-scripts/DoxygenToolkit.vim'
Plug 'drmikehenry/vim-headerguard'
@ -101,3 +101,5 @@ let g:syntastic_always_populate_loc_list = 0
let g:syntastic_auto_loc_list = 0
let g:syntastic_check_on_open = 1
let g:syntastic_check_on_wq = 0
let g:syntastic_oclint_config_file = '.syntastic_oclint_config'
let g:syntastic_c_config_file = '.syntastic_cc_config'