6 files changed, 101 insertions, 123 deletions

diff --git a/.gitmodules b/.gitmodules
index 75554b2..605d959 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "bundle/Vundle.vim"]
-        path = bundle/Vundle.vim
-        url = https://github.com/VundleVim/Vundle.vim.git
+[submodule "autoload"]
+        path = autoload
+        url = https://github.com/junegunn/vim-plug
diff --git a/autoload b/autoload
new file mode 160000
+Subproject 645415884669c81b2ebbcb2d341081956cc8222
diff --git a/bundle/Vundle.vim b/bundle/Vundle.vim
deleted file mode 160000
-Subproject 4984767509e3d05ca051e253c8a8b37de784be4
diff --git a/doc/shortcuts.txt b/doc/shortcuts.txt
index a95e530..3b12d57 100644
--- a/doc/shortcuts.txt
+++ b/doc/shortcuts.txt
@@ -72,5 +72,6 @@ the last line can be a mode line, which holds settings like tab width:
 
 [special]
 g CTRL-g        = display file properties including word and char count
+CTRL-X CTRL-F   = display file name completions using (vim-internal) omnicomplete
 
 # vim: noai:ts=2:sw=2 filetype=dosini
diff --git a/plugged b/plugged
new file mode 120000
index 0000000..92d0b93
--- /dev/null
+++ b/plugged
@@ -0,0 +1 @@
+bundle/
\ No newline at end of file
diff --git a/vimrc b/vimrc
index 80c637a..7a9ea91 100644
--- a/vimrc
+++ b/vimrc
@@ -1,110 +1,77 @@
-set nocompatible             " be iMproved, required
-filetype off                 " required
-set shell=/bin/bash          " Vundle does strange things without
-
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-" let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
-
-" Brilliant Plugins by tpope =========================.
-Plugin 'tpope/vim-sensible'                           | " a sane and modern default configuration
-Plugin 'tpope/vim-surround'                           | " plugin makes cs"' inside a line replace " with '
-Plugin 'tpope/vim-vinegar'                            | " Improves :Explore
-" Plugin 'tpope/vim-fugitive'                          | " the most complete GIT integration plugin
-" Plugin 'tpope/vim-repeat'                            | " lets . (dot) repeat plugin macros as well, specifically vim-surround
-" Plugin 'susam/vimer'
-" Plugin 'tpope/vim-characterize'                      | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
-
-" Colorschemes =======================================.
-Plugin 'nelstrom/vim-mac-classic-theme'               | " light theme
-Plugin 'Valloric/vim-valloric-colorscheme'
-" let base16colorspace=256  " Access colors present in 256 colorspace
-Plugin 'chriskempson/vim-tomorrow-theme'
-Plugin 'chriskempson/base16-vim'
-"let g:miniBufExplSplitToEdge = 1
-
-" AIRLINE ============================================.
-" Plugin 'itchyny/lightline.vim'
-" let g:lightline = {
-"       \ 'colorscheme': 'PaperColor',
-"       \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
-"       \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }
-"       \ }
-" Plugin 'fholgado/minibufexpl.vim'
-" let g:miniBufExplAutoStart = 1
-" let g:miniBufExplShowBufNumbers = 0
-" let g:miniBufExplBRSplit = 1
-" let g:miniBufExplVSplit = 20   " column width in chars
-Plugin 'vim-airline/vim-airline'                      | " beautification of the mode line
-Plugin 'vim-airline/vim-airline-themes'               | " airline themes to match any light and dark terminal using :AirlineTheme
+call plug#begin()
+
+" Brilliant_Plugins_by_tpope: ========================.
+Plug 'tpope/vim-sensible'                             | " a sane and modern default configuration
+Plug 'tpope/vim-surround'                             | " plugin makes cs"' inside a line replace " with '
+Plug 'tpope/vim-vinegar'                              | " Improves :Explore
+" Plug 'tpope/vim-characterize'                       | " normal mode: make ga show character names of Unicode chars (ga shows hex and dec values)
+" Plug 'tpope/vim-fugitive'                           | " the most complete GIT integration plugin
+" Plug 'tpope/vim-repeat'                             | " lets . (dot) repeat plugin macros as well, specifically vim-surround
+
+" Colorschemes: ======================================.
+Plug 'nelstrom/vim-mac-classic-theme'                 | " light theme
+Plug 'Valloric/vim-valloric-colorscheme'              | "
+Plug 'chriskempson/vim-tomorrow-theme'                | "
+Plug 'chriskempson/base16-vim'                        | "
+
+" AIRLINE: ===========================================.
+Plug 'vim-airline/vim-airline'                        | " beautification of the mode line
+let g:airline_detect_modified                    = 0  |
+let g:airline_detect_paste                       = 0  |
+let g:airline_exclude_preview                    = 1  |
+let g:airline_extensions                         = ['tabline']
+let g:airline#extensions#tabline#disable_refresh = 1  |
+let g:airline#extensions#tabline#enabled         = 1  |
+let g:airline#extensions#tabline#fnamemod        = ':t:.' | " let airline just show the filename without its path
+let g:airline#extensions#tabline#show_buffers    = 1  |
+let g:airline#extensions#tabline#show_tabs       = 0  |
+let g:airline#extensions#tagbar#enabled          = 1  |
+let g:airline#extensions#tagbar#flags            = 's'
+let g:airline#extensions#whitespace#enabled      = 0  |
+let g:airline#extensions#wordcount#enabled       = 0  |
+let g:airline_inactive_collapse                  = 1  |
+let g:airline_powerline_fonts                    = 1  |
+let g:airline_section_c                          = '%F'
+" AIRLINE_Theme: =====================================.
+Plug 'vim-airline/vim-airline-themes'                 | " airline themes to match any light and dark terminal using :AirlineTheme
 let g:airline_theme='base16'                          | " specifies which colorscheme should airline uses
