diff --git a/setup b/setup
index 89812fc..05b2494 100755
--- a/setup
+++ b/setup
@@ -64,6 +64,7 @@ setup_link "$HOME/.witchcraft-scripts" "witchcraft-scripts"
 setup_link "$HOME/.config/yabai/yabairc" "yabairc"
 setup_link "$HOME/.config/skhd/skhdrc" "skhdrc"
 setup_link "$HOME/.bin" "bin"
+setup_link "$HOME/.config/nvim" "nvim"
 
 # -----------------------------------------
 #              Vim setup
diff --git a/vimrc b/vimrc
index 615a05f..7365781 100644
--- a/vimrc
+++ b/vimrc
@@ -55,9 +55,11 @@ set hidden
 
 "- Activates the mouse
 set mouse=nirc
-if &term =~ '^screen'
-	" tmux knows the extended mouse mode
-	set ttymouse=xterm2
+if !has('nvim')
+	if &term =~ '^screen'
+		" tmux knows the extended mouse mode
+		set ttymouse=xterm2
+	endif
 endif
 
 "- Netrw auto clos