Reverted some performance changes because of compatibility

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 @@
 " vim: tabstop=2 softtabstop=2 shiftwidth=2 textwidth=160
 
 set t_Co=256                  | " required on some ssh sessions
-let &t_Co=256                 | "
 " set background=light          | "
 " set term=xtermc             | " may be required on solaris
 " set term=xterm-256color
 " set termguicolors
 
-
 " START: LOADING PLUGINS
 " ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 call plug#begin()
@@ -41,12 +39,14 @@ nnoremap <F12> :ToggleBufExplorer<CR>
 
 " NERDTree: replaces NetRW, as long as it has so many bugs
 Plug 'scrooloose/nerdtree'            | "
-let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
-let NERDTreeShowBookmarks         = 1 | " show bookmarks by default (when opening for the first time)
 let NERDTreeIgnore                = ['\.aux$']
+let NERDTreeCascadeSingleChildDir = 0 | " I don't get how one can use <m> to create files in that included directory
+let NERDTreeChDirMode             = 2
+let NERDTreeHiddenFirst           = 1
 let NERDTreeMinimalUI             = 1
+let NERDTreeShowBookmarks         = 1 | " show bookmarks by default (when opening for the first time)
 let NERDTreeWinSize               = 40
-let NERDTreeHiddenFirst           = 1
+
 
 " depending on if NERDTree has the focus:
 nnoremap <expr>
@@ -124,8 +124,8 @@ let g:airline#themes#base16#constant = 0
 " Autocompleter: =====================================.
 " 
 " ULTISNIPS: code snippet ==============================================================================================
-Plug 'honza/vim-snippets', {'on': [], 'for':['ultisnips']}    " dependency of ultisnips (see below)
-Plug 'SirVer/ultisnips', {'on': []}            " replaces loremipsum (and many more)
+Plug 'honza/vim-snippets'                                     " dependency of ultisnips (see below)
+Plug 'SirVer/ultisnips'                        " replaces loremipsum (and many more)
 "let g:UltiSnipsExpandTrigger       = '<C-j>'| " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
 "let g:UltiSnipsJumpForwardTrigger  = '<C-j>'| " \
 "let g:UltiSnipsJumpBackwardTrigger = '<C-k>'| " \
@@ -137,7 +137,7 @@ Plug 'SirVer/ultisnips', {'on': []}            " replaces loremipsum (and many m
 " 
 " YouCompleteMe: ======================================================================================================
 " Plug 'Valloric/MatchTagAlways'                           " highlights the closing tag/brace/...
-Plug 'Valloric/YouCompleteMe', {'on': []}
+Plug 'Valloric/YouCompleteMe'
 let g:ycm_add_preview_to_completeopt               = 1   " reuse existing preview window
 let g:ycm_autoclose_preview_window_after_insertion = 1
 let 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'
 let g:ycm_semantic_triggers                        = { 'c': [ 're!.' ] }
 let g:ycm_python_binary_path                       = 'python' " the python interpreter of choice (for code checking)
 
-autocmd InsertEnter * call plug#load('vim-snippets', 'ultisnips', 'YouCompleteMe')
-      \| call youcompleteme#Enable()
-      \| nnoremap <F7> :YcmCompleter FixIt<CR>
-
-
 " disable <tab>-key for YCM so that it can be used with ultisnips
 " let g:ycm_key_list_select_completion=[]
 " let g:ycm_key_list_previous_completion=[]
@@ -172,8 +167,6 @@ autocmd InsertEnter * call plug#load('vim-snippets', 'ultisnips', 'YouCompleteMe
 Plug 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
-" set statusline+=%*
-set signcolumn=yes                                    " always show the column
 let g:LatexBox_latexmk_preview_continuously = 1
 let g:LatexBox_viewer                       = "evince"
 let g:syntastic_always_populate_loc_list    = 1
@@ -317,6 +310,7 @@ set colorcolumn=              | " not used, because we have a :match directive f
 set ts=4 sts=4 sw=4 expandtab | " better done with a modeline
 set updatetime=1000           | " updates the screen more often
 set writedelay=0
+set wildmenu                  | " use a menu in the command line
 "=======================================================================================================================
 
 " set fillchars+=stlnc:\―       | "
@@ -527,10 +521,6 @@ if has("autocmd")
 
     " autocmd BufEnter * @f
   augroup END
-
-  if bufname('%') == ''
-      set bufhidden=wipe
-  endif
 endif
 
 
@@ -584,8 +574,6 @@ let g:netrw_liststyle     = 3       | " 3=tree
 let g:netrw_preview       = 0       | "
 let g:netrw_winsize       = 20      | " window size in percent
 
-
-"set omnifunc=syntaxcomplete#Complete
 " au BufNewFile,BufRead,BufEnter *.cpp,*.hpp set omnifunc=omni#cpp#complete#Main
 " Enable omni completion.
 " autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@@ -597,35 +585,5 @@ let g:netrw_winsize       = 20      | " window size in percent
 " autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
 " autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
 " autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-" " Enable heavy omni completion.
-" if !exists('g:neocomplete#sources#omni#input_patterns')
-"   let g:neocomplete#sources#omni#input_patterns = {}
-" endif
-" if filereadable(expand("~/.vimrc_background"))
-"   let base16colorspace=256
-"   source ~/.vimrc_background
-" endif
-" set colorcolumn=80            | " show an indicator (different background in column 80)
-" set title
-" set t_ts=^[k
-" set t_fs=^[\
-" auto BufEnter * :set title | let &titlestring = 'v:' . expand('%')
-" auto VimLeave * :set t_ts=^[k^[\
 "
-" ALTERNATIVE:                                        |
-" LightLine_and_MiniBufExplorer: =====================.
-" Plug 'itchyny/lightline.vim'
-" let g:lightline = {
-"       \ 'colorscheme': 'PaperColor',
-"       \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
-"       \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }
-"       \ }
-
-" highlight! link airline_warning Error
-" autocmd User AirlineAfterTheme highlight! airline_warning ctermbg=NONE
-" autocmd AirlineAfterTheme highlight! airline_warning ctermbg=NONE
-" autocmd BufEnter * highlight! link airline_warning Error
-
-
-" autocmd BufEnter * lcd %:p:h        | " Plugin vim-rooter get used instead (which is much more sane as well)
 " set termguicolors