4 files changed, 10 insertions, 5 deletions
diff --git a/install.sh b/install.sh
index a68cd40..ba23b6b 100755
--- a/install.sh
+++ b/install.sh
@@ -59,16 +59,18 @@ for author in "${!repos[@]}"; do
     fi
 done
 
-# Installing autoload package manager 
+# Installing vim-plug vim package manager
 cd $dir/nvim
 if [ -e autoload ]; then
     rm -rf autoload
 fi
 mkdir -p autoload
 ln -s $dir/nvim/vim-plug/plug.vim $dir/nvim/autoload/plug.vim
+sudo pip install neovim
 
 # Creating temporary file for mutt
 cd $dir
+mkdir -p nvim/vimundo
 mkdir -p mutt/temp
 
 echo -e "\n*** Installation successful *** \n"
diff --git a/nvimrc b/nvimrc
index 3cf59e5..c32c6e5 100644
--- a/nvimrc
+++ b/nvimrc
@@ -1,10 +1,8 @@
 "" Plugins
 call plug#begin('~/.nvim/plugged')
-Plug 'AndrewRadev/splitjoin.vim'
-Plug 'LaTeX-Box-Team/latex-box'
-Plug 'SirVer/ultisnips'
 Plug 'airblade/vim-gitgutter'
 Plug 'altercation/vim-colors-solarized'
+Plug 'AndrewRadev/splitjoin.vim'
 Plug 'benekastah/neomake'
 Plug 'bling/vim-airline'
 Plug 'christoomey/vim-tmux-navigator'
@@ -17,9 +15,12 @@ Plug 'jamessan/vim-gnupg'
 Plug 'jeetsukumaran/vim-buffergator'
 Plug 'junegunn/seoul256.vim'
 Plug 'kien/ctrlp.vim'
+Plug 'LaTeX-Box-Team/latex-box'
 Plug 'majutsushi/tagbar'
+Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' }
 Plug 'scrooloose/nerdtree'
 Plug 'scrooloose/syntastic'
+Plug 'SirVer/ultisnips'
 Plug 'sjl/Gundo.vim'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tomasr/molokai'
@@ -33,6 +34,7 @@ Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
+Plug 'Valloric/YouCompleteMe' , { 'for' : 'cpp' }
 call plug#end()
 
 "" Plugins options
@@ -173,6 +175,7 @@ nnoremap <Leader>pi :PlugInstall<cr>
 nnoremap <Leader>pu :PlugUpdate<cr>
 nnoremap <Leader>pc :PlugClean<cr>
 nnoremap <Leader>pd :PlugDiff<cr>
+nnoremap <Leader>ps :PlugStatus<cr>
 
 " Toggles
 nnoremap cop :set paste!<cr>
diff --git a/vimrc b/vimrc
index 5ad3b76..d722075 100644
--- a/vimrc
+++ b/vimrc
@@ -35,6 +35,7 @@ Plugin 'tpope/vim-scriptease'
 Plugin 'tpope/vim-sensible'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
+Plugin 'rdnetto/YCM-Generator'
 filetype plugin indent on
 syntax on
 
diff --git a/zshrc b/zshrc
index 856b308..1807f5f 100644
--- a/zshrc
+++ b/zshrc
@@ -31,7 +31,6 @@ alias -s cpp=$EDITOR
 alias -s c=$EDITOR
 alias -s tex=$EDITOR
 alias -s pdf=zathura
-alias -s py=$EDITOR
 
 # Directories
 alias u='cd ~/Dropbox/phd/papers/spectral/code/finite'