aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-05-10 21:39:50 +0200
committerMax Christian Pohle2017-05-10 21:39:50 +0200
commit57786e35714948fbb00e167f847ae83eb1ff3663 (patch)
tree2b93c21865bafbb291a559d353316066955cab80
parent9dfe745294a87a1666325bb4959c164422cc84b5 (diff)
downloadvim-karlmarks-57786e35714948fbb00e167f847ae83eb1ff3663.tar.bz2
vim-karlmarks-57786e35714948fbb00e167f847ae83eb1ff3663.zip
Reverted some performance changes because of compatibility
-rw-r--r--vimrc-full60
1 files changed, 9 insertions, 51 deletions
diff --git a/vimrc-full b/vimrc-full
index 6946b1b..be7e226 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -1,13 +1,11 @@
1" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160 1" vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160
2 2
3set t_Co=256 | " required on some ssh sessions 3set t_Co=256 | " required on some ssh sessions
4let &t_Co=256 | "
5" set background=light | " 4" set background=light | "
6" set term=xtermc | " may be required on solaris 5" set term=xtermc | " may be required on solaris
7" set term=xterm-256color 6" set term=xterm-256color
8" set termguicolors 7" set termguicolors
9 8
10
11" START: LOADING PLUGINS 9" START: LOADING PLUGINS
12" ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 10" ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
13call plug#begin() 11call plug#begin()
@@ -41,12 +39,14 @@ nnoremap <F12> :ToggleBufExplorer<CR>
41 39
42" NERDTree: replaces NetRW, as long as it has so many bugs 40" NERDTree: replaces NetRW, as long as it has so many bugs
43Plug 'scrooloose/nerdtree' | " 41Plug 'scrooloose/nerdtree' | "
44let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
45let NERDTreeShowBookmarks = 1 | " show bookmarks by default (when opening for the first time)
46let NERDTreeIgnore = ['\.aux$'] 42let NERDTreeIgnore = ['\.aux$']
43let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
44let NERDTreeChDirMode = 2
45let NERDTreeHiddenFirst = 1
47let NERDTreeMinimalUI = 1 46let NERDTreeMinimalUI = 1
47let NERDTreeShowBookmarks = 1 | " show bookmarks by default (when opening for the first time)
48let NERDTreeWinSize = 40 48let NERDTreeWinSize = 40
49let NERDTreeHiddenFirst = 1 49
50 50
51" depending on if NERDTree has the focus: 51" depending on if NERDTree has the focus:
52nnoremap <expr> 52nnoremap <expr>
@@ -124,8 +124,8 @@ let g:airline#themes#base16#constant = 0
124" Autocompleter: =====================================. 124" Autocompleter: =====================================.
125" 125"
126" ULTISNIPS: code snippet ============================================================================================== 126" ULTISNIPS: code snippet ==============================================================================================
127Plug 'honza/vim-snippets', {'on': [], 'for':['ultisnips']} " dependency of ultisnips (see below) 127Plug 'honza/vim-snippets' " dependency of ultisnips (see below)
128Plug 'SirVer/ultisnips', {'on': []} " replaces loremipsum (and many more) 128Plug 'SirVer/ultisnips' " replaces loremipsum (and many more)
129"let g:UltiSnipsExpandTrigger = '<C-j>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe. 129"let g:UltiSnipsExpandTrigger = '<C-j>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
130"let g:UltiSnipsJumpForwardTrigger = '<C-j>'| " \ 130"let g:UltiSnipsJumpForwardTrigger = '<C-j>'| " \
131"let g:UltiSnipsJumpBackwardTrigger = '<C-k>'| " \ 131"let g:UltiSnipsJumpBackwardTrigger = '<C-k>'| " \
@@ -137,7 +137,7 @@ Plug 'SirVer/ultisnips', {'on': []} " replaces loremipsum (and many m
137" 137"
138" YouCompleteMe: ====================================================================================================== 138" YouCompleteMe: ======================================================================================================
139" Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/... 139" Plug 'Valloric/MatchTagAlways' " highlights the closing tag/brace/...
140Plug 'Valloric/YouCompleteMe', {'on': []} 140Plug 'Valloric/YouCompleteMe'
141let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window 141let g:ycm_add_preview_to_completeopt = 1 " reuse existing preview window
142let g:ycm_autoclose_preview_window_after_insertion = 1 142let g:ycm_autoclose_preview_window_after_insertion = 1
143let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file 143let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file
@@ -155,11 +155,6 @@ let g:ycm_global_ycm_extra_conf = '~/src/ycm_extra_conf.py'
155let g:ycm_semantic_triggers = { 'c': [ 're!.' ] } 155let g:ycm_semantic_triggers = { 'c': [ 're!.' ] }
156let g:ycm_python_binary_path = 'python' " the python interpreter of choice (for code checking) 156let g:ycm_python_binary_path = 'python' " the python interpreter of choice (for code checking)
157 157
158autocmd InsertEnter * call plug#load('vim-snippets', 'ultisnips', 'YouCompleteMe')
159 \| call youcompleteme#Enable()
160 \| nnoremap <F7> :YcmCompleter FixIt<CR>
161
162
163" disable <tab>-key for YCM so that it can be used with ultisnips 158" disable <tab>-key for YCM so that it can be used with ultisnips
164" let g:ycm_key_list_select_completion=[] 159" let g:ycm_key_list_select_completion=[]
165" let g:ycm_key_list_previous_completion=[] 160" let g:ycm_key_list_previous_completion=[]
@@ -172,8 +167,6 @@ autocmd InsertEnter * call plug#load('vim-snippets', 'ultisnips', 'YouCompleteMe
172Plug 'scrooloose/syntastic' 167Plug 'scrooloose/syntastic'
173set statusline+=%#warningmsg# 168set statusline+=%#warningmsg#
174set statusline+=%{SyntasticStatuslineFlag()} 169set statusline+=%{SyntasticStatuslineFlag()}
175" set statusline+=%*
176set signcolumn=yes " always show the column
177let g:LatexBox_latexmk_preview_continuously = 1 170let g:LatexBox_latexmk_preview_continuously = 1
178let g:LatexBox_viewer = "evince" 171let g:LatexBox_viewer = "evince"
179let g:syntastic_always_populate_loc_list = 1 172let g:syntastic_always_populate_loc_list = 1
@@ -317,6 +310,7 @@ set colorcolumn= | " not used, because we have a :match directive f
317set ts=4 sts=4 sw=4 expandtab | " better done with a modeline 310set ts=4 sts=4 sw=4 expandtab | " better done with a modeline
318set updatetime=1000 | " updates the screen more often 311set updatetime=1000 | " updates the screen more often
319set writedelay=0 312set writedelay=0
313set wildmenu | " use a menu in the command line
320"======================================================================================================================= 314"=======================================================================================================================
321 315
322" set fillchars+=stlnc:\― | " 316" set fillchars+=stlnc:\― | "
@@ -527,10 +521,6 @@ if has("autocmd")
527 521
528 " autocmd BufEnter * @f 522 " autocmd BufEnter * @f
529 augroup END 523 augroup END
530
531 if bufname('%') == ''
532 set bufhidden=wipe
533 endif
534endif 524endif
535 525
536 526
@@ -584,8 +574,6 @@ let g:netrw_liststyle = 3 | " 3=tree
584let g:netrw_preview = 0 | " 574let g:netrw_preview = 0 | "
585let g:netrw_winsize = 20 | " window size in percent 575let g:netrw_winsize = 20 | " window size in percent
586 576
587
588"set omnifunc=syntaxcomplete#Complete
589" au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main 577" au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main
590" Enable omni completion. 578" Enable omni completion.
591" autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS 579" autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@@ -597,35 +585,5 @@ let g:netrw_winsize = 20 | " window size in percent
597" autocmd FileType python setlocal omnifunc=pythoncomplete#Complete 585" autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
598" autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS 586" autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
599" autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags 587" autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
600" " Enable heavy omni completion.
601" if !exists('g:neocomplete#sources#omni#input_patterns')
602" let g:neocomplete#sources#omni#input_patterns = {}
603" endif
604" if filereadable(expand("~/.vimrc_background"))
605" let base16colorspace=256
606" source ~/.vimrc_background
607" endif
608" set colorcolumn=80 | " show an indicator (different background in column 80)
609" set title
610" set t_ts=^[k
611" set t_fs=^[\
612" auto BufEnter * :set title | let &titlestring = 'v:' . expand('%')
613" auto VimLeave * :set t_ts=^[k^[\
614" 588"
615" ALTERNATIVE: |
616" LightLine_and_MiniBufExplorer: =====================.
617" Plug 'itchyny/lightline.vim'
618" let g:lightline = {
619" \ 'colorscheme': 'PaperColor',
620" \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
621" \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }
622" \ }
623
624" highlight! link airline_warning Error
625" autocmd User AirlineAfterTheme highlight! airline_warning ctermbg=NONE
626" autocmd AirlineAfterTheme highlight! airline_warning ctermbg=NONE
627" autocmd BufEnter * highlight! link airline_warning Error
628
629
630" autocmd BufEnter * lcd %:p:h | " Plugin vim-rooter get used instead (which is much more sane as well)
631" set termguicolors 589" set termguicolors
..