Simplify the use of ZDOTDIR

README.md

@@ -16,23 +16,28 @@ non-standard core utilities.
 
         zsh
 
-  2. Clone the repository:
+  2. Set the path to the Prezto installation directory:
 
-        git clone --recursive https://github.com/sorin-ionescu/prezto.git "${ZDOTDIR:-$HOME}/.zprezto"
+      ZDOTDIR="${ZDOTDIR:-$HOME}"
+      PREZTO="$ZDOTDIR/.zprezto"
 
-  3. Create a new Zsh configuration by copying the Zsh configuration files
+  3. Clone the repository:
+
+        git clone --recursive https://github.com/sorin-ionescu/prezto.git "$PREZTO"
+
+  4. Create a new Zsh configuration by copying the Zsh configuration files
      provided:
 
         setopt EXTENDED_GLOB
-        for rcfile in "${ZDOTDIR:-$HOME}"/.zprezto/runcoms/^README.md(.N); do
+        for rcfile in "$PREZTO/runcoms/^README.md(.N); do
-          ln -s "$rcfile" "${ZDOTDIR:-$HOME}/.${rcfile:t}"
+          ln -s "$rcfile" "${ZDOTDIR}/.${rcfile:t}"
         done
 
-  4. Set Zsh as your default shell:
+  5. Set Zsh as your default shell:
 
         chsh -s /bin/zsh
 
-  5. Open a new Zsh terminal window or tab.
+  6. Open a new Zsh terminal window or tab.
 
 ### Troubleshooting
 

init.zsh

