aboutsummaryrefslogtreecommitdiff
path: root/vimrc-full
diff options
context:
space:
mode:
Diffstat (limited to 'vimrc-full')
-rw-r--r--vimrc-full21
1 files changed, 14 insertions, 7 deletions
diff --git a/vimrc-full b/vimrc-full
index f798d46..f99a5c1 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -2,7 +2,8 @@
2 2
3" scripts from the default vim installation, which do not get loaded by default, but are useful. 3" scripts from the default vim installation, which do not get loaded by default, but are useful.
4" if filereadable($VIMRUNTIME.'/macros/editexisting.vim') 4" if filereadable($VIMRUNTIME.'/macros/editexisting.vim')
5" source $VIMRUNTIME/macros/editexisting.vim 5" " source $VIMRUNTIME/macros/editexisting.vim
6" packadd! editexisting
6" endif 7" endif
7 8
8"======================================================================================================================= 9"=======================================================================================================================
@@ -51,7 +52,7 @@ if has("multi_byte")
51 set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars) 52 set listchars+=extends:» | " symbols used when using :set list (which displays non-printable chars)
52 set listchars+=precedes:« | " symbols used when using :set list (which displays non-printable chars) 53 set listchars+=precedes:« | " symbols used when using :set list (which displays non-printable chars)
53 54
54 set listchars+=tab:\ | " 55 set listchars+=tab:\ | "
55 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars) 56 set listchars+=trail:· | " symbols used when using :set list (which displays non-printable chars)
56 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars) 57 " set listchars+=eol:↲ | " symbols used when using :set list (which displays non-printable chars)
57 " set listchars+=space:· | " symbols used when using :set list (which displays non-printable chars) 58 " set listchars+=space:· | " symbols used when using :set list (which displays non-printable chars)
@@ -88,6 +89,10 @@ if has('cscope') " compiled with cscope support?
88 endif 89 endif
89 90
90 if has('menu') 91 if has('menu')
92 menu &Cscope.create\ and\ add\ database
93 \ :execute '!find -regex ".*\.\(c\\|h\\|cpp\\|cxx\\|hh\\|hpp\\|hxx\)$" <bar> cscope -i- -b -q'<CR>:cscope kill -1<CR>:cscope add .<CR>
94 menu &Cscope.-Sep-
95 \ :
91 menu &Cscope.find.C\ symbol 96 menu &Cscope.find.C\ symbol
92 \ :cscope find s <cword><CR> 97 \ :cscope find s <cword><CR>
93 menu &Cscope.find.definition 98 menu &Cscope.find.definition
@@ -313,7 +318,7 @@ if has("autocmd")
313 autocmd FileType vim setlocal keywordprg=:help |. 318 autocmd FileType vim setlocal keywordprg=:help |.
314 autocmd FileType c,cpp setlocal equalprg=clang-format 319 autocmd FileType c,cpp setlocal equalprg=clang-format
315 autocmd FileType c,cpp setlocal breakat-=- 320 autocmd FileType c,cpp setlocal breakat-=-
316 autocmd WinEnter * if &previewwindow | setlocal nonumber signcolumn=no filetype=c | endif 321 autocmd WinNew * if &previewwindow | setlocal nonumber signcolumn=no filetype=c nobuflisted | endif
317 322
318 323
319 " autocmd FileType c,cpp setlocal iskeyword-=_ 324 " autocmd FileType c,cpp setlocal iskeyword-=_
@@ -625,7 +630,7 @@ let g:lightline = {
625 \ }, 630 \ },
626 \ 'component_expand': { 631 \ 'component_expand': {
627 \ 'buffercurrent': 'lightline#buffer#buffercurrent2', 632 \ 'buffercurrent': 'lightline#buffer#buffercurrent2',
628 \ 'syntastic': 'SyntasticStatuslineFlag', 633 \ 'syntastic': 'SyntasticStatuslineFlag',
629 \ }, 634 \ },
630 \ 'component_type': { 635 \ 'component_type': {
631 \ 'buffercurrent': 'tabsel', 636 \ 'buffercurrent': 'tabsel',
@@ -678,7 +683,7 @@ autocmd! ColorScheme * call ExtendLightlineColorTheme()
678 let g:ycm_global_ycm_extra_conf = '.ycm_extra_conf.py' 683 let g:ycm_global_ycm_extra_conf = '.ycm_extra_conf.py'
679 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] } 684 let g:ycm_semantic_triggers = { 'c': [ 're!.' ] }
680 " let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we? 685 " let g:ycm_disable_for_files_larger_than_kb = 16384 " we have faaast computers, don't we?
681 let g:ycm_show_diagnostics_ui = 1 686 let g:ycm_show_diagnostics_ui = 0
682 " disable <tab>-key for YCM so that it can be used with ultisnips 687 " disable <tab>-key for YCM so that it can be used with ultisnips
683 let g:ycm_key_list_select_completion=[] 688 let g:ycm_key_list_select_completion=[]
684 let g:ycm_key_list_previous_completion=[] 689 let g:ycm_key_list_previous_completion=[]
@@ -778,10 +783,12 @@ function! ExtendColorTheme()
778 " use the default terminal background color as background (allows transparency) 783 " use the default terminal background color as background (allows transparency)
779 " highlight! Normal guibg=NONE ctermbg=NONE 784 " highlight! Normal guibg=NONE ctermbg=NONE
780 " highlight! NonText guibg=NONE guifg=black ctermbg=NONE ctermfg=black 785 " highlight! NonText guibg=NONE guifg=black ctermbg=NONE ctermfg=black
781 highlight! EndOfBuffer guifg=white ctermfg=white 786
787 " make the ~ (tilde) indicator invisible, which usually marks the EOF
788 highlight! EndOfBuffer ctermfg=bg
782 789
783 highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE 790 highlight! CursorLineNr cterm=inverse | " ctermbg=black ctermfg=NONE
784 highlight! Pmenu ctermbg=LightYellow ctermfg=blue 791 highlight! Pmenu ctermbg=LightYellow ctermfg=DarkGrey
785 highlight! PmenuSel ctermbg=blue ctermfg=LightYellow cterm=bold 792 highlight! PmenuSel ctermbg=blue ctermfg=LightYellow cterm=bold
786 793
787 highlight! link PmenuSbar Pmenu 794 highlight! link PmenuSbar Pmenu
..