environment.d/10-profile.conf

@@ -9,6 +9,28 @@ XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 EDITOR="vim"
 VISUAL="vim"
 
+# Override paths for non-compliant programs
+# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
+
+ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
+CARGO_HOME="$XDG_DATA_HOME/cargo"
+GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
+GOPATH="$XDG_DATA_HOME/go"
+ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
+NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
+RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+TERMINFO="$XDG_DATA_HOME/terminfo"
+TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
+TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
+VIMDIR="$XDG_CONFIG_HOME/vim"
+VIMRC="$VIMDIR/vimrc"
+VIMINIT=":so $VIMRC"
+WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
+XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
+ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
 PATH="${PATH}:/sbin:/usr/sbin:${XDG_CONFIG_HOME}/scripts:${GOPATH}/bin"
 
 # vim: ft=sh

environment.d/20-xdg-overrides.conf

@@ -1,24 +0,0 @@
-# Override paths for non-compliant programs
-# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
-
-ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
-ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl"
-CARGO_HOME="$XDG_DATA_HOME/cargo"
-GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
-GOPATH="$XDG_DATA_HOME/go"
-ICEAUTHORITY="$XDG_CACHE_HOME/ICEauthority"
-NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-#PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
-PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup"
-RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-TERMINFO="$XDG_DATA_HOME/terminfo"
-TERMINFO_DIRS="$XDG_DATA_HOME/terminfo:/usr/share/terminfo"
-TS3_CONFIG_DIR="$XDG_CONFIG_HOME/teamspeak3"
-VIMDIR="$XDG_CONFIG_HOME/vim"
-VIMRC="$VIMDIR/vimrc"
-VIMINIT=":so $VIMRC"
-WEECHAT_HOME="$XDG_CONFIG_HOME/weechat"
-XINITRC="$XDG_CONFIG_HOME/X11/xinitrc"
-ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-
-# vim: ft=sh

zsh/.zshenv

@@ -1,11 +1,5 @@
-# Assume environment is already loaded if ZDOTDIR is set.
-# This speeds up starting zsh if it's not required. Attempt
-# to load the environment if it's absent, though, in case
-# ZDOTDIR is overriden and .zshrc is not in ~
-if [ -z "$ZDOTDIR" ]; then
-    set -o allexport
-    . ~/.config/environment.d/*.conf
-    set +o allexport
-fi
+set -o allexport
+. ~/.config/environment.d/*.conf
+set +o allexport
 
 # vim: ft=sh