diff --git a/home/.zshenv b/home/.zshenv
new file mode 100644
index 0000000..14e911e
--- /dev/null
+++ b/home/.zshenv
@@ -0,0 +1,13 @@
+GOPATH="$HOME/go"
+
+path=(
+    ~/bin
+    ~/.local/bin
+    $path
+    ~/.cargo/bin
+    $GOPATH/bin
+)
+
+# Force antialiasing in java
+export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"
+export EDITOR=nvim
diff --git a/home/.zshrc.local b/home/.zshrc.local
index 6b33dd3..fe4bb15 100644
--- a/home/.zshrc.local
+++ b/home/.zshrc.local
@@ -1,20 +1,3 @@
-# Programming languages
-
-## Go
-export GOPATH="$HOME/go"
-export PATH="$PATH:$GOPATH/bin"
-
-## Python (pip)
-export PATH="$HOME/.local/bin:$PATH"
-
-## Rust (cargo)
-export PATH="$HOME/.cargo/bin:$PATH"
-
-# Misc
-
-## Local binaries
-export PATH="$HOME/bin:$PATH"
-
 # Program aliases/env
 
 ## Aliases for programs
@@ -33,10 +16,6 @@ alias userctl="systemctl --user"
 ## Debian packages fd as fdfind
 command -v fdfind >/dev/null && alias fd="fdfind"
 
-## Environment variables
-export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on" # force antialiasing in java
-export EDITOR=nvim
-
 ## include docker functions
 source ~/.zshrc.docker