diff --git a/config/zsh/.zprofile b/config/zsh/.zprofile
new file mode 100644
index 0000000..8c8d3b7
--- /dev/null
+++ b/config/zsh/.zprofile
@@ -0,0 +1,5 @@
+export LANG="en_US.UTF-8"
+export LANGUAGE="en_US"
+export LC_ALL="en_US.UTF-8"
+export LC_CTYPE="en_US.UTF-8"
+
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index f1b151b..fed7da1 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -1,23 +1,11 @@
-#!/bin/zsh
 # Set up zsh for interactive use (options, prompt, aliases, etc.)
-
-# On MacOS, manipulate PATH and MANPATH here (see explanation in .zshenv).
-[ "$(uname -s)" = "Darwin" ] && source "$XDG_CONFIG_HOME/shell/path.sh"
-
-# Source additional configurations if available.
-while read -r f; do [ -f "$f" ] && source "$f"; done <<EOL
-    $ZDOTDIR/aliases
-    $ZDOTDIR/completion
-    $ZDOTDIR/prompt
-    $ZDOTDIR/vi-mode
-EOL
-unset f
+source "$ZDOTDIR/env.zsh"       # This one needs to go first.
+source "$ZDOTDIR/aliases.zsh"
+source "$ZDOTDIR/completion.zsh"
+source "$ZDOTDIR/history.zsh"
+source "$ZDOTDIR/prompt.zsh"
+source "$ZDOTDIR/vi-mode.zsh"
 
 # Prevent ctrl-s from freezing the terminal.
 stty stop undef
 
-# Save a lot of history.
-HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/history"
-HISTSIZE=1000000
-SAVEHIST=1000000
-
diff --git a/config/zsh/aliases b/config/zsh/aliases.zsh
similarity index 99%
rename from config/zsh/aliases
rename to config/zsh/aliases.zsh
index 3a1bc06..3ab4d11 100644
--- a/config/zsh/aliases
+++ b/config/zsh/aliases.zsh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 # ls:  make `ls` group directories first if supported.
 # lsc: force `ls` to use color output (e.g. for piping into `less`).
 if command -v exa >/dev/null 2>&1; then
diff --git a/config/zsh/completion b/config/zsh/completion.zsh
similarity index 96%
rename from config/zsh/completion
rename to config/zsh/completion.zsh
index c3b4ff4..9a1c119 100644
--- a/config/zsh/completion
+++ b/config/zsh/completion.zsh
@@ -1,5 +1,3 @@
-#!/bin/zsh
-
 autoload -Uz compinit && compinit
 zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}'
 zstyle ':completion:*' menu select
diff --git a/config/shell/path.sh b/config/zsh/env.zsh
similarity index 54%
rename from config/shell/path.sh
rename to config/zsh/env.zsh
index caeedd0..0597b77 100644
--- a/config/shell/path.sh
+++ b/config/zsh/env.zsh
@@ -1,5 +1,29 @@
-# This file is meant to be sourced from either $ZDOTDIR/.zshenv or
-# $ZDOTDIR/.zshrc (see those files for explanation).
+# General environment settings.
+export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
+export LESS="-i -j.49 -M -R -z-2"
+export LESSHISTFILE="$XDG_DATA_HOME/less/history"
+export LESSHISTSIZE=1000
+export LOCAL_PREFIX="/usr/local"
+export PAGER=less
+export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
+
+# Make man pages pretty, but only if $TERM is set because otherwise `tput`
+# would report errors (e.g., when running a command via SSH without allocating
+# a pty $TERM is not set).
+[ -n "$TERM" ] && {
+    rst="$(tput sgr0)"
+    LESS_TERMCAP_md="$(printf '%s\n' 'setaf 3' | tput -S)"
+    LESS_TERMCAP_mb="$LESS_TERMCAP_md"
+    LESS_TERMCAP_me="$rst"
+    LESS_TERMCAP_us="$(printf '%s\n' 'setaf 7' 'smul' | tput -S)"
+    LESS_TERMCAP_ue="$rst"
+    LESS_TERMCAP_so="$(printf '%s\n' 'setaf 4' 'setab 0' | tput -S)"
+    LESS_TERMCAP_se="$rst"
+    export LESS_TERMCAP_md LESS_TERMCAP_mb LESS_TERMCAP_me
+    export LESS_TERMCAP_us LESS_TERMCAP_ue LESS_TERMCAP_so LESS_TERMCAP_se
+    export GROFF_NO_SGR=1
+    unset rst
+}
 
 # Prevent path_helper from messing with the PATH when starting tmux.
 #
@@ -50,7 +74,7 @@ export MANPATH
 
 unset dir
 
-# These checks habe to be done after PATH manipulation above so we can find
+# These checks have to be done after PATH manipulation above so we can find
 # installed programs if they are in the added paths.
 
 if command -v nvim >/dev/null 2>&1; then
@@ -64,3 +88,18 @@ if command -v brew >/dev/null 2>&1; then
   export HOMEBREW_NO_AUTO_UPDATE=1
 fi
 
