diff --git a/bashrc b/bashrc
index 5557e3c..8f3c31f 100644
--- a/bashrc
+++ b/bashrc
@@ -9,15 +9,27 @@ shopt -s checkwinsize
 PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 
 # Generic exports
-  export GOPATH=$HOME/go
-  export PATH=$GOPATH/bin:$PATH
-  export PATH=$HOME/.local/bin:$PATH
+export EDITOR=vim
+export GOPATH=$HOME/go
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completionexport PATH=$GOPATH/bin:$PATH
+export PATH=$HOME/go/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
+export PATH=$HOME/.local/share/google-cloud-sdk/bin:$PATH
+export PATH=/usr/NX/bin:$PATH
+export PATH=/opt/waterfox:$PATH
 if [[ -z $TMUX ]]; then
   export TERM='xterm-256color'
 else
   export TERM='screen-256color'
 fi
 
+# Bash completion
+if [ -f /etc/bash_completion ]; then
+  . /etc/bash_completion
+fi
+
 # GPG/SSH
 ## Void: Install pcsclite, pcsc-ccid, gnupg2-scdaemon
 ## Debian: Install pcscd scdaemon
@@ -62,3 +74,5 @@ fi
 # VIM
 ## Reduce delay swithing between normal & insert mode
 export KEYTIMEOUT=1
+
+[[ -s "/home/paul/.gvm/scripts/gvm" ]] && source "/home/paul/.gvm/scripts/gvm"
diff --git a/gitconfig b/gitconfig
index 36234af..0593912 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,3 +1,3 @@
 [user]
-    email = paul@walko.org
-    name = Paul Wako
+    email = paulsw.pw@gmail.com
+    name = Paul Walko
diff --git a/gpg-agent.conf b/gpg-agent.conf
index 31a081a..978ab33 100644
--- a/gpg-agent.conf
+++ b/gpg-agent.conf
@@ -1,3 +1,4 @@
 max-cache-ttl 0
 default-cache-ttl 0
 enable-ssh-support
+use-standard-socket
diff --git a/vimrc b/vimrc
index 6fda9b8..d36c2d0 100644
--- a/vimrc
+++ b/vimrc
@@ -101,3 +101,6 @@ noremap <leader>7 : 7b<CR>
 noremap <leader>8 : 8b<CR>
 noremap <leader>9 : 9b<CR>
 noremap <leader>10 : 10b<CR>
+
+"" Scroll stuff
+set mouse=a