Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	nvimrc

5 files changed, 24 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 21ba45a..567c7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
 mutt/cache/
+mutt/cache/
+mutt/cache/headers
 mutt/mailboxes/
-vim/vimundo/*
-vim/bundle/
+mutt/mutt-colors-solarized/
+mutt/temp/
+newsbeuter
+nvim/autoload/
 nvim/plugged/
 nvim/vim-plug/
-nvim/autoload/
 nvim/vimundo/
 vifm/Trash
-vifm/vimfiles
 vifm/vifminfo
-mutt/mutt-colors-solarized/
-mutt/temp/
-mutt/cache/
-mutt/cache/headers
+vifm/vimfiles
+vim/bundle/
+vim/vimundo/*
diff --git a/install.sh b/install.sh
index 2fb023f..24259b3 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 auxiliary files for mutt
 cd $dir
+mkdir -p nvim/vimundo
 mkdir -p mutt/temp
 mkdir -p mutt/cache
 mkdir -p mutt/cache/bodies
diff --git a/nvimrc b/nvimrc
index ce28868..b105474 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,10 +15,14 @@ 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 'szw/vim-ctrlspace'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tomasr/molokai'
 Plug 'tommcdo/vim-exchange'
@@ -33,9 +35,8 @@ Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
-
-Plug 'szw/vim-ctrlspace'
 Plug 'troydm/zoomwintab.vim'
+Plug 'Valloric/YouCompleteMe'
 call plug#end()
 
 "" Plugins options
@@ -102,6 +103,10 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.out$', '\.log$','\.aux$','\.sty$',
             \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$']
 
+let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
+let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
+let g:ycm_auto_trigger = 1
+
 "" Vim options
 
 " Tabs and indent
@@ -181,6 +186,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>
@@ -252,4 +258,3 @@ augroup autocommands
                 \   exe "normal! g`\"" |
                 \ endif
 augroup END
-
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'