@@ -31,7 +31,7 @@ function pmodload {
   pmodules=("$argv[@]")
 
   # Add functions to $fpath.
-  fpath=(${pmodules:+${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions(/FN)} $fpath)
+  fpath=(${pmodules:+$PREZTO/modules/${^pmodules}/functions(/FN)} $fpath)
 
   function {
     local pfunction
@@ -40,7 +40,7 @@ function pmodload {
     setopt LOCAL_OPTIONS EXTENDED_GLOB
 
     # Load Prezto functions.
-    for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/${^pmodules}/functions/$~pfunction_glob; do
+    for pfunction in $PREZTO/modules/${^pmodules}/functions/$~pfunction_glob; do
       autoload -Uz "$pfunction"
     done
   }
@@ -49,19 +49,19 @@ function pmodload {
   for pmodule in "$pmodules[@]"; do
     if zstyle -t ":prezto:module:$pmodule" loaded 'yes' 'no'; then
       continue
-    elif [[ ! -d "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule" ]]; then
+    elif [[ ! -d "$PREZTO/modules/$pmodule" ]]; then
       print "$0: no such module: $pmodule" >&2
       continue
     else
-      if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh" ]]; then
+      if [[ -s "$PREZTO/modules/$pmodule/init.zsh" ]]; then
-        source "${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/init.zsh"
+        source "$PREZTO/modules/$pmodule/init.zsh"
       fi
 
       if (( $? == 0 )); then
         zstyle ":prezto:module:$pmodule" loaded 'yes'
       else
         # Remove the $fpath entry.
-        fpath[(r)${ZDOTDIR:-$HOME}/.zprezto/modules/${pmodule}/functions]=()
+        fpath[(r)$PREZTO/modules/${pmodule}/functions]=()
 
         function {
           local pfunction
@@ -71,7 +71,7 @@ function pmodload {
           setopt LOCAL_OPTIONS EXTENDED_GLOB
 
           # Unload Prezto functions.
-          for pfunction in ${ZDOTDIR:-$HOME}/.zprezto/modules/$pmodule/functions/$~pfunction_glob; do
+          for pfunction in $PREZTO/modules/$pmodule/functions/$~pfunction_glob; do
             unfunction "$pfunction"
           done
         }
@@ -87,8 +87,8 @@ function pmodload {
 #
 
 # Source the Prezto configuration file.
-if [[ -s "${ZDOTDIR:-$HOME}/.zpreztorc" ]]; then
+if [[ -s "$ZDOTDIR/.zpreztorc" ]]; then
-  source "${ZDOTDIR:-$HOME}/.zpreztorc"
+  source "$ZDOTDIR/.zpreztorc"
 fi
 
 # Disable color and theme in dumb terminals.

modules/completion/init.zsh

@@ -36,7 +36,7 @@ unsetopt FLOW_CONTROL      # Disable start/stop characters in shell editor.
 
 # Use caching to make completion for cammands such as dpkg and apt usable.
 zstyle ':completion::complete:*' use-cache on
-zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-$HOME}/.zcompcache"
+zstyle ':completion::complete:*' cache-path "$ZDOTDIR/.zcompcache"
 
 # Case-insensitive (all), partial-word, and then substring completion.
 if zstyle -t ':prezto:module:completion:*' case-sensitive; then

modules/history/init.zsh

@@ -10,7 +10,7 @@
 # Variables
 #
 
-HISTFILE="${ZDOTDIR:-$HOME}/.zhistory"       # The path to the history file.
+HISTFILE="$ZDOTDIR/.zhistory"    # The path to the history file.
 HISTSIZE=10000                   # The maximum number of events to save in the internal history.
 SAVEHIST=10000                   # The maximum number of events to save in the history file.
 

modules/python/README.md

@@ -61,29 +61,6 @@ system site-packages directory.
 
     export VIRTUALENVWRAPPER_VIRTUALENV_ARGS='--no-site-packages'
 
-### Settings
-
-#### Lazy loading
-
-By default, virtualenvwrapper is loaded in lazy mode. This behaviour can be disabled adding the following line to *~/.zpreztorc*:
-
-    zstyle ':prezto:module:python' lazy_venv 'no'
-
-#### Automatic virtualenv initialization
-
-To enable autoenv, add the following line to *~/.zpreztorc*:
-
-    zstyle ':prezto:module:python' autoenv 'yes'
-
-If a virtualenv is active, and was not activated by autoenv, then autoenv does nothing.
-Otherwise, autoenv activated or deactivates a virtual environment whenever a directory is changed; based on the following priority:
-
-    1. Name specified in a file named *.venv* in the cwd.
-    2. *.venv* file in git root. If folder is inside git repository.
-    3. Name of git root folder.
-    4. No virtualenv.
-
-
 Aliases
 -------
 

modules/python/init.zsh

@@ -31,66 +31,17 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
   return 1
 fi
 
-local venv_script=virtualenvwrapper
-if zstyle -T ':prezto:module:python' lazy_venv; then
-    venv_script+=_lazy
-fi
-
 # Load virtualenvwrapper into the shell session.
-if (( $+commands[$venv_script.sh] )); then
+if (( $+commands[virtualenvwrapper_lazy.sh] )); then
   # Set the directory where virtual environments are stored.
   export WORKON_HOME="$HOME/.virtualenvs"
 
   # Disable the virtualenv prompt.
   VIRTUAL_ENV_DISABLE_PROMPT=1
 
-  source "$commands[$venv_script.sh]"
+  source "$commands[virtualenvwrapper_lazy.sh]"
 fi
 
-function autoenv {
-  #Don't run in shell scripts etc.
-  if [[ $ZSH_SUBSHELL -ne 0 ]]; then
-    return
-  fi
-
-  #Don't run if currently in virtual env not set by autoenv
-  if (( ($+VIRTUAL_ENV)  && !($+AUTOENV) )); then
-    return
-  fi
-
-  local name=""
-  if [[ -f .venv ]]; then
-    #.venv file in current dir gets highest priority
-    name=$(<.venv)
-  elif is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
-    local gitroot="$(git rev-parse --show-toplevel 2> /dev/null)"
-    if [ -f "$gitroot/.venv" ]; then
-      #If there is a .venv file in gitroot
-      name=$(<$gitroot/.venv)
-    else
-      #Else use the name of the folder as venv name
-      name=$gitroot:t
-    fi
-  fi
-
-
-  local venv_name="$VIRTUAL_ENV:t"
-  if [[ $name != $venv_name ]]; then
-    if [[ -z $name ]]; then
-      deactivate && unset AUTOENV
-      return
-    fi
-
-    if [[ -d "$WORKON_HOME/$name" ]]; then
-      workon $name && export AUTOENV=1
-      return
-    fi
-  fi
-}
-
-if zstyle -T ':prezto:module:python' autoenv; then
-    add-zsh-hook chpwd autoenv
-fi
 #
 # Aliases
 #

runcoms/zlogin

@@ -8,7 +8,7 @@
 # Execute code that does not affect the current session in the background.
 {
   # Compile the completion dump to increase startup speed.
-  zcompdump="${ZDOTDIR:-$HOME}/.zcompdump"
+  zcompdump="$ZDOTDIR/.zcompdump"
   if [[ -s "$zcompdump" && (! -s "${zcompdump}.zwc" || "$zcompdump" -nt "${zcompdump}.zwc") ]]; then
     zcompile "$zcompdump"
   fi

runcoms/zshenv

@@ -10,3 +10,10 @@ if [[ "$SHLVL" -eq 1 && ! -o LOGIN ]]; then
   source "${ZDOTDIR:-$HOME}/.zprofile"
 fi
 
+#
+# Zsh
+#
+
+ZDOTDIR="${ZDOTDIR:-$HOME}"
+PREZTO="$ZDOTDIR/.zprezto"
+

runcoms/zshrc

@@ -6,8 +6,8 @@
 #
 
 # Source Prezto.
-if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
+if [[ -s "$PREZTO/init.zsh" ]]; then
-  source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
+  source "$PREZTO/init.zsh"
 fi
 
 # Customize to your needs...