[WIP] Add more completion settings

README.md

@@ -8,8 +8,9 @@ and prompt themes.
 Installation
 ------------
 
-Prezto will work with any recent release of Zsh, but the minimum required
-version is 4.3.17.
+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
+non-standard core utilities.
 
   1. Launch Zsh:
 
@@ -36,7 +37,7 @@ version is 4.3.17.
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to *Prezto*,
-modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
+modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
 window or tab.
 
 Updating
@@ -85,8 +86,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009-2011 Robby Russell and contributors.
-Copyright (c) 2011-2014 Sorin Ionescu and contributors.
+Copyright (c) 2009-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,4 +114,5 @@ 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

@@ -10,7 +10,7 @@
 #
 
 # Check for the minimum supported version.
-min_zsh_version='4.3.17'
+min_zsh_version='4.3.11'
 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
   print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
   return 1
@@ -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/README.md

@@ -102,10 +102,10 @@ Node.js
 
 Provides utility functions for Node.js and loads npm completion.
 
-OCaml
+Ocaml
 -----
 
-Initializes OCaml package management.
+Initializes Ocaml package management.
 
 OSX
 ---

modules/archive/functions/unarchive

@@ -54,8 +54,8 @@ while (( $# > 0 )); do
     (*.Z) uncompress "$1" ;;
     (*.zip) unzip "$1" -d $extract_dir ;;
     (*.rar) unrar &> /dev/null \
-      && unrar x -ad "$1" \
-      || rar x -ad "$1" ;;
+      && unrar e -ad "$1" \
+      || rar e -ad "$1" ;;
     (*.7z) 7za x "$1" ;;
     (*.deb)
       mkdir -p "$extract_dir/control"

modules/completion/init.zsh

@@ -61,6 +61,44 @@ zstyle ':completion:*' format ' %F{yellow}-- %d --%f'
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' verbose yes
 
+
+# Don't autoexpand until nothing else has changed on line
+zstyle ':completion:*' keep-prefix true
+zstyle ':completion:*' expand prefix suffix
+# zstyle ':completion:*' suffix true
+
+# Complete ..
+zstyle ':completion:*' special-dirs ..
+
+# Do not select the current directory when executing cd ../<tab>.
+zstyle ':completion:*:cd:*' ignore-parents parent pwd
+
+# Do not perform completion on pastes containing tabs.
+zstyle ':completion:*' insert-tab pending
+
+# Some completion settings
+# zstyle ':completion:*:match:*' match-original only
+zstyle ':completion:*' insert-unambiguous true
+
+# Expand partial paths.
+# zstyle ':completion:*' squeeze-slashes true
+
+# Rehash when failing to find the executable.
+zstyle ':completion:*' rehash true
+
+# Add a recent director listing completion using the cdr command
+autoload -Uz chpwd_recent_dirs cdr add-zsh-hook
+add-zsh-hook chpwd chpwd_recent_dirs
+zstyle ':completion:*:*:cdr:*:*' menu selection
+zstyle ':chpwd:*' recent-dirs-default true
+zstyle ':completion:*' recent-dirs-insert both
+zstyle ':chpwd:*' recent-dirs-prune parent
+
+
+
+
+
+
 # Fuzzy match mistyped completions.
 zstyle ':completion:*' completer _complete _match _approximate
 zstyle ':completion:*:match:*' original only
@@ -116,7 +154,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
 zstyle ':completion:*:rm:*' file-patterns '*:all-files'
 
 # Kill
-zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
+zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,comm -w'
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' force-list always

modules/editor/README.md

@@ -49,7 +49,8 @@ To indicate when the editor is completing, add the following to your
     zstyle ':prezto:module:editor:info:completing' format '...'
 
 Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
-*overwrite*, to `$PROMPT` or `$RPROMPT`.
+*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
+`prompt_name_preexec` hook function.
 
 Authors
 -------

modules/editor/init.zsh

@@ -57,22 +57,11 @@ key_info=(
   'BackTab'   "$terminfo[kcbt]"
 )
 
-# Escape sequences from Debian's inputrc.
-key_info+=(
-  'ControlLeft' '\e[1;5D \e[5D \e\e[D \eOd'
-  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
-)
-
-# if [[ "$TERM" == rxvt* ]]; then
-#   key_info[ControlLeft]+=' \eOd'
-#   key_info[ControlRight]+=' \eOc'
-# fi
-
 # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
 # bindkey failure.
 for key in "${(k)key_info[@]}"; do
   if [[ -z "$key_info[$key]" ]]; then
-    key_info[$key]='<27>'
+    key_info["$key"]='<27>'
   fi
 done
 
@@ -118,39 +107,30 @@ function editor-info {
 }
 zle -N editor-info
 
-# Updates editor information when the keymap changes.
-function zle-keymap-select {
+# Ensures that $terminfo values are valid and updates editor information when
+# the keymap changes.
+function zle-keymap-select zle-line-init zle-line-finish {
+  # The terminal must be in application mode when ZLE is active for $terminfo
+  # values to be valid.
+  if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
+    case "$0" in
+      (zle-line-init)
+        # 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
-
-# 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] )); then
-    # Enable terminal application mode.
-    echoti smkx
-  fi
-
-  # Update editor information.
-  zle editor-info
-}
-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
+zle -N zle-line-init
 
 # Toggles emacs overwrite mode and updates editor information.
 function overwrite-mode {
@@ -217,10 +197,10 @@ bindkey -d
 # Emacs Key Bindings
 #
 
-for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
-  bindkey -M emacs "$key" emacs-backward-word
-for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
-  bindkey -M emacs "$key" emacs-forward-word
+for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word
+for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word
+bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word
+bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word
 
 # Kill to the beginning of the line.
 for key in "$key_info[Escape]"{K,k}

modules/git/functions/git-info

@@ -348,13 +348,13 @@ function git-info {
     # Format added.
     if (( added > 0 )); then
       zstyle -s ':prezto:module:git:info:added' format 'added_format'
-      zformat -f added_formatted "$added_format" "a:$added"
+      zformat -f added_formatted "$added_format" "a:$added_format"
     fi
 
     # Format deleted.
     if (( deleted > 0 )); then
       zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
-      zformat -f deleted_formatted "$deleted_format" "d:$deleted"
+      zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
     fi
 
     # Format modified.

modules/gpg/init.zsh

@@ -12,17 +12,14 @@ fi
 
 # Set the default paths to gpg-agent files.
 _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
-_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
+_gpg_agent_env="$TMPDIR/gpg-agent.env"
 
 # Start gpg-agent if not started.
-if [[ -z "$GPG_AGENT_INFO" ]]; then
+if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
+  eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
+else
   # Export environment variables.
   source "$_gpg_agent_env" 2> /dev/null
-
-  # Start gpg-agent if not started.
-  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
-    eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
-  fi
 fi
 
 # Inform gpg-agent of the current TTY for user prompts.

modules/node/functions/node-doc

@@ -5,11 +5,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-if [[ -z "$BROWSER" ]]; then
-  print "$0: no web browser defined" >&2
-  return 1
-fi
-
 # TODO: Make the sections easier to use.
-"$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
+open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
 

modules/node/functions/node-info

@@ -17,7 +17,7 @@ if (( $+functions[nvm_version] )); then
   version="${$(nvm_version)#v}"
 fi
 
-if [[ "$version" == (none|) ]]; then
+if [[ -n "$version" ]]; then
   zstyle -s ':prezto:module:node:info:version' format 'version_format'
   zformat -f version_formatted "$version_format" "v:$version"
   node_info[version]="$version_formatted"

modules/ocaml/README.md

@@ -1,15 +1,15 @@
-OCaml
+Ocaml
 =====
 
-Initializes [OCaml][1] package management.
+Initializes [Ocaml][1] package management.
 
 OPAM
 ----
 
-[OPAM][2] is a package manager for OCaml.
+[OPAM][2] is a package manager for Ocaml.
 
 This module enables local package installation with OPAM by extending the
-relevant path and OCaml variables.
+relevant path and Ocaml variables.
 
 ### Usage
 

modules/ocaml/init.zsh

@@ -1,5 +1,5 @@
 #
-# Initializes OCaml package management.
+# Initializes Ocaml package management.
 #
 # Authors:
 #   Sebastian Wiesner <lunaryorn@gmail.com>

modules/osx/README.md

@@ -9,20 +9,17 @@ Aliases
   - `cdf` changes the current working director to the current _Finder_
     directory.
   - `pushdf` pushes the current working directory onto the directory queue and
-    changes the current working director to the current _Finder_ directory.
+  - `ql` quick looks at files.
+  - `rm-osx-cruft` deletes .DS\_Store, \_\_MACOSX cruft.
 
 Functions
 ---------
 
-  - `mand` opens _man_ pages in [_Dash.app_][2].
+  - `manb` opens _man_ pages in [_Bwana.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
 -------
@@ -32,6 +29,7 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 [1]: http://www.apple.com/macosx/
-[2]: http://kapeli.com/dash
+[2]: http://bruji.com/bwana/
 [3]: http://www.iterm2.com/
 [4]: https://github.com/sorin-ionescu/prezto/issues
+

modules/osx/functions/_manb_manp

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

modules/osx/functions/manb

@@ -0,0 +1,24 @@
+#
+# 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

@@ -1,21 +0,0 @@
-#
-# 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

@@ -1,13 +0,0 @@
-#
-# 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

@@ -1,11 +0,0 @@
-#
-# 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

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

modules/osx/functions/pfs

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

modules/osx/functions/ql

@@ -1,10 +0,0 @@
-#
-# 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,8 +14,26 @@ fi
 # Aliases
 #
 
-# Changes directory to the current Finder directory.
+# Change directory to the current Finder directory.
 alias cdf='cd "$(pfd)"'
 
-# Pushes directory to the current Finder directory.
+# Push 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:-/tmp}/pacman-disowned-$UID-$$"
+local tmp="$TMPDIR/pacman-disowned-$UID-$$"
 local db="$tmp/db"
 local fs="$tmp/fs"
 

modules/pacman/init.zsh

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

modules/pacman/yaourt.zsh

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

modules/prompt/functions/prompt_sorin_setup

@@ -18,7 +18,7 @@ function prompt_sorin_pwd {
     _prompt_sorin_pwd="$MATCH"
     unset MATCH
   else
-    _prompt_sorin_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
+    _prompt_sorin_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}"
   fi
 }
 

modules/python/init.zsh

@@ -16,12 +16,9 @@ elif (( $+commands[pyenv] )); then
   eval "$(pyenv init -)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
-# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
-# path can be overridden using PYTHONUSERBASE.
+# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
 else
-  if [[ -n "$PYTHONUSERBASE" ]]; then
-    path=($PYTHONUSERBASE/bin $path)
-  elif [[ "$OSTYPE" == darwin* ]]; then
+  if [[ "$OSTYPE" == darwin* ]]; then
     path=($HOME/Library/Python/*/bin(N) $path)
   else
     # This is subject to change.

modules/ruby/README.md

@@ -8,7 +8,7 @@ Local Gem Installation
 ----------------------
 
 When a Ruby version manager is not detected, local gems are installed in
-*~/.gems*; otherwise, they are installed according to the manager.
+*~/Library/Ruby/Gems/1.8* on Mac OS X.
 
 RVM
 ---
@@ -20,33 +20,15 @@ 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, isolated Ruby installations in the home directory.
+An alternative RVM is to use [rbenv][3], which allows for switching between 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
 -------
 
@@ -105,4 +87,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,8 +18,6 @@ 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,13 +23,6 @@ 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)
@@ -50,14 +43,14 @@ alias rb='ruby'
 # Bundler
 if (( $+commands[bundle] )); then
   alias rbb='bundle'
-  alias rbbe='bundle exec'
-  alias rbbi='bundle install --path vendor/bundle'
-  alias rbbl='bundle list'
-  alias rbbo='bundle open'
-  alias rbbp='bundle package'
-  alias rbbu='bundle update'
+  alias rbbe='rbb exec'
+  alias rbbi='rbb install'
+  alias rbbl='rbb list'
+  alias rbbo='rbb open'
+  alias rbbp='rbb package'
+  alias rbbu='rbb update'
   alias rbbI='rbbi \
-    && bundle package \
+    && rbb 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" && -z "$EMACS" && -z "$VIM" ]] && ( \
+if [[ -z "$STY" ]] && ( \
   ( [[ -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/README.md

@@ -3,7 +3,7 @@ Spectrum
 
 Provides for easier use of 256 colors and effects.
 
-To learn more about text formatting, read [A Guide to 256 Color Codes][1].
+To learn more about text formatting, read [That 256 Color Thing][1].
 
 Variables
 ---------
@@ -87,6 +87,6 @@ Authors
   - [P.C. Shyamshankar](https://github.com/sykora)
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: http://lucentbeing.com/writing/archives/a-guide-to-256-color-codes/
+[1]: http://lucentbeing.com/blog/that-256-color-thing/
 [2]: https://github.com/sorin-ionescu/prezto/issues
 

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:-/tmp}/ssh-agent.env}"
+_ssh_agent_env="${_ssh_agent_env:-$TMPDIR/ssh-agent.env}"
 
 # Set the path to the persistent authentication socket.
-_ssh_agent_sock="${TMPDIR:-/tmp}/ssh-agent.sock"
+_ssh_agent_sock="$TMPDIR/ssh-agent.sock"
 
 # Start ssh-agent if not started.
 if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
@@ -25,7 +25,7 @@ if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
   source "$_ssh_agent_env" 2> /dev/null
 
   # Start ssh-agent if not started.
-  if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
+  if ! ps -U "$USER" -o pid,ucomm | grep -q "${SSH_AGENT_PID} ssh-agent"; then
     eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
   fi
 fi

modules/syntax-highlighting/README.md

@@ -27,7 +27,7 @@ To enable highlighting for this module only, add the following line to
 ### Highlighters
 
 Syntax highlighting is accomplished by pluggable [highlighters][2]. This module
-only enables the *main* highlighter by default.
+enables the *main*, *brackets*, and *cursor* highlighters by default.
 
 To enable all highlighters, add the following to *zpreztorc*:
 

modules/terminal/init.zsh

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

modules/tmux/README.md

@@ -20,15 +20,12 @@ following line to *zpreztorc*:
 
     zstyle ':prezto:module:tmux:auto-start' remote 'yes'
 
-In both cases, it will create a background session named _prezto_ if the tmux
-server is not started.
+In both cases, it will create a background session named _#Prezto_ and attach
+every new shell to it.
 
-With `auto-start` enabled, you may want to control how multiple sessions are
-managed. The `destroy-unattached` option of tmux controls if the unattached
-sessions must be kept alive, making sessions available for later use, configured
-in *tmux.conf*:
-
-    set-option -g destroy-unattached [on | off]
+To avoid keeping open sessions, this module sets `destroy-unattached off` on
+the background session and `destroy-unattached on` on every other session
+(global setting).
 
 Aliases
 -------
@@ -44,7 +41,7 @@ connected** to be displayed, which can be fixed by installing
 [reattach-to-user-namespace][3], available in [Homebrew][4], and adding the
 following to *tmux.conf*:
 
-    set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
+   set-option -g default-command "reattach-to-user-namespace -l $SHELL -l"
 
 Furthermore, tmux is known to cause **kernel panics** on Mac OS X. A discussion
 about this and Prezto has already been [opened][2].
@@ -57,7 +54,6 @@ Authors
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
   - [Colin Hebert](https://github.com/ColinHebert)
   - [Georges Discry](https://github.com/gdiscry)
-  - [Xavier Cambar](https://github.com/xcambar)
 
 [1]: http://tmux.sourceforge.net
 [2]: https://github.com/sorin-ionescu/prezto/issues/62

modules/tmux/init.zsh

@@ -5,7 +5,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #   Colin Hebert <hebert.colin@gmail.com>
 #   Georges Discry <georges@discry.be>
-#   Xavier Cambar <xcambar@gmail.com>
 #
 
 # Return if requirements are not found.
@@ -17,22 +16,31 @@ fi
 # Auto Start
 #
 
-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
+if [[ -z "$TMUX" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
-  tmux start-server
+  tmux_session='#Prezto'
 
-  # Create a 'prezto' session if no session has been defined in tmux.conf.
-  if ! tmux has-session 2> /dev/null; then
-    tmux_session='prezto'
-    tmux \
-      new-session -d -s "$tmux_session" \; \
-      set-option -t "$tmux_session" destroy-unattached off &> /dev/null
+  if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
+    # Ensure that tmux server is started.
+    tmux start-server
+
+    # Disable the destruction of unattached sessions globally.
+    tmux set-option -g destroy-unattached off &> /dev/null
+
+    # Create a new session.
+    tmux new-session -d -s "$tmux_session"
+
+    # Disable the destruction of the new, unattached session.
+    tmux set-option -t "$tmux_session" destroy-unattached off &> /dev/null
+
+    # Enable the destruction of unattached sessions globally to prevent
+    # an abundance of open, detached sessions.
+    tmux set-option -g destroy-unattached on &> /dev/null
   fi
 
-  # Attach to the 'prezto' session or to the last session used.
-  exec tmux attach-session
+  exec tmux new-session -t "$tmux_session"
 fi
 
 #

modules/utility/README.md

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

modules/utility/init.zsh

@@ -34,7 +34,6 @@ 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'
@@ -66,9 +65,9 @@ if is-callable 'dircolors'; then
 
   if zstyle -t ':prezto:module:utility:ls' color; then
     if [[ -s "$HOME/.dir_colors" ]]; then
-      eval "$(dircolors --sh "$HOME/.dir_colors")"
+      eval "$(dircolors "$HOME/.dir_colors")"
     else
-      eval "$(dircolors --sh)"
+      eval "$(dircolors)"
     fi
 
     alias ls="$aliases[ls] --color=auto"
@@ -105,10 +104,6 @@ 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,13 +87,6 @@ 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
 #
@@ -152,3 +145,4 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 
 # Auto start a session when Zsh is launched in a SSH connection.
 # zstyle ':prezto:module:tmux:auto-start' remote 'yes'
+

runcoms/zshenv

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