except SunOS only

Calculates ignored users at runtime by extracting them from
passwd database and considering all users with UID < 100
(on Solaris systems) or UID < 500 (everywhere else).

By my timings, this doesn't make it any noticably slower.

README.md

@@ -9,8 +9,7 @@ Installation
 ------------
 
 Prezto will work with any recent release of Zsh, but the minimum recommended
-version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
+version is 4.3.11.
-non-standard core utilities.
 
   1. Launch Zsh:
 
@@ -37,7 +36,7 @@ non-standard core utilities.
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to *Prezto*,
-modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
+modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
 window or tab.
 
 Updating
@@ -86,7 +85,8 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2014 Sorin Ionescu and contributors.
+Copyright (c) 2009-2011 Robby Russell and contributors.
+Copyright (c) 2011-2014 Sorin Ionescu and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -114,5 +114,4 @@ SOFTWARE.
 [6]: http://gitref.org
 [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
 [8]: http://grml.org/zsh/zsh-lovers.html
-[9]: http://www.cygwin.com
 

init.zsh

@@ -25,7 +25,7 @@ unset min_zsh_version
 function pmodload {
   local -a pmodules
   local pmodule
-  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
+  local pfunction_glob='^([_.]*|prompt_*_setup|README*)(-.N:t)'
 
   # $argv is overridden in the anonymous function.
   pmodules=("$argv[@]")

modules/archive/functions/unarchive

@@ -73,7 +73,7 @@ while (( $# > 0 )); do
   esac
 
   (( success = $success > 0 ? $success : $? ))
-  (( $success == 0 && $remove_archive == 0 )) && rm "$1"
+  (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
   shift
 done
 

modules/completion/init.zsh

@@ -99,14 +99,13 @@ zstyle -e ':completion:*:hosts' hosts 'reply=(
 )'
 
 # Don't complete uninteresting users...
-zstyle ':completion:*:*:*:users' ignored-patterns \
+zstyle ':completion:*:*:*:users' ignored-patterns nobody nobody4 noaccess '_*' \
-  adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
+  $([[ "$OSTYPE" = SunOS ]] && uid_min=100 || uid_min=500
-  dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
+    IFS=:
-  hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
+    while read -r user pass uid remainder; do
-  mailman mailnull mldonkey mysql nagios \
+      [[ "$user" != (\#*|root) ]] && ((uid < uid_min)) && echo $user
-  named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
+    done </etc/passwd
-  operator pcap postfix postgres privoxy pulse pvm quagga radvd \
+  )
-  rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs '_*'
 
 # ... unless we really want to.
 zstyle '*' single-ignored show
@@ -123,10 +122,8 @@ zstyle ':completion:*:*:kill:*' force-list always
 zstyle ':completion:*:*:kill:*' insert-ids single
 
 # Man
-# zstyle ':completion:*:manuals' separate-sections true
+zstyle ':completion:*:manuals' separate-sections true
-# zstyle ':completion:*:manuals.(^1*)' insert-sections true
+zstyle ':completion:*:manuals.(^1*)' insert-sections true
-zstyle ':completion:*:manuals.*' insert-sections   true
-zstyle ':completion:*:man:*' menu yes select
 
 # Media Players
 zstyle ':completion:*:*:mpg123:*' file-patterns '*.(mp3|MP3):mp3\ files *(-/):directories'

modules/editor/init.zsh

@@ -107,31 +107,40 @@ function editor-info {
 }
 zle -N editor-info
 
-# Ensures that $terminfo values are valid and updates editor information when
+# Updates editor information when the keymap changes.
-# the keymap changes.
+function zle-keymap-select {
-function zle-keymap-select zle-line-init zle-line-finish {
+  zle editor-info
+}
+zle -N zle-keymap-select
+
+# Enables terminal application mode and updates editor information.
+function zle-line-init {
   # The terminal must be in application mode when ZLE is active for $terminfo
   # values to be valid.
-  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
+  if (( $+terminfo[smkx] )); then
-    case "$0" in
+    # Enable terminal application mode.
-      (zle-line-init)
+    echoti smkx
-        # Enable terminal application mode.
-        echoti smkx
-      ;;
-      (zle-line-finish)
-        # Disable terminal application mode.
-        echoti rmkx
-      ;;
-    esac
   fi
 
   # Update editor information.
   zle editor-info
 }
-zle -N zle-keymap-select
-zle -N zle-line-finish
 zle -N zle-line-init
 
+# Disables terminal application mode and updates editor information.
+function zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[rmkx] )); then
+    # Disable terminal application mode.
+    echoti rmkx
+  fi
+
+  # Update editor information.
+  zle editor-info
+}
+zle -N zle-line-finish
+
 # Toggles emacs overwrite mode and updates editor information.
 function overwrite-mode {
   zle .overwrite-mode

modules/gpg/init.zsh

@@ -12,7 +12,7 @@ fi
 
 # Set the default paths to gpg-agent files.
 _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
-_gpg_agent_env="$TMPDIR/gpg-agent.env"
+_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
 
 # Start gpg-agent if not started.
 if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then

modules/helper/init.zsh

@@ -12,7 +12,7 @@ function is-autoloadable {
 
 # Checks if a name is a command, function, or alias.
 function is-callable {
-  (( $+commands[$1] || $+functions[$1] || $+aliases[$1] ))
+  (( $+commands[$1] )) || (( $+functions[$1] )) || (( $+aliases[$1] ))
 }
 
 # Checks a boolean variable for "true".

modules/homebrew/init.zsh

@@ -22,3 +22,4 @@ alias brews='brew search'
 alias brewu='brew upgrade'
 alias brewU='brew update && brew upgrade'
 alias brewx='brew remove'
+

modules/osx/README.md

@@ -9,17 +9,20 @@ Aliases
   - `cdf` changes the current working director to the current _Finder_
     directory.
   - `pushdf` pushes the current working directory onto the directory queue and
-  - `ql` quick looks at files.
+    changes the current working director to the current _Finder_ directory.
-  - `rm-osx-cruft` deletes .DS\_Store, \_\_MACOSX cruft.
 
 Functions
 ---------
 
-  - `manb` opens _man_ pages in [_Bwana.app_][2].
+  - `mand` opens _man_ pages in [_Dash.app_][2].
   - `manp` opens _man_ pages in _Preview.app_.
   - `pfd` prints the current _Finder_ directory.
   - `pfs` prints the current _Finder_ selection.
   - `tab` creates a new tab (works in both _Terminal_ and [_iTerm_][3]).
+  - `ql` previews files in Quick Look.
+  - `osx-rm-dir-metadata` deletes .DS\_Store, \_\_MACOSX cruft.
+  - `osx-ls-download-history` displays the Mac OS X download history.
+  - `osx-rm-download-history` deletes the Mac OS X download history.
 
 Authors
 -------
@@ -29,7 +32,6 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.apple.com/macosx/
-[2]: http://bruji.com/bwana/
+[2]: http://kapeli.com/dash
 [3]: http://www.iterm2.com/
 [4]: https://github.com/sorin-ionescu/prezto/issues
-

modules/osx/functions/_manb_mand_manp

@@ -1,8 +1,8 @@
-#compdef manb manp
+#compdef mand manp
 #autoload
 
 #
-# Completes manb and manp.
+# Completes mand and manp.
 #
 # Authors:
 #   Sorin Ionescu <sorin.ionescu@gmail.com>

modules/osx/functions/manb

@@ -1,24 +0,0 @@
-#
-# Opens man pages in Bwana.app.
-#
-# Authors:
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-
-function manb {
-  local page
-  if (( $# > 0 )); then
-    for page in "$@"; do
-      open "man:$page" 2>/dev/null
-      if (( $? != 0 )); then
-        print "$0: Bwana is not installed" >&2
-        break
-      fi
-    done
-  else
-    print 'What manual page do you want?' >&2
-  fi
-}
-
-manb "$@"
-

modules/osx/functions/mand

@@ -0,0 +1,21 @@
+#
+# Opens man pages in Dash.app.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+function mand {
+  if (( $# > 0 )); then
+    open "dash://manpages:$1" 2>/dev/null
+    if (( $? != 0 )); then
+      print "$0: Dash is not installed" >&2
+      break
+    fi
+  else
+    print 'What manual page do you want?' >&2
+  fi
+}
+
+mand "$@"
+

modules/osx/functions/osx-ls-download-history

@@ -0,0 +1,13 @@
+#
+# Displays the Mac OS X download history.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+local db
+for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
+  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
+    sqlite3 "$db" 'SELECT LSQuarantineDataURLString FROM LSQuarantineEvent'
+  fi
+done

modules/osx/functions/osx-rm-dir-metadata

@@ -0,0 +1,11 @@
+#
+# Deletes .DS_Store and __MACOSX directories.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+find "${@:-$PWD}" \( \
+  -type f -name '.DS_Store' -o \
+  -type d -name '__MACOSX' \
+\) -print0 | xargs -0 rm -rf

modules/osx/functions/osx-rm-download-history

@@ -0,0 +1,13 @@
+#
+# Deletes the Mac OS X download history.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+local db
+for db in ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV*; do
+  if grep -q 'LSQuarantineEvent' < <(sqlite3 "$db" .tables); then
+    sqlite3 "$db" 'DELETE FROM LSQuarantineEvent; VACUUM'
+  fi
+done

modules/osx/functions/pfd

@@ -7,7 +7,6 @@
 
 osascript 2>/dev/null <<EOF
   tell application "Finder"
-    return POSIX path of (target of window 1 as alias)
+    return POSIX path of (target of first window as text)
   end tell
 EOF
-

modules/osx/functions/pfs

@@ -5,14 +5,11 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-osascript 2>/dev/null <<EOF
+osascript 2>&1 <<EOF
-  set output to ""
   tell application "Finder" to set the_selection to selection
-  set item_count to count the_selection
+  if the_selection is not {}
-  repeat with item_index from 1 to count the_selection
+    repeat with an_item in the_selection
-    if item_index is less than item_count then set the_delimiter to "\n"
+      log POSIX path of (an_item as text)
-    if item_index is item_count then set the_delimiter to ""
+    end repeat
-    set output to output & ((item item_index of the_selection as alias)'s POSIX path) & the_delimiter
+  end if
-  end repeat
 EOF
-

modules/osx/functions/ql

@@ -0,0 +1,10 @@
+#
+# Previews files in Quick Look.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+if (( $# > 0 )); then
+  qlmanage -p "$@" &> /dev/null
+fi

modules/osx/init.zsh

@@ -14,26 +14,8 @@ fi
 # Aliases
 #
 
-# Change directory to the current Finder directory.
+# Changes directory to the current Finder directory.
 alias cdf='cd "$(pfd)"'
 
-# Push directory to the current Finder directory.
+# Pushes directory to the current Finder directory.
 alias pushdf='pushd "$(pfd)"'
-
-#
-# Functions
-#
-
-# Open files in Quick Look.
-function ql {
-  (( $# > 0 )) && qlmanage -p "$@" &> /dev/null
-}
-
-# Delete .DS_Store and __MACOSX directories.
-function rm-osx-cruft {
-  find "${@:-$PWD}" \( \
-    -type f -name '.DS_Store' -o \
-    -type d -name '__MACOSX' \
-  \) -print0 | xargs -0 rm -rf
-}
-

modules/pacman/functions/pacman-list-disowned

@@ -6,7 +6,7 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-local tmp="$TMPDIR/pacman-disowned-$UID-$$"
+local tmp="${TMPDIR:-/tmp}/pacman-disowned-$UID-$$"
 local db="$tmp/db"
 local fs="$tmp/fs"
 

modules/pacman/init.zsh

@@ -27,6 +27,9 @@ if (( $+commands[$_pacman_frontend] )); then
   if [[ -s "${0:h}/${_pacman_frontend}.zsh" ]]; then
     source "${0:h}/${_pacman_frontend}.zsh"
   fi
+else
+  _pacman_frontend='pacman'
+  _pacman_sudo='sudo '
 fi
 
 #
@@ -34,49 +37,49 @@ fi
 #
 
 # Pacman.
-alias pac='pacman'
+alias pac="${_pacman_frontend}"
 
 # Installs packages from repositories.
-alias paci='sudo pacman --sync'
+alias paci="${_pacman_sudo}${_pacman_frontend} --sync"
 
 # Installs packages from files.
-alias pacI='sudo pacman --upgrade'
+alias pacI="${_pacman_sudo}${_pacman_frontend} --upgrade"
 
 # Removes packages and unneeded dependencies.
-alias pacx='sudo pacman --remove'
+alias pacx="${_pacman_sudo}${_pacman_frontend} --remove"
 
 # Removes packages, their configuration, and unneeded dependencies.
-alias pacX='sudo pacman --remove --nosave --recursive'
+alias pacX="${_pacman_sudo}${_pacman_frontend} --remove --nosave --recursive"
 
 # Displays information about a package from the repositories.
-alias pacq='pacman --sync --info'
+alias pacq="${_pacman_frontend} --sync --info"
 
 # Displays information about a package from the local database.
-alias pacQ='pacman --query --info'
+alias pacQ="${_pacman_frontend} --query --info"
 
 # Searches for packages in the repositories.
-alias pacs='pacman --sync --search'
+alias pacs="${_pacman_frontend} --sync --search"
 
 # Searches for packages in the local database.
-alias pacS='pacman --query --search'
+alias pacS="${_pacman_frontend} --query --search"
 
 # Lists orphan packages.
-alias pacman-list-orphans='sudo pacman --query --deps --unrequired'
+alias pacman-list-orphans="${_pacman_sudo}${_pacman_frontend} --query --deps --unrequired"
 
 # Removes orphan packages.
-alias pacman-remove-orphans='sudo pacman --remove --recursive $(pacman --quiet --query --deps --unrequired)'
+alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recursive \$(${_pacman_frontend} --quiet --query --deps --unrequired)"
 
 # Synchronizes the local package and Arch Build System databases against the
 # repositories.
 if (( $+commands[abs] )); then
-  alias pacu='sudo pacman --sync --refresh && sudo abs'
+  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs"
 else
-  alias pacu='sudo pacman --sync --refresh'
+  alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
 fi
 
 # Synchronizes the local package database against the repositories then
 # upgrades outdated packages.
-alias pacU='sudo pacman --sync --refresh --sysupgrade'
+alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
 
-unset _pacman_frontend
+unset _pacman_{frontend,sudo}
 

modules/pacman/yaourt.zsh

@@ -11,9 +11,9 @@
 
 # Disable color.
 if ! zstyle -t ':prezto:module:pacman:yaourt' color; then
-  alias pacman='pacman --nocolor'
+  alias pacman='yaourt --nocolor'
 fi
 
 # Manages .pac* files.
-alias pacc='pacman -C'
+alias pacc='yaourt -C'
 

modules/ruby/README.md

@@ -8,7 +8,7 @@ Local Gem Installation
 ----------------------
 
 When a Ruby version manager is not detected, local gems are installed in
-*~/Library/Ruby/Gems/1.8* on Mac OS X.
+*~/.gems*; otherwise, they are installed according to the manager.
 
 RVM
 ---
@@ -20,15 +20,33 @@ home directory.
 Since RVM is loaded into the shell and is known to override shell commands, it
 may conflict with shell scripts.
 
+Load this module as late as possible when using RVM since RVM will complain if
+it is not first in `$PATH`.
+
 rbenv
 -----
 
-An alternative RVM is to use [rbenv][3], which allows for switching between multiple,
+An alternative RVM is to use [rbenv][3], which allows for switching between
-isolated Ruby installations in the home directory.
+multiple, isolated Ruby installations in the home directory.
 
 While it is not as feature rich as RVM, it is not loaded into the shell and is
 not known to cause conflicts with shell scripts.
 
+chruby
+------
+
+Yet another alternative is [chruby][6], which is simpler than both RVM and
+rbenv.
+
+### Settings
+
+#### Auto-Switch
+
+To enable auto switching the Ruby version on directory change based on the
+.ruby-version file, add the following line to *zpreztorc*:
+
+    zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+
 Bundler
 -------
 
@@ -87,4 +105,4 @@ Authors
 [3]: https://github.com/sstephenson/rbenv
 [4]: http://gembundler.com
 [5]: https://github.com/sorin-ionescu/prezto/issues
-
+[6]: https://github.com/postmodern/chruby

modules/ruby/functions/ruby-info

@@ -18,6 +18,8 @@ if (( $+commands[rvm-prompt] )); then
   version="$(rvm-prompt)"
 elif (( $+commands[rbenv] )); then
   version="$(rbenv version-name)"
+elif (( $+commands[ruby] )); then
+  version="${${$(ruby --version)[(w)1,(w)2]}/ /-}"
 fi
 
 # Format version.

modules/ruby/init.zsh

@@ -23,6 +23,13 @@ elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
 elif (( $+commands[rbenv] )); then
   eval "$(rbenv init - --no-rehash zsh)"
 
+# Load package manager installed chruby into the shell session.
+elif (( $+commands[chruby-exec] )); then
+  source "${commands[chruby-exec]:h:h}/share/chruby/chruby.sh"
+  if zstyle -t ':prezto:module:ruby:chruby' auto-switch; then
+    source "${commands[chruby-exec]:h:h}/share/chruby/auto.sh"
+  fi
+
 # Prepend local gems bin directories to PATH.
 else
   path=($HOME/.gem/ruby/*/bin(N) $path)
@@ -43,14 +50,14 @@ alias rb='ruby'
 # Bundler
 if (( $+commands[bundle] )); then
   alias rbb='bundle'
-  alias rbbe='rbb exec'
+  alias rbbe='bundle exec'
-  alias rbbi='rbb install'
+  alias rbbi='bundle install --path vendor/bundle'
-  alias rbbl='rbb list'
+  alias rbbl='bundle list'
-  alias rbbo='rbb open'
+  alias rbbo='bundle open'
-  alias rbbp='rbb package'
+  alias rbbp='bundle package'
-  alias rbbu='rbb update'
+  alias rbbu='bundle update'
   alias rbbI='rbbi \
-    && rbb package \
+    && bundle package \
     && print .bundle       >>! .gitignore \
     && print vendor/assets >>! .gitignore \
     && print vendor/bundle >>! .gitignore \

modules/screen/init.zsh

@@ -15,7 +15,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" ]] && ( \
+if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
 ); then

modules/spectrum/init.zsh

@@ -57,7 +57,7 @@ FG[none]="$FX[none]"
 BG[none]="$FX[none]"
 colors=(black red green yellow blue magenta cyan white)
 for color in {0..255}; do
-  if (( $color >= 0 && $color < $#colors )); then
+  if (( $color >= 0 )) && (( $color < $#colors )); then
     index=$(( $color + 1 ))
     FG[$colors[$index]]="\e[38;5;${color}m"
     BG[$colors[$index]]="\e[48;5;${color}m"

modules/ssh/init.zsh

@@ -14,10 +14,10 @@ fi
 _ssh_dir="$HOME/.ssh"
 
 # Set the path to the environment file if not set by another module.
-_ssh_agent_env="${_ssh_agent_env:-$TMPDIR/ssh-agent.env}"
+_ssh_agent_env="${_ssh_agent_env:-${TMPDIR:-/tmp}/ssh-agent.env}"
 
 # Set the path to the persistent authentication socket.
-_ssh_agent_sock="$TMPDIR/ssh-agent.sock"
+_ssh_agent_sock="${TMPDIR:-/tmp}/ssh-agent.sock"
 
 # Start ssh-agent if not started.
 if [[ ! -S "$SSH_AUTH_SOCK" ]]; then

modules/terminal/init.zsh

@@ -6,7 +6,7 @@
 #
 
 # Return if requirements are not found.
-if [[ "$TERM" == 'dumb' ]]; then
+if [[ "$TERM" == (dumb|linux|*bsd*) ]]; then
   return 1
 fi
 

modules/tmux/init.zsh

@@ -16,11 +16,11 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" ]] && ( \
+if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
-  tmux_session='#Prezto'
+  tmux_session='prezto'
 
   if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
     # Ensure that tmux server is started.

modules/utility/README.md

@@ -50,6 +50,7 @@ Aliases
 
 ### Disabled File Globbing
 
+  - `bower`
   - `fc`
   - `find`
   - `ftp`

modules/utility/init.zsh

@@ -34,6 +34,7 @@ alias mysql='nocorrect mysql'
 alias rm='nocorrect rm'
 
 # Disable globbing.
+alias bower='noglob bower'
 alias fc='noglob fc'
 alias find='noglob find'
 alias ftp='noglob ftp'
@@ -104,6 +105,10 @@ alias sl='ls'            # I often screw this up.
 # Mac OS X Everywhere
 if [[ "$OSTYPE" == darwin* ]]; then
   alias o='open'
+elif [[ "$OSTYPE" == cygwin* ]]; then
+  alias o='cygstart'
+  alias pbcopy='tee > /dev/clipboard'
+  alias pbpaste='cat /dev/clipboard'
 else
   alias o='xdg-open'
 

runcoms/zpreztorc

@@ -87,6 +87,13 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
 # Auto set to 'off' on dumb terminals.
 zstyle ':prezto:module:prompt' theme 'sorin'
 
+#
+# Ruby
+#
+
+# Auto switch the Ruby version on directory change.
+# zstyle ':prezto:module:ruby:chruby' auto-switch 'yes'
+
 #
 # Screen
 #

runcoms/zshenv

@@ -6,7 +6,7 @@
 #
 
 # Ensure that a non-login, non-interactive shell has a defined environment.
-if [[ "$SHLVL" -eq 1 && ! -o LOGIN ]]; then
+if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprofile"
 fi