diff --git a/workstation/home.nix b/workstation/home.nix
index ecfc661..5193d77 100644
--- a/workstation/home.nix
+++ b/workstation/home.nix
@@ -120,7 +120,7 @@
       historyFile = "\$\{HOME\}/.bash_history.\${USER}.\$(hostname -s).\$(tty | sed 's?/dev/pts/??')";
       bashrcExtra =
         ''
-          export GOPATH="/home/don/go"
+          export GOPATH="~/go"
           export PROMPT_COMMAND='history -a'
           export EDITOR="nvim"
           set bell-style visible
@@ -130,12 +130,16 @@
           umask 0007
           export PAGER=less
           export LESS="-s"
-          #if [ -d /home/don/.bash_completion.d ]; then
-            #for i in $(ls -1 /home/don/.bash_completion.d/*.sh); do source $i; done
-          #fi
-          test -f "/home/don/.bash_$(hostname -s)" && source /home/don/.bash_$(hostname -s)
-          test -f /home/don/.liquidprompt/liquidprompt && source /home/don/.liquidprompt/liquidprompt
-          test -f "/home/don/.bash_functions" && source "/home/don/.bash_functions"
+          if [[ ! -v BASH_COMPLETION_VERSINFO ]]; then
+          . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
+          fi
+          if [ -d ~/.bash_completion.d ]; then
+            for i in $(ls -1 ~/.bash_completion.d/*.sh); do . $i; done
+          fi
+          export HOSTNAME_SHORT=$(hostname -s)
+          test -f "~/.bash_$(hostname -s)" && . ~/.bash_$(hostname -s)
+          test -f ~/.liquidprompt/liquidprompt && . ~/.liquidprompt/liquidprompt
+          test -f "~/.bash_functions" && . "~/.bash_functions"
         '';
       profileExtra =
         ''