added neomake + new mappings for terminal navigation + minor changes

4 files changed, 39 insertions, 30 deletions

diff --git a/install.sh b/install.sh
index ad9c210..a68cd40 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 dir=~/dotfiles
 olddir=~/dotfiles_old
 home=/home/urbain
@@ -60,6 +59,7 @@ for author in "${!repos[@]}"; do
     fi
 done
 
+# Installing autoload package manager 
 cd $dir/nvim
 if [ -e autoload ]; then
     rm -rf autoload
@@ -67,4 +67,8 @@ fi
 mkdir -p autoload
 ln -s $dir/nvim/vim-plug/plug.vim $dir/nvim/autoload/plug.vim
 
+# Creating temporary file for mutt
+cd $dir
+mkdir -p mutt/temp
+
 echo -e "\n*** Installation successful *** \n"
diff --git a/mutt/muttrc b/mutt/muttrc
index 73dca3e..bdba14b 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -119,9 +119,4 @@ bind   index,pager O sidebar-open
 
 # Compose
 bind compose p postpone-message
-
-
-## Hooks
-mbox-hook .* "+Main/Main"
-
 set reverse_alias
diff --git a/nvimrc b/nvimrc
index 9320b3e..b96d838 100644
--- a/nvimrc
+++ b/nvimrc
@@ -1,9 +1,11 @@
 "" 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 'benekastah/neomake'
 Plug 'bling/vim-airline'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'edkolev/tmuxline.vim'
@@ -11,14 +13,13 @@ Plug 'godlygeek/tabular'
 Plug 'gregsexton/gitv'
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg'
-Plug 'terryma/vim-multiple-cursors'
 Plug 'jeetsukumaran/vim-buffergator'
-Plug 'AndrewRadev/splitjoin.vim'
 Plug 'kien/ctrlp.vim'
 Plug 'majutsushi/tagbar'
 Plug 'scrooloose/nerdtree'
 Plug 'scrooloose/syntastic'
 Plug 'sjl/Gundo.vim'
+Plug 'terryma/vim-multiple-cursors'
 Plug 'tommcdo/vim-exchange'
 Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-commentary'
@@ -180,6 +181,7 @@ nnoremap <Leader>sc :source %<cr>
 " File edits
 nnoremap <Leader>es :UltiSnipsEdit<cr>
 nnoremap <Leader>em :e ~/.mutt/muttrc<cr>
+nnoremap <Leader>en :e ~/.nvimrc<cr>
 nnoremap <Leader>ev :e ~/.vimrc<cr>
 nnoremap <Leader>ez :e ~/.zshrc<cr>
 nnoremap <Leader>et :e ~/.tmux.conf<cr>
@@ -199,6 +201,11 @@ nnoremap <Leader>gs :Gstatus<cr>
 nnoremap <Leader>gr :Gread<cr>
 nnoremap <Leader>gd :Gdiff<cr>
 
+" Commands
+nnoremap ym :Neomake!<cr>
+nnoremap ys :mksession! tmp.vim<cr>
+nnoremap yr :source tmp.vim<cr>
+
 " Misc
 nnoremap <tab> <C-^>
 nnoremap Q :bd!<cr>
@@ -216,7 +223,10 @@ nnoremap , :
 vnoremap , :
 
 " Neovim specific
-tmap <Esc> <C-\><C-n>
+tmap <C-_> <C-\><C-n><C-^>
+nnoremap <C-_> :b term<cr>i
+" nnoremap <C-_> <C-^>i
+inoremap <C-_> <Esc><C-^>i
 
 "" Restore cursor position
 augroup cursorPosition
@@ -226,4 +236,3 @@ augroup cursorPosition
                 \   exe "normal! g`\"" |
                 \ endif
 augroup END
-
diff --git a/zshrc b/zshrc
index 82704c7..856b308 100644
--- a/zshrc
+++ b/zshrc
@@ -20,18 +20,18 @@ source $ZSH/oh-my-zsh.sh
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
 
 # Editor
-export EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
 
 # ssh
 # export SSH_KEY_PATH="~/.ssh/dsa_id"
 
 # Apps for filetypes
-alias -s vim=vim
-alias -s cpp=vim
-alias -s c=vim
-alias -s tex=vim
+alias -s vim=$EDITOR
+alias -s cpp=$EDITOR
+alias -s c=$EDITOR
+alias -s tex=$EDITOR
 alias -s pdf=zathura
-alias -s py=vim
+alias -s py=$EDITOR
 
 # Directories
 alias u='cd ~/Dropbox/phd/papers/spectral/code/finite'
@@ -46,13 +46,12 @@ alias cdd='cd ~/dotfiles'
 # Commands
 alias tmux="TERM=screen-256color-bce tmux"
 alias g='git'
-alias v=$EDITOR
-alias g='git'
 alias v='vim'
 alias n='nvim'
-alias vs="vim --servername SYNC"
-alias vsess="vim -S Session.vim"
-alias va="vim --servername SYNC main.tex \
+alias e=$EDITOR
+alias vs="$EDITOR --servername SYNC"
+alias vsess="$EDITOR -S Session.vim"
+alias va="$EDITOR --servername SYNC main.tex \
                                 sections/introduction.tex \
                                 sections/sec1.tex \
                                 sections/sec2.tex \
@@ -62,7 +61,7 @@ alias c='clear'
 alias mc='make clean'
 alias m='mutt'
 alias a='vifm'
-alias mn='vim ~/.mynotes'
+alias mn="$EDITOR ~/.mynotes"
 alias x='sh ~/.xmodmap'
 alias mail='offlineimap -u quiet &'
 alias ca='printf "\ec"'
@@ -77,14 +76,14 @@ alias commit='git commit -a -m'
 alias gco='git checkout'
 
 # Configuration
-alias ez='vim ~/.zshrc'
-alias em='vim ~/.mutt/muttrc'
-alias ev='vim ~/.vimrc'
-alias eza='vim ~/.zathurarc'
-alias et='vim ~/.tmux.conf'
-alias evi='vim ~/.vifm/vifmrc'
-alias eo='vim ~/.offlineimaprc'
-alias ex='vim ~/.xmodmap'
+alias ez="$EDITOR ~/.zshrc"
+alias em="$EDITOR ~/.mutt/muttrc"
+alias ev="$EDITOR ~/.vimrc"
+alias eza="$EDITOR ~/.zathurarc"
+alias et="$EDITOR ~/.tmux.conf"
+alias evi="$EDITOR ~/.vifm/vifmrc"
+alias eo="$EDITOR ~/.offlineimaprc"
+alias ex="$EDITOR ~/.xmodmap"
 
 # Fix smart search history
 bindkey -a 'k' history-beginning-search-backward
@@ -92,3 +91,5 @@ bindkey -a 'j' history-beginning-search-forward
 
 # Crontab jobs
 crontab ~/.crontab
+
+TERM=xterm-256color