Integration of neovim in workflow

3 files changed, 9 insertions, 2 deletions

diff --git a/make b/make
index 4bc56f1..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
@@ -19,7 +19,7 @@ done
 
 # Symlink for neovim
 ln -s $dir/vim ~/.nvim
-ln -s $dir/vim/vimrc ~/.nvim/nvimrc
+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 08eeafc..f929b6f 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 va="vim --servername SYNC main.tex \
                                 sections/introduction.tex \