aboutsummaryrefslogtreecommitdiff
path: root/vimrc-full
diff options
context:
space:
mode:
authorMax Christian Pohle2017-06-11 01:45:25 +0200
committerMax Christian Pohle2017-06-11 01:45:25 +0200
commit0dd996f2c3151c5915b6b1f127f0655c2f83d9d4 (patch)
tree421a1011c20ec74442b1d16e9b47d2765cfa2bc4 /vimrc-full
parent44dcf9e53ee0e2f3700ecb326716c2b795593629 (diff)
downloadvim-0dd996f2c3151c5915b6b1f127f0655c2f83d9d4.tar.bz2
vim-0dd996f2c3151c5915b6b1f127f0655c2f83d9d4.zip
Bugfixes, switched from airline to lightline
Diffstat (limited to 'vimrc-full')
-rw-r--r--vimrc-full94
1 files changed, 50 insertions, 44 deletions
diff --git a/vimrc-full b/vimrc-full
index e605d38..fac043b 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -166,49 +166,51 @@ nnoremap <F9> :TagbarToggle<CR>| " bind TagBar to Hotkey Ct
166set laststatus=2 | " required by AirLine, without status line does not appear until a window split 166set laststatus=2 | " required by AirLine, without status line does not appear until a window split
167set background=light | 167set background=light |
168 168
169Plug 'vim-airline/vim-airline' | " beautification of the mode line 169Plug 'itchyny/lightline.vim'
170let g:airline_section_c = "%F" | " was: %F 170
171let g:airline_detect_modified = 1 | 171" Plug 'vim-airline/vim-airline' | " beautification of the mode line
172let g:airline_detect_paste = 0 | 172" let g:airline_section_c = "%F" | " was: %F
173let g:airline_exclude_preview = 0 | 173" let g:airline_detect_modified = 1 |
174let g:airline_inactive_collapse = 1 | 174" let g:airline_detect_paste = 0 |
175let g:airline_powerline_fonts = 1 | 175" let g:airline_exclude_preview = 0 |
176let g:airline_skip_empty_sections = 1 | 176" let g:airline_inactive_collapse = 1 |
177" let g:airline_extensions = [] | 177" let g:airline_powerline_fonts = 1 |
178 178" let g:airline_skip_empty_sections = 1 |
179let g:airline#extensions#tabline#enabled = 1 | 179" let g:airline_extensions = [] |
180let g:airline#extensions#tabline#left_alt_sep = '' | 180"
181let g:airline#extensions#tabline#left_sep = '' | 181" let g:airline#extensions#tabline#enabled = 1 |
182let g:airline#extensions#tabline#right_alt_sep = '' | 182" let g:airline#extensions#tabline#left_alt_sep = '' |
183let g:airline#extensions#tabline#right_sep = '' | 183" let g:airline#extensions#tabline#left_sep = '' |
184let g:airline#extensions#tabline#fnamemod = ':t' | " let airline just show the filename without its path 184" let g:airline#extensions#tabline#right_alt_sep = '' |
185let g:airline#extensions#tabline#disable_refresh = 0 | 185" let g:airline#extensions#tabline#right_sep = '' |
186let g:airline#extensions#tabline#enabled = 1 | 186" let g:airline#extensions#tabline#fnamemod = ':t' | " let airline just show the filename without its path
187let g:airline#extensions#tabline#show_buffers = 1 | 187" let g:airline#extensions#tabline#disable_refresh = 1 | " refresh airline on bufadd ?
188let g:airline#extensions#tabline#show_tabs = 0 | 188" let g:airline#extensions#tabline#enabled = 1 |
189let g:airline#extensions#tabline#ignore_bufadd_pat = '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree|preview|^$' 189" let g:airline#extensions#tabline#show_buffers = 1 |
190 190" let g:airline#extensions#tabline#show_tabs = 0 |
191let g:airline_extensions#branch#enabled = 1 | 191" let g:airline#extensions#tabline#ignore_bufadd_pat = '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree|preview|^$'
192let g:airline_extensions#whitespace#enabled = 1 | 192"
193let b:airline_whitespace_checks = ['indent', 'trailing', 'long', 'mixed-indent-file'] 193" let g:airline_extensions#branch#enabled = 1 |
194 194" let g:airline_extensions#whitespace#enabled = 0 | " airlines whitespace check is slow :/
195if has('python') 195" let b:airline_whitespace_checks = ['indent', 'trailing', 'long', 'mixed-indent-file']
196 let g:airline_extensions#syntastic#enabled = 1 | 196"
197 let g:airline_extensions#ycm#enabled = 1 | 197" if has('python')
198endif 198" let g:airline_extensions#syntastic#enabled = 1 |
199 199" let g:airline_extensions#ycm#enabled = 1 |
200let g:airline#extensions#tagbar#flags = 'f' | " even though the airline extension is off this controls :h tagbar-extend 200" endif
201let g:airline#extensions#tagbar#enabled = 0 | 201"
202 202" let g:airline#extensions#tagbar#flags = 'f' | " even though the airline extension is off this controls :h tagbar-extend
203" AIRLINE_Theme: 203" let g:airline#extensions#tagbar#enabled = 0 |
204Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme 204"
205let base16colorspace=256 | 205" " AIRLINE_Theme:
206let g:airline_theme='base16' | " specifies which colorscheme should airline uses 206" Plug 'vim-airline/vim-airline-themes' | " airline themes to match any light and dark terminal using :AirlineTheme
207let g:airline#themes#base16#constant = 0 | 207" let base16colorspace=256 |
208" let g:solarized_base16 = 1 208" let g:airline_theme='base16' | " specifies which colorscheme should airline uses
209" let g:airline_base16_improved_contrast = 1 209" let g:airline#themes#base16#constant = 0 |
210" let g:airline_theme='badcat' | " specifies which colorscheme should airline uses 210" " let g:solarized_base16 = 1
211" let g:airline_theme='papercolor' | " specifies which colorscheme should ionirline uses 211" " let g:airline_base16_improved_contrast = 1
212" " let g:airline_theme='badcat' | " specifies which colorscheme should airline uses
213" " let g:airline_theme='papercolor' | " specifies which colorscheme should ionirline uses
212 214
213" Autocompleter: ===================================== 215" Autocompleter: =====================================
214if has("python") 216if has("python")
@@ -593,7 +595,7 @@ if has("autocmd")
593 " autocmd BufEnter * @f 595 " autocmd BufEnter * @f
594 augroup END 596 augroup END
595 597
596 autocmd VimEnter * set nobuflisted 598 " autocmd VimEnter * set nobuflisted
597endif 599endif
598 600
599 601
@@ -659,6 +661,7 @@ let g:netrw_winsize = 20 | " window size in percent
659 661
660 662
661highlight WordBold cterm=bold gui=bold 663highlight WordBold cterm=bold gui=bold
664let w:m1 = 0
662function! HighlightWordUnderCursor() 665function! HighlightWordUnderCursor()
663 if(exists('w:m1') && w:m1 > 0) 666 if(exists('w:m1') && w:m1 > 0)
664 call matchdelete(w:m1) 667 call matchdelete(w:m1)
@@ -670,6 +673,9 @@ function! HighlightWordUnderCursor()
670 endif 673 endif
671endfunction 674endfunction
672autocmd! CursorHold,CursorHoldI * call HighlightWordUnderCursor() 675autocmd! CursorHold,CursorHoldI * call HighlightWordUnderCursor()
676if version >= 702 " clean up (see: http://vim.wikia.com/wiki/VimTip396)
677 autocmd BufWinLeave * call clearmatches()
678endif
673 679
674" au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main 680" au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main
675" Enable omni completion. 681" Enable omni completion.
..