minor changes

6 files changed, 46 insertions, 33 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 2184667..711ae9e 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -62,7 +62,7 @@ set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 alternative_order text/plain text/enriched text/html
 
 # Email editing
-set editor="vim"
+set editor="nvim"
 set edit_headers
 set include=yes
 
diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets
index 5ad9624..cb4c705 100644
--- a/nvim/mySnippets/cpp.snippets
+++ b/nvim/mySnippets/cpp.snippets
@@ -10,6 +10,14 @@ for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
 $0
 endsnippet
 
+snippet forij "Matrix iteration" b
+for (int ${2:i} = 0; $2 < ${1:count}; $2++) {
+	for (int ${4:j} = 0; $4 < $1; $4++) {
+		${5}
+	}
+}
+endsnippet
+
 snippet vec "vector" i
 vector<${1:double}> $0
 endsnippet
diff --git a/nvim/mySnippets/mail.snippets b/nvim/mySnippets/mail.snippets
index c512f9b..9839916 100644
--- a/nvim/mySnippets/mail.snippets
+++ b/nvim/mySnippets/mail.snippets
@@ -15,7 +15,9 @@ ${3:Urbain}
 endsnippet
 
 snippet sign "Signature" b
-Urbain Vaes,
+Best wishes,
+
+Urbain Vaes
 Department of Mathematics
 Office 6M09
 endsnippet
diff --git a/nvimrc b/nvimrc
index f4f8a5a..81447ee 100644
--- a/nvimrc
+++ b/nvimrc
@@ -1,4 +1,4 @@
-"" Plugins
+" Plugins
 call plug#begin('~/.nvim/plugged')
 Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
 Plug 'altercation/vim-colors-solarized'
@@ -13,18 +13,19 @@ Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
 Plug 'junegunn/fzf', { 'on' : 'FZF' }
-Plug 'junegunn/seoul256.vim'
 Plug 'junegunn/goyo.vim', { 'on' : 'Goyo' }
 Plug 'junegunn/limelight.vim', { 'on' : 'Limelight' }
-Plug 'junegunn/vim-pseudocl'
+Plug 'junegunn/seoul256.vim'
+Plug 'junegunn/vim-easy-align'
 Plug 'junegunn/vim-oblique'
 Plug 'junegunn/vim-peekaboo'
+Plug 'junegunn/vim-pseudocl'
 Plug 'kien/ctrlp.vim'
 Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' }
 Plug 'majutsushi/tagbar'
 Plug 'mileszs/ack.vim'
 Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' }
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/syntastic'
 Plug 'SirVer/ultisnips'
 Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
@@ -113,8 +114,9 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 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
+let g:ycm_add_preview_to_completeopt = 0
 let g:ycm_confirm_extra_conf = 1
+let g:ycm_auto_trigger = 1
 
 "" Vim options
 
@@ -139,6 +141,7 @@ set undodir=/home/urbain/.nvim/vimundo/
 
 " Layout window
 set nonumber
+set diffopt=filler,vertical
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
 set showbreak=--▸\ ,
@@ -200,6 +203,7 @@ nnoremap <Leader>ps :PlugStatus<cr>
 " Toggles
 nnoremap cop :set paste!<cr>
 nnoremap <Leader>tg :GitGutterToggle<cr>
+nnoremap <Leader>tl :Limelight!!<cr>
 nnoremap <Leader>tn :NERDTreeToggle<cr>
 nnoremap <Leader>tt :TagbarToggle<cr>
 nnoremap <Leader>tu :GundoToggle<cr>
@@ -227,6 +231,7 @@ nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
+nnoremap >f :FZF ~ <cr>
 
 " Git
 nnoremap <Leader>gs :Gstatus<cr>
@@ -254,12 +259,14 @@ vnoremap , :
 
 " Neovim specific
 tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
+tnoremap <C-p> <C-\><C-n>:CtrlPMRUFiles<cr>
 nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
 inoremap <C-_> <Esc>:b term<cr>i
 
 "" Restore cursor position
-augroup autocommands
+augroup nvimrc
     au!
+    autocmd BufWritePost *vimrc source %
     autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |
diff --git a/vimrc b/vimrc
index f6b1027..fecfa44 100644
--- a/vimrc
+++ b/vimrc
@@ -19,6 +19,7 @@ Plugin 'honza/vim-snippets'
 Plugin 'jamessan/vim-gnupg'
 Plugin 'terryma/vim-multiple-cursors'
 Plugin 'jeetsukumaran/vim-buffergator'
+Plugin 'junegunn/goyo.vim'
 Plugin 'AndrewRadev/splitjoin.vim'
 Plugin 'kien/ctrlp.vim'
 Plugin 'majutsushi/tagbar'
diff --git a/zshrc b/zshrc
index 436e036..aacf09b 100644
--- a/zshrc
+++ b/zshrc
@@ -43,41 +43,36 @@ alias books='cd ~/Dropbox/phd/books'
 alias cdd='cd ~/dotfiles'
 
 # Commands
-alias tmux="TERM=screen-256color-bce tmux"
-alias g='git'
-alias v='vim'
-alias n='nvim'
-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 \
-                                sections/sec3.tex \
-                                sections/conclusion.tex"
-alias c='clear'
-alias mc='make clean'
-alias m='mutt'
 alias a='vifm'
-alias mn="$EDITOR ~/.mynotes"
-alias x='sh ~/.xmodmap'
-alias mail='offlineimap -u quiet &'
+alias c='clear'
 alias ca='printf "\ec"'
-alias update='sudo apt-get update'
-alias upgrade='sudo apt-get upgrade'
+alias commit='git commit -a -m'
+alias e=$EDITOR
+alias g='git'
+alias gco='git checkout'
 alias install='sudo apt-get install'
-alias remove='sudo apt-get autoremove'
+alias m='mutt'
+alias mail='offlineimap -u quiet &'
+alias mc='make clean'
+alias mn="$EDITOR ~/.mynotes"
+alias n='nvim'
+alias ns="$EDITOR --servername SYNC"
+alias nsess="$EDITOR -S Session.vim"
+alias pull='git pull origin master'
 alias purge='sudo apt-get purge'
 alias push='git push origin master'
-alias pull='git pull origin master'
-alias commit='git commit -a -m'
-alias gco='git checkout'
+alias remove='sudo apt-get autoremove'
+alias tmux="TERM=screen-256color-bce tmux"
+alias update='sudo apt-get update'
+alias upgrade='sudo apt-get upgrade'
+alias v='vim'
+alias x='sh ~/.xmodmap'
 
 # Configuration
 alias ez="$EDITOR ~/.zshrc"
 alias em="$EDITOR ~/.mutt/muttrc"
 alias ev="$EDITOR ~/.vimrc"
+alias en="$EDITOR ~/.nvimrc"
 alias eza="$EDITOR ~/.zathurarc"
 alias et="$EDITOR ~/.tmux.conf"
 alias evi="$EDITOR ~/.vifm/vifmrc"