diff --git a/Makefile b/Makefile
index b24f31d..4c3bc2f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ endif
 install:
 	@make $(UNAME)
 
-Linux: bash fish git mutt byobu weechat vim gnupg
+Linux: bash fish git mutt byobu weechat vim nvim gnupg
 Windows: bash git vim
 Other: bash git vim
 
@@ -26,6 +26,7 @@ clean:
 	stow -t "$$HOME" -D fish
 	stow -t "$$HOME" -D git
 	stow -t "$$HOME" -D vim
+	stow -t "$$HOME" -D nvim
 	stow -t "$$HOME" -D mutt
 	stow -t "$$HOME" -D byobu
 	stow -t "$$HOME" -D weechat
@@ -50,6 +51,10 @@ vim:
 		git submodule update --init
 	~/.spf13-vim/bootstrap.sh
 
+nvim:
+	@printf "$(YELLOW)--- nvim -----------------------------------------------\n$(RESET)"
+	stow -t "$$HOME" nvim
+
 mutt:
 	@printf "$(YELLOW)--- mutt -----------------------------------------------\n$(RESET)"
 	stow -t "$$HOME" mutt
@@ -68,5 +73,5 @@ gnupg:
 	chmod 700 "$$HOME/.gnupg"
 	stow -t "$$HOME" gnupg
 
-.PHONY: bash fish git vim mutt byobu weechat gnupg clean install Windows Linux Other
+.PHONY: bash fish git vim nvim mutt byobu weechat gnupg clean install Windows Linux Other
 
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index cc50df8..f69a388 100755
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -15,3 +15,5 @@ set -x fish_user_paths $fish_user_paths ~/bin /usr/local/go/bin ~/.yarn/bin $GOP
 set -x SSH_AGENT_PID ""
 set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
 
+set -x BBJ_USER $USER
+
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
new file mode 100644
index 0000000..0b435a2
--- /dev/null
+++ b/nvim/.config/nvim/init.vim
@@ -0,0 +1,4 @@
+set runtimepath^=~/.vim runtimepath+=~/.vim/after
+let &packpath = &runtimepath
+source ~/.vimrc
+