diff options
Diffstat (limited to 'vimrc-full')
-rw-r--r-- | vimrc-full | 33 |
1 files changed, 26 insertions, 7 deletions
@@ -167,6 +167,25 @@ set laststatus=2 | " required by AirLine, | |||
167 | set background=light | | 167 | set background=light | |
168 | 168 | ||
169 | Plug 'itchyny/lightline.vim' | 169 | Plug 'itchyny/lightline.vim' |
170 | let g:lightline = { | ||
171 | \ 'colorscheme': 'PaperColor_light', | ||
172 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, | ||
173 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, | ||
174 | \ 'active': { | ||
175 | \ 'left': [ [ 'mode', 'paste' ], | ||
176 | \ [ 'gitbranch', 'readonly' ] ], | ||
177 | \ 'right': [ [ 'lineinfo' ], | ||
178 | \ [ 'percent' ], | ||
179 | \ [ 'fileformat', 'fileencoding', 'filetype', 'charvaluehex' ] ] | ||
180 | \ }, | ||
181 | \ 'component_function': { | ||
182 | \ 'gitbranch': 'fugitive#head' | ||
183 | \ }, | ||
184 | \ 'tabline': { | ||
185 | \ 'left': [ ['tabs'] ], | ||
186 | \ 'right': [ [ 'close' ] ] | ||
187 | \ } | ||
188 | \ } | ||
170 | 189 | ||
171 | " Plug 'vim-airline/vim-airline' | " beautification of the mode line | 190 | " Plug 'vim-airline/vim-airline' | " beautification of the mode line |
172 | " let g:airline_section_c = "%F" | " was: %F | 191 | " let g:airline_section_c = "%F" | " was: %F |
@@ -281,12 +300,12 @@ if has("python") | |||
281 | " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format) | 300 | " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format) |
282 | 301 | ||
283 | " JEDI: ============================================================================================================== | 302 | " JEDI: ============================================================================================================== |
284 | Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures | 303 | " Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures |
285 | let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe | 304 | " let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe |
286 | let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi | 305 | " let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi |
287 | let g:jedi#show_call_signatures_delay = 0 | 306 | " let g:jedi#show_call_signatures_delay = 0 |
288 | let g:jedi#auto_vim_configure = 0 | 307 | " let g:jedi#auto_vim_configure = 0 |
289 | let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163 | 308 | " let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163 |
290 | " autocmd FileType python jedi.preload_module('os', 'sys', 'math') | 309 | " autocmd FileType python jedi.preload_module('os', 'sys', 'math') |
291 | " let g:pymode_options_max_line_length = 120 | 310 | " let g:pymode_options_max_line_length = 120 |
292 | " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' | 311 | " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' |
@@ -664,7 +683,7 @@ highlight WordBold cterm=bold gui=bold | |||
664 | let w:m1 = 0 | 683 | let w:m1 = 0 |
665 | function! HighlightWordUnderCursor() | 684 | function! HighlightWordUnderCursor() |
666 | if(exists('w:m1') && w:m1 > 0) | 685 | if(exists('w:m1') && w:m1 > 0) |
667 | call matchdelete(w:m1) | 686 | silent! call matchdelete(w:m1) |
668 | let w:m1 = 0 | 687 | let w:m1 = 0 |
669 | endif | 688 | endif |
670 | let l:currentword = escape(expand('<cword>'), '.') | 689 | let l:currentword = escape(expand('<cword>'), '.') |