2 files changed, 58 insertions, 42 deletions
diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile
index 6a40089..f4374d4 100755
--- a/zsh/.config/zsh/.zprofile
+++ b/zsh/.config/zsh/.zprofile
@@ -8,9 +8,6 @@ source /etc/zsh/zprofile
 #export TERM=xterm-256color
 
 #export EDITOR="emacsclient -c"
-export EDITOR="nvim"
-
-export DEFAULT_USER=peter
 
 export QT_QPA_PLATFORMTHEME=qt5ct
 export QT_AUTO_SCREEN_SCALE_FACTOR=0
@@ -18,44 +15,6 @@ export QT_SCALE_FACTOR=0
 
 export MTP_NO_PROBE="1"
 
-export XDG_CONFIG_HOME="$HOME/.config"
-
-[ -d "$HOME/.local/bin" ] && \
-    export PATH="$HOME/.local/bin:$PATH"
-[ -d "$HOME/.bin" ] && \
-    export PATH="$HOME/.bin:$PATH"
-[ -d "$HOME/bin" ] && \
-    export PATH="$HOME/bin:$PATH"
-
-# Android SDK
-if [ -d "$HOME/.local/share/android-sdk" ]; then
-    export ANDROID_HOME="$HOME/.local/share/android-sdk"
-    export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH"
-fi
-
-# Go
-if type "go" > /dev/null; then
-    export PATH="$HOME/go/bin:$PATH"
-    export GOPATH=$(go env GOPATH)
-fi
-
-# Rust
-if type "rustc" > /dev/null; then
-    export PATH="$HOME/.cargo/bin:$PATH"
-    export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
-fi
-
-# Node
-if type "npm" > /dev/null; then
-    export PATH="$HOME/.node_modules/bin:$PATH"
-    export npm_config_prefix=~/.node_modules
-fi
-
-# Ruby
-if type "ruby" > /dev/null; then
-    export PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin"
-fi
-
 # fzf
 if type "fzf" > /dev/null && type "rg" > /dev/null; then
     export FZF_DEFAULT_COMMAND="rg --hidden --follow --ignore-vcs --files --iglob '!.git'"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 55d2d67..7a0a963 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,5 +1,62 @@
+export EDITOR="nvim"
+
+export DEFAULT_USER=peter
+
+
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
 
-export ZDOTDIR="${XDG_CONFIG_HOME}/zsh"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
+extra_paths=""
+
+# RUST XDG_DIR
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+extra_paths="$CARGO_HOME/bin:$extra_paths"
+
+# GOPATH
+export GOPATH="$XDG_DATA_HOME/go"
+extra_paths="$extra_paths:$GOPATH/bin"
+
+# Ruby
+export GEM_HOME="$XDG_DATA_HOME/gem"
+export GEM_SPEC_CACHE="$XDG_CACHE_HOME/gem"
+export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME/bundle"
+export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle"
+export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME/bundle"
+extra_paths="$extra_paths:$GEM_HOME/bin"
+
+# Node & NPM
+export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
+export npm_config_prefix="$XDG_DATA_HOME/node"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+extra_paths="$extra_paths:$npm_config_prefix/bin"
+
+# Docker
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
+export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine"
+
+# Other
+export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME/ccache.conf"
+export CCACHE_DIR="$XDG_CACHE_HOME/ccache"
+export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
+export GTK_RC_FILES="$XDG_CONFIG_HOME/gtk-1.0/gtkrc"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gkt-2.0/gtkrc"
+export LESSKEY="$XDG_CONFIG_HOME/less/lesskey"
+export LESSHISTFILE="$XDG_CACHE_HOME/less/history"
+export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/notmuchrc"
+export NMBGIT="$XDG_DATA_HOME/notmuch/nmbug"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
+export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
+
+[ -d "$HOME/bin" ] && \
+    PATH="$HOME/bin:$PATH"
+[ -d "$HOME/.bin" ] && \
+    PATH="$HOME/.bin:$PATH"
+[ -d "$HOME/.local/bin" ] && \
+    PATH="$HOME/.local/bin:$PATH"
+export PATH="$extra_paths:$PATH"
+