+# Set $DISPLAY if running in WSL and an Xserver is reachable
+#
+# How to configure Windows Firewall for Xserver: https://skeptric.com/wsl2-xserver/
+# How to check if running in WSL: https://stackoverflow.com/a/61014411
+if [ -n "$(uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip')" ]; then
+  xdisplay="$(awk '/nameserver/ {print $2; exit}' /etc/resolv.conf 2>/dev/null):0.0"
+  if command -v xset >/dev/null 2>&1; then
+    if DISPLAY="$xdisplay" timeout '0.2s' xset q >/dev/null 2>&1; then
+      export DISPLAY="$xdisplay"
+      export LIBGL_ALWAYS_INDIRECT=1
+    fi
+  fi
+  unset xdisplay
+fi
+
diff --git a/config/zsh/history.zsh b/config/zsh/history.zsh
new file mode 100644
index 0000000..14fa08d
--- /dev/null
+++ b/config/zsh/history.zsh
@@ -0,0 +1,4 @@
+HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/zsh/history"
+HISTSIZE=1000000
+SAVEHIST=1000000
+
diff --git a/config/zsh/prompt b/config/zsh/prompt.zsh
similarity index 99%
rename from config/zsh/prompt
rename to config/zsh/prompt.zsh
index c011c0e..f284463 100644
--- a/config/zsh/prompt
+++ b/config/zsh/prompt.zsh
@@ -1,5 +1,3 @@
-#!/bin/zsh
-
 base03=8 base02=0 base01=10 base00=11 base0=12 base1=14 base2=7   base3=15
 red=1    orange=9 yellow=3  green=2   cyan=6   blue=4   violet=13 magenta=5
 
diff --git a/config/zsh/vi-mode b/config/zsh/vi-mode.zsh
similarity index 99%
rename from config/zsh/vi-mode
rename to config/zsh/vi-mode.zsh
index 22f95f9..3eba13e 100644
--- a/config/zsh/vi-mode
+++ b/config/zsh/vi-mode.zsh
@@ -1,5 +1,3 @@
-#!/bin/zsh
-
 # Use vi mode for line editing.
 bindkey -v
 export KEYTIMEOUT=1
diff --git a/home/.zshenv b/home/.zshenv
index b794fef..5b74a51 100644
--- a/home/.zshenv
+++ b/home/.zshenv
@@ -1,68 +1,8 @@
-#!/bin/sh
-# Environment variables are set here for login shells.
-
 # Keep things organized.
 export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 
-# General environment settings.
-export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
-export LANG="en_US.UTF-8"
-export LANGUAGE="en_US"
-export LC_ALL="en_US.UTF-8"
-export LC_CTYPE="en_US.UTF-8"
-export LESS="-i -j.49 -M -R -z-2"
-export LESSHISTFILE="$XDG_DATA_HOME/less/history"
-export LESSHISTSIZE=1000
-export LOCAL_PREFIX="/usr/local"
-export PAGER=less
-export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
-export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
-
-# Make man pages pretty, but only if $TERM is set because otherwise `tput`
-# would report errors (e.g., when running a command via SSH without allocating
-# a pty $TERM is not set).
-[ -n "$TERM" ] && {
-    rst="$(tput sgr0)"
-    LESS_TERMCAP_md="$(printf '%s\n' 'setaf 3' | tput -S)"
-    LESS_TERMCAP_mb="$LESS_TERMCAP_md"
-    LESS_TERMCAP_me="$rst"
-    LESS_TERMCAP_us="$(printf '%s\n' 'setaf 7' 'smul' | tput -S)"
-    LESS_TERMCAP_ue="$rst"
-    LESS_TERMCAP_so="$(printf '%s\n' 'setaf 4' 'setab 0' | tput -S)"
-    LESS_TERMCAP_se="$rst"
-    export LESS_TERMCAP_md LESS_TERMCAP_mb LESS_TERMCAP_me
-    export LESS_TERMCAP_us LESS_TERMCAP_ue LESS_TERMCAP_so LESS_TERMCAP_se
-    export GROFF_NO_SGR=1
-    unset rst
-}
-
-# Add custom directories to PATH and MANPATH.
-#
-# On MacOS, we skip it here because these relevant files are sourced in order
-# by zsh on startup ($ZDOTDIR defaults to $HOME if not set):
-#
-#   $ZDOTDIR/.zshenv     <-- This file.
-#   /etc/zprofile        <-- On MacOS this sources /usr/libexec/path_helper,
-#                            which would undo what we do here.
-#   $ZDOTDIR/.zshrc      <-- So we defer our PATH manipulation to this file.
-#
-# shellcheck disable=SC1090
-[ "$(uname -s)" = "Darwin" ] || . "$XDG_CONFIG_HOME/shell/path.sh"
-
-# Set $DISPLAY if running in WSL and an Xserver is reachable
-#
-# How to configure Windows Firewall for Xserver: https://skeptric.com/wsl2-xserver/
-# How to check if running in WSL: https://stackoverflow.com/a/61014411
-if [ -n "$(uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip')" ]; then
-  xdisplay="$(awk '/nameserver/ {print $2; exit}' /etc/resolv.conf 2>/dev/null):0.0"
-  if command -v xset >/dev/null 2>&1; then
-    if DISPLAY="$xdisplay" timeout '0.2s' xset q >/dev/null 2>&1; then
-      export DISPLAY="$xdisplay"
-      export LIBGL_ALWAYS_INDIRECT=1
-    fi
-  fi
-  unset xdisplay
-fi
+# Everything else will be configured from within $ZDOTDIR.
+export ZDOTDIR="${ZDOTDIR:-$XDG_CONFIG_HOME/zsh}"