-let g:airline_powerline_fonts                 = 1     | "
-let g:airline#extensions#wordcount#enabled = 0
-" let g:airline_inactive_collapse               = 1     | "
-let g:airline_extensions=['tabline']
-let g:airline#extensions#tabline#enabled      = 1     | "
-let g:airline#extensions#tabline#show_buffers = 1     | "
-let g:airline#extensions#tabline#show_tabs = 0
-let g:airline#extensions#tagbar#enabled = 1
-let g:airline#extensions#tagbar#flags = 's'
-let g:airline#extensions#tabline#enabled = 1
-let airline#extensions#tabline#disable_refresh = 1
-let g:airline#extensions#tabline#fnamemod = ':t:.'
-" let g:airline_theme='dark'
-let g:airline_detect_modified=0
-let g:airline_detect_paste=0
-let g:airline_section_c = '%F'
-" let g:airline#extensions#tabline#show_tabs    = 1     | "
-" let g:airline#extensions#tabline#fnamemod     = ':t'  | " let airline just show the filename without its path
-" let g:airline#extensions#whitespace#enabled = 0
-" let g:airline_exclude_preview                 = 1
-" let g:airline_theme='bubblegum'                      | " specifies which colorscheme should airline uses
-" let g:airline_theme='tomorrow'                       | " specifies which colorscheme should airline uses
-" let g:airline_theme='papercolor'                     | " specifies which colorscheme should airline uses
-" let g:airline_theme='luna'                           | " specifies which colorscheme should airline uses
-
-
-" Additional =========================================.
-Plugin 'sheerun/vim-polyglot'                         | " better syntax highlighting/indentation for multiple languages
-Plugin 'taglist-plus'                                 | " quick code navigator
-Plugin 'loremipsum'                                   | " Sample text generator
-
-
-" Autocompleter ======================================.
-Plugin 'Valloric/MatchTagAlways'
-Plugin 'Valloric/YouCompleteMe'
-Plugin 'scrooloose/syntastic'
+" let g:airline_theme='bubblegum'                     | " specifies which colorscheme should airline uses
+" let g:airline_theme='dark'                          |
+" let g:airline_theme='luna'                          | " specifies which colorscheme should airline uses
+" let g:airline_theme='papercolor'                    | " specifies which colorscheme should airline uses
+" let g:airline_theme='tomorrow'                      | " specifies which colorscheme should airline uses
+
+" Additional: ========================================.
+Plug 'loremipsum'                                     | " Sample text generator
+Plug 'sheerun/vim-polyglot'                           | " better syntax highlighting/indentation for multiple languages
+Plug 'taglist-plus'                                   | " quick code navigator
+
+" Autocompleter: =====================================.
+Plug 'Valloric/MatchTagAlways'
+Plug 'Valloric/YouCompleteMe'
+Plug 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-Plugin 'davidhalter/jedi-vim'                         | " jedi gets used to display python function signatures
-let g:jedi#show_call_signatures_delay = 0
-let g:jedi#completions_enabled = 0
-let g:LatexBox_viewer = "evince"
 let g:LatexBox_latexmk_preview_continuously = 1
-
-" let g:jedi#show_call_signatures = "2"
+let g:LatexBox_viewer                       = "evince"
+let g:syntastic_always_populate_loc_list    = 1
+let g:syntastic_auto_loc_list               = 1
+let g:syntastic_check_on_open               = 1
+let g:syntastic_check_on_wq                 = 0
+Plug 'davidhalter/jedi-vim'                           | " jedi gets used to display python function signatures
+let g:jedi#completions_enabled              = 0       | " we do not need completions, because we have YouCompleteMe
+let g:jedi#show_call_signatures             = 1       | " which sadly does not support signatures like jedi
+let g:jedi#show_call_signatures_delay       = 0
 
 " Disabled ===========================================.
