From cab1bc05ab6b6116eafb225cf07d90210d26c091 Mon Sep 17 00:00:00 2001
From: Marcel Schneider <marcel.schneider@sap.com>
Date: Mon, 19 Dec 2016 15:30:34 +0100
Subject: [PATCH] Swap to Plug as plugin manger

---
 .vimrc => vimrc | 71 ++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 36 deletions(-)
 rename .vimrc => vimrc (76%)

diff --git a/.vimrc b/vimrc
similarity index 76%
rename from .vimrc
rename to vimrc
index b731ff4..a341ae8 100644
--- a/.vimrc
+++ b/vimrc
@@ -1,64 +1,56 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-" set the runtime path to include Vundle and initialize
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+" Load vim-plug
+if empty(glob("~/.vim/autoload/plug.vim"))
+    execute '!curl -fLo ~/.vim/autoload/plug.vim https://raw.github.com/junegunn/vim-plug/master/plug.vim'
+endif
+call plug#begin()
 " alternatively, pass a path where Vundle should install plugins
 "call vundle#begin('~/some/path/here')
 
 " let Vundle manage Vundle, required
-Plugin 'VundleVim/Vundle.vim'
+Plug 'VundleVim/Vundle.vim'
 
 " The following are examples of different formats supported.
 " Keep Plugin commands between vundle#begin/end.
 " plugin on GitHub repo
-Plugin 'tpope/vim-fugitive'
+Plug 'tpope/vim-fugitive'
 " plugin from http://vim-scripts.org/vim/scripts.html
-Plugin 'L9'
+Plug 'L9'
 " Git plugin not hosted on GitHub
 
-Plugin 'tpope/vim-sensible'
-Plugin 'scrooloose/nerdtree'
-Plugin 'Xuyuanp/nerdtree-git-plugin'
-Plugin 'kien/ctrlp.vim'
-Plugin 'scrooloose/nerdcommenter'
-"Plugin 'myusuf3/numbers.vim'
-Plugin 'Shougo/neocomplete.vim'
-Plugin 'Shougo/neosnippet.vim'
-Plugin 'easymotion/vim-easymotion'
-Plugin 'bling/vim-airline'
-Plugin 'tpope/vim-ragtag'
+Plug 'tpope/vim-sensible'
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
+Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' }
+Plug 'kien/ctrlp.vim'
+Plug 'scrooloose/nerdcommenter'
+"Plug 'myusuf3/numbers.vim'
+Plug 'Shougo/neocomplete.vim'
+Plug 'Shougo/neosnippet.vim'
+Plug 'easymotion/vim-easymotion'
+Plug 'bling/vim-airline'
+Plug 'tpope/vim-ragtag'
 
 " html / templates
-Plugin 'mattn/emmet-vim', { 'for': 'html' } " emmet support for vim - easily create markdup wth CSS-like syntax
-Plugin 'gregsexton/MatchTag', { 'for': 'html' } " match tags in html, similar to paren support
-Plugin 'othree/html5.vim', { 'for': 'html' } " html5 support
+Plug 'mattn/emmet-vim', { 'for': 'html' } " emmet support for vim - easily create markdup wth CSS-like syntax
+Plug 'gregsexton/MatchTag', { 'for': 'html' } " match tags in html, similar to paren support
+Plug 'othree/html5.vim', { 'for': 'html' } " html5 support
 
 " JavaScript
-Plugin 'gavocanov/vim-js-indent', { 'for': 'javascript' } " JavaScript indent support
-Plugin 'moll/vim-node', { 'for': 'javascript' } " node support
-Plugin 'othree/yajs.vim', { 'for': 'javascript' } " JavaScript syntax plugin
-Plugin 'othree/es.next.syntax.vim', { 'for': 'javascript' } " ES6 and beyond syntax
+Plug 'gavocanov/vim-js-indent', { 'for': 'javascript' } " JavaScript indent support
+Plug 'moll/vim-node', { 'for': 'javascript' } " node support
+Plug 'othree/yajs.vim', { 'for': 'javascript' } " JavaScript syntax plugin
+Plug 'othree/es.next.syntax.vim', { 'for': 'javascript' } " ES6 and beyond syntax
 
 " Go
-Plugin 'fatih/vim-go', { 'for': 'go' } " go support
+Plug 'fatih/vim-go', { 'for': 'go' } " go support
 
 " All of your Plugins must be added before the following line
-call vundle#end()            " required
+call plug#end()            " required
 filetype plugin indent on    " required
 " To ignore plugin indent changes, instead use:
 "filetype plugin on
-"
-" 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
-
 
 " S E T T I N G S 
 set number
@@ -74,6 +66,7 @@ set autoindent              " automatically set indent of new line
 set smartindent
 set tabstop=4
 set shiftwidth=4
+set expandtab
 
 " toggle invisible characters
 set list
@@ -101,8 +94,12 @@ if has("autocmd")
     \| exe "normal! g'\"" | endif
 endif
 
+" P L U G I N S
+
 let NERDTreeShowHidden=1
 
+let g:airline_powerline_fonts = 1
+
 " M A P P I N G S
 let mapleader = ","
 
@@ -112,6 +109,8 @@ nmap <silent> <leader>k :NERDTreeToggle<cr>
 nmap <silent> <leader>y :NERDTreeFind<cr>
 " Allow saving of files as sudo when I forgot to start vim using sudo.
 cmap w!! w !sudo tee > /dev/null %
+"Toggle set paste
+nmap <leader>tp :set paste!<cr>
 
 " N E O C O M P L E T E 
 "Note: This option must be set in .vimrc(_vimrc).  NOT IN .gvimrc(_gvimrc)!