shell/zsh: reorganize load/loadalls

shell/zsh/.zshenv

@@ -1,14 +1,12 @@
-export DOTFILES="$HOME/.dotfiles"
-source "$DOTFILES/shell/common.sh"
+source "$HOME/.dotfiles/shell/common.sh"
 
 ## Paths
 # Ensure path arrays do not contain duplicates.
 typeset -gU cdpath fpath mailpath path
-
 path=(/usr/local/{,s}bin $path)
 
-load shell/env.sh
-loadall shell/zsh env.zsh
+load shell/zsh/config.zsh
+loadall env.zsh
 
 path=(
     $HOME/.bin

shell/zsh/.zshrc

@@ -4,14 +4,6 @@
 
 repo "tarjoilija/zgen" "$HOME/.zgen"
 
-load shell/zsh/aliases.zsh
-load shell/zsh/config.zsh
-if is-interactive; then
-    load shell/zsh/completion.zsh
-    load shell/zsh/keybinds.zsh
-    load shell/zsh/prompt.zsh
-fi
-
 source "$HOME/.zgen/zgen.zsh"
 if ! zgen saved; then
     info "Creating zgen save"
@@ -27,6 +19,13 @@ if ! zgen saved; then
     zgen save
 fi
 
+if is-interactive; then
+    load shell/zsh/completion.zsh
+    load shell/zsh/keybinds.zsh
+    load shell/zsh/prompt.zsh
+fi
+loadall aliases.zsh
+
 [[ -f "$HOME/.zshrc.local" ]] && source "$HOME/.zshrc.local"
 
 # Done!