-" Plugin 'Shougo/neocomplete.vim'
-" Plugin 'tweekmonster/django-plus.vim'                 | " django helper
-" Plugin 'Shougo/vimproc.vim'                           | " dependency for other Shougo plugins
-" Plugin 'Shougo/neosnippet-snippets'
-" Plugin 'Rip-Rip/clang_complete'
-" Plugin 'indenthtml.vim'                               | " works better with mixed html/css/javascript
-" Plugin 'evanmiller/nginx-vim-syntax'
-
+" Plug 'Shougo/neocomplete.vim'                       | " alternative to YouCompleteMe in some cases
+" Plug 'Shougo/vimproc.vim'                           | " dependency for other Shougo plugins
+" Plug 'indenthtml.vim'                               | " works better with mixed html/css/javascript
+" Plug 'evanmiller/nginx-vim-syntax'                  | " TODO: check if now included in syntastic?
 
+call plug#end()                                       | " all plugins are getting loaded on this line, don't remove!
 
-" All of your Plugins must be added before the following line
-call vundle#end()             | " required
 filetype on
 filetype plugin on
 filetype indent on
@@ -113,17 +80,17 @@ syntax sync minlines=60       | " how many preceding lines will be parsed? (has
 " set term=xtermc             | " required on solaris
 
 let base16colorspace=256
-" colorscheme mac_classic       | " finally set which colorscheme to use
-" colorscheme valloric
-" colorscheme vividchalk       | " finally set which colorscheme to use
+colorscheme base16-phd
 " colorscheme Tomorrow
-" colorscheme pencil
-" colorscheme Tomorrow-Night-Bright
+" colorscheme Tomorrow-Night
 " colorscheme Tomorrow-Night
 " colorscheme Tomorrow-Night-Blue
+" colorscheme Tomorrow-Night-Bright
 " colorscheme base16-default-dark
-colorscheme base16-phd
-" colorscheme Tomorrow-Night
+" colorscheme mac_classic       | " finally set which colorscheme to use
+" colorscheme pencil
+" colorscheme valloric
+" colorscheme vividchalk       | " finally set which colorscheme to use
 
 " Shortcut mods =======================================.
 inoremap <C-Space> <C-x><C-o>
@@ -136,6 +103,7 @@ nnoremap <C-S-Tab> :bp<CR>|       " use CTRL+Shift+Tab to switch to preview tab
 nnoremap <C-l> :TlistToggle<CR>|  " bind TagList to Hotkey Ctrl+L
 
 " settings ============================================.
+set shell=/bin/bash           | " many scripts rely on bash, so make this the default
 set noshowmode                | " because we are using some powerline derivat
 set hidden                    | " allows switiching buffers even if the current buffer contains changes (displays +)
 set confirm                   | " asks 'do you want to save?'
@@ -201,6 +169,9 @@ noautocmd
 
 if has("autocmd")
   set modeline                | " set variables specific to a file, like indentation by adding a comment
+  " set default completion function in case YouCompleteMe cannot help
+  set omnifunc=syntaxcomplete#Complete
+
   " automatically reload this file when it gets edited
   augroup reload_vimrc " {
     autocmd!
@@ -255,29 +226,34 @@ if has("autocmd")
 endif
 
 
-" if filereadable(expand("~/.vimrc_background"))
-"   let base16colorspace=256
-"   source ~/.vimrc_background
-" endif
 
 
 
 
-" set colorcolumn=80            | " show an indicator (different background in column 80)
 
+
+" 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^[\
-" To ignore plugin indent changes, instead use:
-"
-" Brief help
-" :PluginList       - lists configured plugins
-" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
-" :PluginSearch foo - searches for foo; append `!` to refresh local cache
-" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
-"
-" see :h vundle for more details or wiki for FAQ
-" Put your non-Plugin stuff after this line
 "
+" ALTERNATIVE:                                        |
+" LightLine_and_MiniBufExplorer: =====================.
+" Plug 'itchyny/lightline.vim'
+" let g:lightline = {
+"       \ 'colorscheme': 'PaperColor',
+"       \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" },
+"       \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }
+"       \ }
+" Plug 'fholgado/minibufexpl.vim'
+" let g:miniBufExplAutoStart = 1
+" let g:miniBufExplBRSplit = 1
+" let g:miniBufExplShowBufNumbers = 0
+" let g:miniBufExplSplitToEdge = 1
+" let g:miniBufExplVSplit = 20   " column width in chars