diff --git a/Makefile b/Makefile
index 0313dfe..b24f31d 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,8 @@ git:
 vim:
 	@printf "$(YELLOW)--- vim ------------------------------------------------\n$(RESET)"
 	stow -t "$$HOME" vim
+	[[ -f ~/.spf13-vim/bootstrap.sh ]] ||
+		git submodule update --init
 	~/.spf13-vim/bootstrap.sh
 
 mutt:
diff --git a/byobu/.byobu/.metadata_available b/byobu/.byobu/.metadata_available
deleted file mode 100644
index e69de29..0000000
diff --git a/byobu/.byobu/.ssh-agent b/byobu/.byobu/.ssh-agent
index 82d01b2..11bafd4 120000
--- a/byobu/.byobu/.ssh-agent
+++ b/byobu/.byobu/.ssh-agent
@@ -1 +1 @@
-/tmp/ssh-c3NIHjlHlO/agent.29552
\ No newline at end of file
+/run/user/1000/gnupg/S.gpg-agent.ssh
\ No newline at end of file
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index da9363c..cc50df8 100755
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -10,7 +10,7 @@ set -x MAIL /home/ben/Maildir
 
 set -x GOPATH (/usr/local/go/bin/go env GOPATH)
 
-set -x fish_user_paths $fish_user_paths ~/bin /usr/local/go/bin /home/ben/.yarn/bin $GOPATH/bin ~/.local/bin
+set -x fish_user_paths $fish_user_paths ~/bin /usr/local/go/bin ~/.yarn/bin $GOPATH/bin ~/.local/bin ~/.cargo/bin
 
 set -x SSH_AGENT_PID ""
 set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)