-filetype off
-set runtimepath& " reset rtp
-" remove all autocommands
-autocmd!
-
-set runtimepath+=$XDG_DATA_HOME/vim/vundle
-call vundle#rc('$XDG_DATA_HOME/vim')
-
-Plugin 'gmarik/vundle'
-
-Plugin 'airblade/vim-gitgutter'
-Plugin 'bling/vim-airline'
-Plugin 'derekwyatt/vim-fswitch'
-Plugin 'elzr/vim-json'
-Plugin 'firef0x/pkgbuild.vim'
-Plugin 'flazz/vim-colorschemes'
-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 'scrooloose/syntastic'
-Plugin 'shougo/unite.vim'
-Plugin 'shougo/vimproc.vim'
-Plugin 'sjl/gundo.vim'
-Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-abolish'
-Plugin 'tpope/vim-endwise'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-unimpaired'
-Plugin 'valloric/youcompleteme'
-Plugin 'vim-scripts/replacewithregister'
-Plugin 'vim-scripts/yankring.vim'
-
-" snippets
-Plugin 'sirver/ultisnips'
-Plugin 'honza/vim-snippets'
+call plug#begin('$XDG_DATA_HOME/vim')
+" This does not update vim-plug, use PlugUpgrade instead
+Plug 'junegunn/vim-plug'
+
+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}'])
+  "}}}
+  Plug 'raimondi/delimitmate' " {{{2
+    let delimitMate_expand_cr = 2
+    let g:delimitMate_expand_space = 1
+  "}}}
+  Plug 'tpope/vim-surround' "{{{2
+  "}}}
+  " 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'  ]
+          \   },
+          \ ]
+  " }}}
+  Plug 'svermeulen/vim-yoink' " {{{2
+  ""}}}
+  Plug 'arcticicestudio/nord-vim' " {{{2
+    let g:nord_bold = 1
+    let g:nord_italic = 1
+    let g:nord_italic_comments = 1
+    let g:nord_underline = 1
+    let g:nord_uniform_status_lines = 0
+    let g:nord_uniform_diff_background = 0
+    let g:nord_cursor_line_number_background = 0
+    let g:nord_bold_vertical_split_line = 0
+  "}}}
+  Plug 'sirver/ultisnips' " {{{2
+  Plug 'honza/vim-snippets'
+    let g:UltiSnipsEditSplit = 'vertical'
+    let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
+    if has('fname_case')
+      let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+    endif
+    let g:UltiSnipsExpandTrigger       = "<tab>"
+    let g:UltiSnipsJumpForwardTrigger  = "<tab>"
+    let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+    
+    " UltiSnips completion function that tries to expand a snippet. If there's no
+    " snippet for expanding, it checks for completion window and if it's shown,
+    " selects first element. If there's no completion window it tries to jump to
+    " next placeholder. If there's no placeholder it just returns TAB key
+    " https://github.com/Valloric/YouCompleteMe/issues/36#issuecomment-15451411
+    function! g:UltiSnips_Complete()
+        call UltiSnips#ExpandSnippet()
+        if g:ulti_expand_res == 0
+            if pumvisible()
+                return "\<C-n>"
+            else
+                call UltiSnips#JumpForwards()
+                if g:ulti_jump_forwards_res == 0
+                  return "\<TAB>"
+                endif
+            endif
+        endif
+        return ""
+    endfunction
+    au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
+    let g:UltiSnipsListSnippets="<c-e>"
+  "}}}
+  Plug 'vim-utils/vim-man'  " {{{2
+    let g:man_width = 80
+  "}}}
+endif
+
+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'
+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 '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-unimpaired'
+Plug 'tweekmonster/spellrotate.vim'
+Plug 'vim-scripts/mediawiki.vim'
+Plug 'vim-scripts/replacewithregister'
+Plug 'wincent/loupe'
+
+" colorschemes
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark  = 'hard'
+let g:gruvbox_contrast_light = 'soft'