fix: alias, arch-updates (polybar)
add: vim mergetool
This commit is contained in:
parent
f37f66248f
commit
544bb9ed2c
7 changed files with 35 additions and 16 deletions
.config/vim
|
@ -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'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue