-filetype off
-set runtimepath& " reset rtp
-" remove all autocommands
-autocmd!
-
-set runtimepath+=$XDG_DATA_HOME/vim/vundle
-call vundle#begin('$XDG_DATA_HOME/vim')
-
-Plugin 'gmarik/vundle'
-
-Plugin 'AndrewRadev/switch.vim'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'alepez/vim-gtest'
-Plugin 'bling/vim-airline'
-Plugin 'chrisbra/checkattach'
-Plugin 'derekwyatt/vim-fswitch'
-Plugin 'elzr/vim-json'
-Plugin 'firef0x/pkgbuild.vim'
-Plugin 'junegunn/vim-easy-align'
-Plugin 'justinmk/vim-sneak'
-Plugin 'klen/python-mode'
-Plugin 'kshenoy/vim-signature'
-Plugin 'majutsushi/tagbar'
-Plugin 'octol/vim-cpp-enhanced-highlight'
-Plugin 'raimondi/delimitmate'
-Plugin 'ram-z/vim-clang-format'
-Plugin 'ram-z/vimwiki'
-Plugin 'scrooloose/syntastic'
-Plugin 'sgeb/vim-diff-fold'
-Plugin 'shougo/unite.vim'
-Plugin 'shougo/vimproc.vim'
-Plugin 'sjl/gundo.vim'
-Plugin 'thinca/vim-qfreplace'
-Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-abolish'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-eunuch'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround' "investigate vim-sandwich
-Plugin 'tpope/vim-unimpaired'
-Plugin 'tweekmonster/spellrotate.vim'
-Plugin 'valloric/youcompleteme'
-Plugin 'vim-scripts/mediawiki.vim'
-Plugin 'vim-scripts/replacewithregister'
-Plugin 'vim-scripts/yankring.vim'
+call plug#begin('$XDG_DATA_HOME/vim')
+" This does not update vim-plug, use PlugUpgrade instead
+Plug 'junegunn/vim-plug'
+
+Plug 'airblade/vim-gitgutter' " {{{
+" prefer other signs such as ycm diags
+let g:gitgutter_sign_priority = 1
+" don't clobber other signs
+let g:gitgutter_sign_allow_clobber = 0
+"}}}
+Plug 'alepez/vim-gtest'
+Plug 'alx741/vinfo'
+Plug 'andrewradev/sideways.vim' " {{{2
+nnoremap <silent> ,h :SidewaysLeft<CR>:delmarks z<CR>
+nnoremap <silent> ,l :SidewaysRight<CR>:delmarks z<CR>
+"}}}
+Plug 'andrewradev/switch.vim'
+if !has('nvim')
+ Plug 'bling/vim-airline' "{{{2
+ let g:airline#extensions#whitespace#enabled = 1
+ let g:airline#extensions#tabline#enabled = 1
+ let g:airline#extensions#searchcount#enabled = 0
+ let g:airline_powerline_fonts = 1
+
+ let g:asyncrun_status = "stopped"
+ " let g:airline_section_error = airline#section#create_right(['%{g:asyncrun_status}'])
+ "}}}
+endif
+
+Plug 'chrisbra/checkattach'
+Plug 'derekwyatt/vim-fswitch'
+Plug 'elzr/vim-json'
+Plug 'firef0x/pkgbuild.vim'
+Plug 'junegunn/vim-easy-align'
+Plug 'justinmk/vim-sneak'
+Plug 'klen/python-mode'
+Plug 'kshenoy/vim-signature'
+Plug 'majutsushi/tagbar'
+Plug 'octol/vim-cpp-enhanced-highlight'
+Plug 'raimondi/delimitmate'
+Plug 'sgeb/vim-diff-fold'
+Plug 'skywind3000/asyncrun.vim' " {{{2
+command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
+let g:asyncrun_open = 10
+"}}}
+Plug 'shougo/unite.vim'
+Plug 'shougo/vimproc.vim', {'do': 'make'}
+Plug 'sjl/gundo.vim'
+Plug 'thinca/vim-qfreplace'
+Plug 'tomtom/tcomment_vim'
+Plug 'tpope/vim-abolish'
+Plug 'tpope/vim-characterize'
+Plug 'tpope/vim-endwise'
+Plug 'tpope/vim-eunuch'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-scriptease'
+Plug 'tpope/vim-speeddating'
+Plug 'tpope/vim-surround' "investigate vim-sandwich
+Plug 'tpope/vim-unimpaired'
+Plug 'tweekmonster/spellrotate.vim'
+if !has("nvim")
+ " Plug 'valloric/youcompleteme' {{{2
+ Plug 'valloric/youcompleteme',
+ \{ 'do': './install.py --clangd-completer --clang-completer' }
+ let g:ycm_clangd_binary_path = 'clangd' " use clangd in path
+ let g:ycm_clangd_args = ['--clang-tidy']
+ let g:ycm_extra_conf_vim_data = ['getcwd()']
+ let g:ycm_add_preview_to_completeopt = 1
+ let g:ycm_complete_in_comments = 1
+ let g:ycm_complete_in_strings = 1
+ let g:ycm_autoclose_preview_window_after_insertion = 0
+
+ let g:ycm_language_server =
+ \ [
+ \ {
+ \ 'name': 'haskell',
+ \ 'cmdline': [ 'haskell-language-server-wrapper', '--lsp' ],
+ \ 'filetypes': [ 'haskell', 'lhaskell' ]
+ \ },
+ \ ]
+ " }}}
+endif
+Plug 'vim-scripts/mediawiki.vim'
+Plug 'vim-scripts/replacewithregister'
+Plug 'vim-scripts/yankring.vim'
+Plug 'wincent/loupe'