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

3 files changed, 11 insertions, 5 deletions

diff --git a/make b/make
index b706c27..4f88752 100755
--- a/make
+++ b/make
@@ -4,7 +4,7 @@ dir=~/dotfiles
 olddir=~/dotfiles_old
 
 # Files to sync
-files="vim mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
+files="vim vimrc mutt passwords vifm msmtprc bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc offlineimap.py inputrc latexmkrc crontab gitconfig"
 
 rm -rf $olddir
 mkdir -p $olddir
@@ -17,10 +17,9 @@ for file in $files; do
     ln -s $dir/$file ~/.$file
 done
 
-# SSMTP config
-echo ssmtp.conf
-sudo mv /etc/ssmtp/ssmtp.conf $olddir
-sudo ln -s $dir/ssmtp.conf /etc/ssmtp/
+# Symlink for neovim
+ln -s $dir/vim ~/.nvim
+ln -s $dir/vimrc ~/.nvimrc
 
 # Solarized
 cd
diff --git a/vim/vimrc b/vimrc
index 941bc48..0b3060d 100644
--- a/vim/vimrc
+++ b/vimrc
@@ -135,6 +135,7 @@ set noautochdir
 set cpoptions+=I
 set encoding=utf-8
 set mouse=a
+set clipboard=unnamedplus
 
 ""  Colorscheme
 try | colorscheme solarized | catch | endtry
@@ -176,3 +177,8 @@ augroup autorelead_vimrc
     au!
     au BufWritePost ~/.vim/vimrc source ~/.vim/vimrc
 augroup END
+
+"" Neovim specific
+if has('nvim')
+    tmap jk <C-\><C-n>
+endif
diff --git a/zshrc b/zshrc
index c7e7b9a..2b79683 100644
--- a/zshrc
+++ b/zshrc
@@ -49,6 +49,7 @@ 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 \