diff --git a/env/10_path.zsh b/env/10_path.zsh
new file mode 100644
index 0000000..2927baf
--- /dev/null
+++ b/env/10_path.zsh
@@ -0,0 +1 @@
+export PATH="$PATH:$HOME/.local/bin"
diff --git a/env/40_mail.zsh b/env/40_mail.zsh
new file mode 100644
index 0000000..dd96a28
--- /dev/null
+++ b/env/40_mail.zsh
@@ -0,0 +1,3 @@
+export MAILDIR=$HOME/.maildir
+export NOTMUCH_CONFIG=$XDG_CONFIG_HOME/notmuch-config
+export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg
diff --git a/env/50_nodejs.zsh b/env/50_nodejs.zsh
new file mode 100644
index 0000000..507f907
--- /dev/null
+++ b/env/50_nodejs.zsh
@@ -0,0 +1,3 @@
+export NPM_PACKAGES="${XDG_DATA_HOME}/npm-packages"
+export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
+export PATH="$PATH:$NPM_PACKAGES/bin"
diff --git a/env/50_ruby.zsh b/env/50_ruby.zsh
new file mode 100644
index 0000000..4537e4a
--- /dev/null
+++ b/env/50_ruby.zsh
@@ -0,0 +1,2 @@
+RUBY_VERSION=${$(gem environment gemdir):t}
+export PATH="$PATH:$HOME/.gem/ruby/$RUBY_VERSION/bin"
diff --git a/env/50_rust.zsh b/env/50_rust.zsh
new file mode 100644
index 0000000..8ea35ad
--- /dev/null
+++ b/env/50_rust.zsh
@@ -0,0 +1,3 @@
+if which rustup &>/dev/null; then
+	export RUST_SRC_PATH=$(rustup run stable rustc --print sysroot)/lib/rustlib/src/rust/src
+fi
diff --git a/env/60_fzf.zsh b/env/60_fzf.zsh
new file mode 100644
index 0000000..23e65b8
--- /dev/null
+++ b/env/60_fzf.zsh
@@ -0,0 +1 @@
+export FZF_DEFAULT_COMMAND="fd"
diff --git a/env_template b/env_template
deleted file mode 100644
index 463351a..0000000
--- a/env_template
+++ /dev/null
@@ -1,29 +0,0 @@
-# path to your zsh configuration dir
-# this may be the path to this repo, if you use it per user
-# if you installed this repo to /etc/zsh/, this is the path for the per user
-# config, which can override global settings in /etc/zsh
-export ZDOTDIR=$HOME/.config/zsh
-
-PROMPT_UNICODE=yes
-
-# below you can put user or server specific settings.
-
-# on foreign server I don't want to accidentaly alarm admins
-#sudo() {
-#	echo "no root here";
-#}
-#
-#su() {
-#	echo "no root here";
-#}
-
-# set modules to load. here: exclude highlight, because it is no fun over slow
-# connections
-#ZMODLOAD_ONLY=( autoloader bindings completion vcs prompt )
-
-
-# make some programs use xdg basedirs
-#export MAILDIR=$HOME/.maildir export NOTMUCH_CONFIG=$HOME/.config/notmuch-config
-#export VIMINIT="let \$MYVIMRC=\"$XDG_CONFIG_HOME/vim/vimrc\" | source \$MYVIMRC"
-#export GVIMINIT="let \$MYGVIMRC=\"$XDG_CONFIG_HOME/vim/gvimrc\" | source \$MYGVIMRC"
-#export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg
diff --git a/zshenv b/zshenv
index 6ab6956..d92b5a4 100755
--- a/zshenv
+++ b/zshenv
@@ -1,24 +1,8 @@
-export ZDOTDIR=$HOME/.config/zsh
+export ZDOTDIR=${XDG_CONFIG_HOME:-$HOME/.config}/zsh
 
-ZMODLOAD_BLACKLIST=( ssh-agent )
-export ZMODLOAD_BLACKLIST
-if [ -n "$TMUX" ]; then export SHELL=/usr/bin/tmux; fi
-
-export MAILDIR=$HOME/.maildir export NOTMUCH_CONFIG=$HOME/.config/notmuch-config
-export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg
-export FZF_DEFAULT_COMMAND="fd"
-export NPM_PACKAGES="${XDG_DATA_HOME}/npm-packages"
-export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH"
-
-PATH="$PATH:$HOME/.gem/ruby/2.5.0/bin"
-PATH="$PATH:$NPM_PACKAGES/bin"
-PATH="$PATH:$HOME/.local/bin"
-PATH="$PATH:$XDG_DATA_HOME/android/sdk/tools"
-export PATH
-
-if command -v rustup &>/dev/null; then
-	export RUST_SRC_PATH=$(rustup run stable rustc --print sysroot)/lib/rustlib/src/rust/src
-fi
+for i in $ZDOTDIR/env/*.zsh; do
+	. $i
+done
 
 if [[ -e $ZDOTDIR/dirs ]]; then
 	source $ZDOTDIR/dirs