diff --git a/.gitignore b/.gitignore
index 5592bea..559c2cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,8 @@ ssh/local.d/*
 local/share/fonts/*
 node_modules
 .nfs*
+*.socket
+iTermServer-*
+lock
+config/iterm2/AppSupport
+
diff --git a/base/bashrc b/base/bashrc
index cf021cb..b32afc8 100755
--- a/base/bashrc
+++ b/base/bashrc
@@ -3,7 +3,7 @@
 
 # Defaults
 export DOTFILES="$HOME/.dotfiles"
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$PATH"
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
 # shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
 
diff --git a/base/zshenv b/base/zshenv
new file mode 100644
index 0000000..9968b05
--- /dev/null
+++ b/base/zshenv
@@ -0,0 +1,18 @@
+# shellcheck shell=bash
+# vim: filetype=zsh
+
+export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$HOME/.local/go/bin:$PATH"
+
+export DOTFILES="$HOME/.dotfiles"
+
+# Explicitly set XDG folders
+# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+# custom variables
+export XDG_BIN_HOME="$HOME/.local/bin"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_RUNTIME_DIR="$HOME/.local/run"
+
diff --git a/base/zshrc b/base/zshrc
index f8032a4..df1bc3a 100755
--- a/base/zshrc
+++ b/base/zshrc
@@ -1,22 +1,7 @@
 # this is my zsh config. there are many like it, but this one is mine.
 # shellcheck shell=bash
 
-# Defaults
-export DOTFILES="$HOME/.dotfiles"
-# shellcheck source=scripts/shared.sh
 source "$DOTFILES/scripts/shared.sh"
-export PATH="$HOME/.local/bin:$HOME/.dotfiles/local/bin:$PATH"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
 
 export COMPLETION_WAITING_DOTS=true
 
diff --git a/config/exports b/config/exports
index f923e2a..db46ff6 100755
--- a/config/exports
+++ b/config/exports
@@ -2,19 +2,6 @@
 # shellcheck shell=bash
 # vim: filetype=zsh
 
-export DOTFILES="$HOME/.dotfiles"
-
-# Explicitly set XDG folders
-# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-# custom variables
-export XDG_BIN_HOME="$HOME/.local/bin"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_RUNTIME_DIR="$HOME/.local/run"
-
 source "$DOTFILES/config/exports-shell"
 source "$DOTFILES/config/exports-apps"