Use my own fork for prezto (zsh configuration framework)

.gitmodules

@@ -1,3 +1,3 @@
 [submodule ".zsh/bundles/prezto"]
 	path = .zsh/bundles/prezto
-	url = https://github.com/sorin-ionescu/prezto.git
+	url = https://github.com/k0lter/prezto.git

.zsh/bundles/prezto

@@ -1 +1 @@
-Subproject commit a2da58f336ac56c3d569a065a4219a159ea3d552
+Subproject commit 0dfebebe99babe4860e36705de1c871d31dc60e2

.zsh/overrides/.zprezto

@@ -1 +0,0 @@
-prezto

.zsh/overrides/.zpreztorc

@@ -1 +0,0 @@
-preztorc

.zsh/overrides/prezto/init.zsh

@@ -1,15 +0,0 @@
-#
-# Initializes Prezto overrides
-#
-
-# Source local Prezto configuration
-ZPRESTORC_LOCAL="$(dirname "$(readlink -f "${0}")")/../preztorc"
-if [[ -s "${ZPRESTORC_LOCAL}" ]]; then
-    source "${ZPRESTORC_LOCAL}"
-fi
-unset ZPRESTORC_LOCAL
-
-# Load Prezto modules overrides
-zstyle -a ':prezto:load' pmodule 'pmodules'
-pmodload "$pmodules[@]"
-unset pmodules

.zsh/overrides/prezto/modules/myprompt/functions/prompt_kolter_setup

@@ -1,182 +0,0 @@
-#
-# A theme based on Steve Losh's Extravagant Prompt with vcs_info integration.
-#
-# Authors:
-#   Steve Losh <steve@stevelosh.com>
-#   Bart Trojanowski <bart@jukie.net>
-#   Brian Carper <brian@carper.ca>
-#   kolter <kolter@gmail.com>
-#   Sorin Ionescu <sorin.ionescu@gmail.com>
-#
-# Screenshots:
-#   http://i.imgur.com/HyRvv.png
-#
-
-function prompt_kolter_precmd {
-    git-info
-}
-
-function prompt_kolter_preexec {
-  if [[ -n "${TMUX}" ]] && (( $+commands[tmux] )); then
-    source <(tmux show-environment | sed -r -e '/^-/d' -e 's/^([^=]+)=(.*)$/\1="\2"/')
-  fi
-}
-
-function prompt_kolter_setup {
-  setopt LOCAL_OPTIONS
-  unsetopt XTRACE KSH_ARRAYS
-  prompt_opts=(cr percent subst)
-
-  # Load required functions.
-  autoload -Uz add-zsh-hook
-
-  # Add hook for calling vcs_info before each command.
-  add-zsh-hook precmd prompt_kolter_precmd
-  add-zsh-hook precmd prompt_kolter_preexec
-
-  # Use extended color pallete if available.
-  if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
-    _color_red="%F{196}"
-    _color_green="%F{49}"
-    _color_yellow="%F{226}"
-    _color_blue="%F{21}"
-    _color_magenta="%F{97}"
-    _color_cyan="%F{26}"
-    _color_white="%F{253}"
-    _color_brightred="%F{197}"
-    _color_brightgreen="%F{148}"
-    _color_brightyellow="%F{228}"
-    _color_brightblue="%F{39}"
-    _color_brightmagenta="%F{139}"
-    _color_brightcyan="%F{38}"
-    _color_brightwhite="%F{231}"
-    _color_reset="%f"
-  else
-    _color_red="%F{red}"
-    _color_green="%F{green}"
-    _color_yellow="%F{yellow}"
-    _color_blue="%F{blue}"
-    _color_magenta="%F{magenta}"
-    _color_cyan="%F{cyan}"
-    _color_white="%F{white}"
-    _color_brightred="%B%F{red}"
-    _color_brightgreen="%B%F{green}"
-    _color_brightyellow="%B%F{yellow}"
-    _color_brightblue="%B%F{blue}"
-    _color_brightmagenta="%B%F{magenta}"
-    _color_brightcyan="%B%F{cyan}"
-    _color_brightwhite="%B%F{white}"
-    _color_reset="%f"
-  fi
-
-  # In normal formats and actionformats the following replacements are done:
-  # %s - The VCS in use (git, hg, svn, etc.).
-  # %b - Information about the current branch.
-  # %a - An identifier that describes the action. Only makes sense in actionformats.
-  # %i - The current revision number or identifier. For hg the hgrevformat style may be used to customize the output.
-  # %c - The string from the stagedstr style if there are staged changes in the repository.
-  # %u - The string from the unstagedstr style if there are unstaged changes in the repository.
-  # %R - The base directory of the repository.
-  # %r - The repository name. If %R is /foo/bar/repoXY, %r is repoXY.
-  # %S - A subdirectory within a repository. If $PWD is /foo/bar/repoXY/beer/tasty, %S is beer/tasty.
-  #
-  # In branchformat these replacements are done:
-  # %s - The VCS in use (git, hg, svn, etc.).
-  # %b - Information about the current branch.
-  # %a - An identifier that describes the action. Only makes sense in actionformats.
-  # %i - The current revision number or identifier. For hg the hgrevformat style may be used to customize the output.
-  # %c - The string from the stagedstr style if there are staged changes in the repository.
-  # %u - The string from the unstagedstr style if there are unstaged changes in the repository.
-  # %R - The base directory of the repository.
-  # %r - The repository name. If %R is /foo/bar/repoXY, %r is repoXY.
-  # %S - A subdirectory within a repository. If $PWD is /foo/bar/repoXY/beer/tasty, %S is beer/tasty.
-
-  local branch_format="${_color_brightyellow}%b${_color_reset} %u%c"
-  local action_format="(${_color_green}%a${_color_reset})"
-  local unstaged_format="${_color_brightred}●${_color_reset}"
-  local staged_format="${_color_brightgreen}●${_color_reset}"
-
-  # Set vcs_info parameters.
-  zstyle ':vcs_info:*' enable svn git
-  # If enabled, this style causes the %c and %u format escapes to show when the
-  # working directory has uncommitted changes
-  zstyle ':vcs_info:*:prompt:*' check-for-changes true
-  # This string will be used in the %u escape if there are unstaged changes in
-  # the repository
-  zstyle ':vcs_info:*:prompt:*' unstagedstr "${unstaged_format}"
-  # This string will be used in the %c escape if there are staged changes in
-  # the repository
-  zstyle ':vcs_info:*:prompt:*' stagedstr "${staged_format}"
-  # A list of formats, used if there is a special action going on in your
-  # current repository; like an interactive rebase or a merge conflict.
-  zstyle ':vcs_info:*:prompt:*' actionformats "${branch_format}${action_format}"
-  # A list of formats, used when actionformats is not used (which is most of
-  # the time).
-  zstyle ':vcs_info:*:prompt:*' formats " ${_color_brightwhite}on ${_color_brightcyan}%s${_color_brightwhite}:${branch_format}"
-  # These "formats" are exported when we didn’t detect a version control system
-  # for the current directory or vcs_info was disabled
-  zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
-
-  zstyle ':prezto:module:git:info' verbose 'yes'
-  zstyle ':prezto:module:git:info:action' format "${_color_red}! %s"
-  zstyle ':prezto:module:git:info:added' format "${_color_brightgreen}✚"
-  zstyle ':prezto:module:git:info:ahead' format "${_color_magenta}▲"
-  zstyle ':prezto:module:git:info:behind' format "${_color_brightmagenta}▼"
-  zstyle ':prezto:module:git:info:branch' format "${_color_brightyellow}%b"
-  zstyle ':prezto:module:git:info:deleted' format "${_color_brightred}✖"
-  zstyle ':prezto:module:git:info:modified' format "${_color_brightred}✱"
-  zstyle ':prezto:module:git:info:position' format "${_color_brightwhite}%p"
-  zstyle ':prezto:module:git:info:renamed' format "${_color_red}►"
-  zstyle ':prezto:module:git:info:stashed' format "${_color_magenta}s"
-  zstyle ':prezto:module:git:info:unmerged' format "${_color_red}═"
-  zstyle ':prezto:module:git:info:untracked' format "${_color_brightblack}?"
-  # More info on formats at https://github.com/sorin-ionescu/prezto/tree/master/modules/git
-  zstyle ':prezto:module:git:info:keys' format 'prompt' " ${_color_brightwhite}on ${_color_brightblue}git${_color_brightwhite}:%b %p%A%B%S%a%d%m%r%U%u"
-
-  #zstyle ':prezto:module:sys:info:lsb_id' format 'id:-%i-'
-  #zstyle ':prezto:module:sys:info:lsb_description' format 'desc:-%d-'
-  #zstyle ':prezto:module:sys:info:lsb_release' format 'rel:-%r-'
-  #zstyle ':prezto:module:sys:info:lsb_codename' format 'code:-%c-'
-  #zstyle ':prezto:module:sys:info:uname_all' format 'A:-%A-'
-  #zstyle ':prezto:module:sys:info:uname_hw' format 'H:-%H-'
-  #zstyle ':prezto:module:sys:info:uname_kernel_name' format 'K:-%K-'
-  #zstyle ':prezto:module:sys:info:uname_kernel_release' format 'R:-%R-'
-  #zstyle ':prezto:module:sys:info:uname_kernel_version' format 'V:-%V-'
-  #zstyle ':prezto:module:sys:info:uname_machine' format 'M:-%M-'
-  #zstyle ':prezto:module:sys:info:uname_nodename' format 'N:-%N-'
-  #zstyle ':prezto:module:sys:info:uname_processor' format 'P:-%P-'
-  #zstyle ':prezto:module:sys:info:uname_os' format 'O:-%O-'
-  #zstyle ':prezto:module:sys:info:chroot' format 'CHROOT:-%C-'
-  #zstyle ':prezto:module:sys:info:ssh_tty' format 'T:-%T-'
-  #zstyle ':prezto:module:sys:info:ssh_server_address' format 'X:-%X-'
-  #zstyle ':prezto:module:sys:info:ssh_server_port' format 'Y:-%Y-'
-  #zstyle ':prezto:module:sys:info:ssh_client_address' format 'x:-%x-'
-  #zstyle ':prezto:module:sys:info:ssh_client_port' format 'y:-%y-'
-  #zstyle ':prezto:module:sys:info:keys' format 'prompt' '=%d=%i=%r=%c=%C=%A=%H=%K=%R=%V=%M=%V=%N=%P=%O=%T=%X=%Y=%x=%y'
-
-  zstyle ':prezto:module:sys:info:lsb_id' format "${_color_brightblue}%i"
-  zstyle ':prezto:module:sys:info:lsb_codename' format "${_color_brightblue}%c"
-  zstyle ':prezto:module:sys:info:chroot' format "${_color_brightred}chroot${_color_brightwhite}:"
-  zstyle ':prezto:module:sys:info:ssh_tty' format " ${_color_brightwhite}via ${_color_brightred}ssh"
-  zstyle ':prezto:module:sys:info:keys' format 'prompt' \
-    "%T ${_color_brightwhite}using %C%i${_color_brightwhite}/%c"
-
-  sys-info
-
-  # Define prompts.
-  PROMPT=' \
-%(!.%{$_color_brightred%}%n.%{$_color_brightgreen%}%n)\
-%{$_color_brightwhite%} at \
-%{$_color_brightmagenta%}%m\
-%{$_white%}\
-%{$_color_brightwhite%} in \
-%{$_color_green%}%(!.%d.%~)\
-${git_info[prompt]}\
-${sys_info[prompt]}\
-%1(j.%{$_color_brightwhite%} with %{$_color_green%}%j%{$_color_brightwhite%} jobs.)
-%0(?..%{$_color_red%}%?)\
-%(!.%{$_color_red%}.%{$_color_cyan%})>%{$_color_reset%}'
-  RPROMPT=''
-}
-
-prompt_kolter_setup "$@"

.zsh/overrides/prezto/modules/myprompt/init.zsh

@@ -1,13 +0,0 @@
-
-# Execute prompt init system
-autoload -Uz promptinit && promptinit
-
-# Load the prompt theme.
-zstyle -a ':prezto:module:myprompt' theme 'prompt_argv'
-
-if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
-    prompt 'off'
-else
-    prompt "$prompt_argv[@]"
-fi
-unset prompt_argv

.zsh/overrides/prezto/modules/sys/functions/sys-info

@@ -1,263 +0,0 @@
-#
-# Exposes Linux Standard Base and uname informations via the $lsb_info associative array.
-#
-# Authors:
-#   Emmanuel Bouthenot <kolter@openics.org>
-#
-
-# Gets the SYS informations.
-typeset -gA sys_info
-
-function sys-info {
-  local lsb_id
-  local lsb_id_format
-  local lsb_id_formatted
-  local lsb_description
-  local lsb_description_format
-  local lsb_description_formatted
-  local lsb_release
-  local lsb_release_format
-  local lsb_release_formatted
-  local lsb_codename
-  local lsb_codename_format
-  local lsb_codename_formatted
-  local uname_all
-  local uname_all_format
-  local uname_all_formatted
-  local uname_hw
-  local uname_hw_format
-  local uname_hw_formatted
-  local uname_kernel_name
-  local uname_kernel_name_format
-  local uname_kernel_name_formatted
-  local uname_kernel_release
-  local uname_kernel_release_format
-  local uname_kernel_release_formatted
-  local uname_kernel_version
-  local uname_kernel_version_format
-  local uname_kernel_version_formatted
-  local uname_machine
-  local uname_machine_format
-  local uname_machine_formatted
-  local uname_nodename
-  local uname_nodename_format
-  local uname_nodename_formatted
-  local uname_processor
-  local uname_processor_format
-  local uname_processor_formatted
-  local uname_os
-  local uname_os_format
-  local uname_os_formatted
-  local chroot
-  local chroot_format
-  local chroot_formatted
-  local ssh_tty
-  local ssh_tty_format
-  local ssh_tty_formatted
-  local ssh_server_address
-  local ssh_server_address_format
-  local ssh_server_address_formatted
-  local ssh_server_port
-  local ssh_server_port_format
-  local ssh_server_port_formatted
-  local ssh_client_address
-  local ssh_client_address_format
-  local ssh_client_address_formatted
-  local ssh_client_port
-  local ssh_client_port_format
-  local ssh_client_port_formatted
-
-  local -A info_formats
-  local info_format
-
-  if (( $+commands[lsb_release] )); then
-    # FORMAT LSB_ID
-    zstyle -s ':prezto:module:sys:info:lsb_id' format 'lsb_id_format'
-    if [[ -n "$lsb_id_format" ]]; then
-      lsb_id="$(lsb_release --short --id)"
-      if [[ -n "$lsb_id" ]]; then
-        zformat -f lsb_id_formatted "$lsb_id_format" "i:$lsb_id"
-      fi
-    fi
-    # FORMAT LSB_DESCRIPTION
-    zstyle -s ':prezto:module:sys:info:lsb_description' format 'lsb_description_format'
-    if [[ -n "$lsb_description_format" ]]; then
-      lsb_description="$(lsb_release --short --description)"
-      if [[ -n "$lsb_description" ]]; then
-        zformat -f lsb_description_formatted "$lsb_description_format" "d:$lsb_description"
-      fi
-    fi
-    # FORMAT LSB_RELEASE
-    zstyle -s ':prezto:module:sys:info:lsb_release' format 'lsb_release_format'
-    if [[ -n "$lsb_release_format" ]]; then
-      lsb_release="$(lsb_release --short --release)"
-      if [[ -n "$lsb_release" ]]; then
-        zformat -f lsb_release_formatted "$lsb_release_format" "r:$lsb_release"
-      fi
-    fi
-    # FORMAT LSB_CODENAME
-    zstyle -s ':prezto:module:sys:info:lsb_codename' format 'lsb_codename_format'
-    if [[ -n "$lsb_codename_format" ]]; then
-      lsb_codename="$(lsb_release --short --codename)"
-      if [[ -n "$lsb_codename" ]]; then
-        zformat -f lsb_codename_formatted "$lsb_codename_format" "c:$lsb_codename"
-      fi
-    fi
-  fi
-
-  if (( $+commands[uname] )); then
-    # UNAME ALL
-    zstyle -s ':prezto:module:sys:info:uname_all' format 'uname_all_format'
-    if [[ -n "$uname_all_format" ]]; then
-      uname_all="$(uname -a)"
-      if [[ -n "$uname_all" ]]; then
-        zformat -f uname_all_formatted "$uname_all_format" "A:$uname_all"
-      fi
-    fi
-    # UNAME HW
-    zstyle -s ':prezto:module:sys:info:uname_hw' format 'uname_hw_format'
-    if [[ -n "$uname_hw_format" ]]; then
-      uname_hw="$(uname -i)"
-      if [[ -n "$uname_hw" ]]; then
-        zformat -f uname_hw_formatted "$uname_hw_format" "H:$uname_hw"
-      fi
-    fi
-    # UNAME KERNEL_NAME
-    zstyle -s ':prezto:module:sys:info:uname_kernel_name' format 'uname_kernel_name_format'
-    if [[ -n "$uname_kernel_name_format" ]]; then
-      uname_kernel_name="$(uname -s)"
-      if [[ -n "$uname_kernel_name" ]]; then
-        zformat -f uname_kernel_name_formatted "$uname_kernel_name_format" "K:$uname_kernel_name"
-      fi
-    fi
-    # UNAME KERNEL_RELEASE
-    zstyle -s ':prezto:module:sys:info:uname_kernel_release' format 'uname_kernel_release_format'
-    if [[ -n "$uname_kernel_release_format" ]]; then
-      uname_kernel_release="$(uname -r)"
-      if [[ -n "$uname_kernel_release" ]]; then
-        zformat -f uname_kernel_release_formatted "$uname_kernel_release_format" "R:$uname_kernel_release"
-      fi
-    fi
-    # UNAME KERNEL_VERSION
-    zstyle -s ':prezto:module:sys:info:uname_kernel_version' format 'uname_kernel_version_format'
-    if [[ -n "$uname_kernel_version_format" ]]; then
-      uname_kernel_version="$(uname -v)"
-      if [[ -n "$uname_kernel_version" ]]; then
-        zformat -f uname_kernel_version_formatted "$uname_kernel_version_format" "V:$uname_kernel_version"
-      fi
-    fi
-    # UNAME MACHINE
-    zstyle -s ':prezto:module:sys:info:uname_machine' format 'uname_machine_format'
-    if [[ -n "$uname_machine_format" ]]; then
-      uname_machine="$(uname -m)"
-      if [[ -n "$uname_machine" ]]; then
-        zformat -f uname_machine_formatted "$uname_machine_format" "M:$uname_machine"
-      fi
-    fi
-    # UNAME NODENAME
-    zstyle -s ':prezto:module:sys:info:uname_nodename' format 'uname_nodename_format'
-    if [[ -n "$uname_nodename_format" ]]; then
-      uname_nodename="$(uname -n)"
-      if [[ -n "$uname_nodename" ]]; then
-        zformat -f uname_nodename_formatted "$uname_nodename_format" "N:$uname_nodename"
-      fi
-    fi
-    # UNAME PROCESSOR
-    zstyle -s ':prezto:module:sys:info:uname_processor' format 'uname_processor_format'
-    if [[ -n "$uname_processor_format" ]]; then
-      uname_processor="$(uname -p)"
-      if [[ -n "$uname_processor" ]]; then
-        zformat -f uname_processor_formatted "$uname_processor_format" "P:$uname_processor"
-      fi
-    fi
-    # UNAME OS
-    zstyle -s ':prezto:module:sys:info:uname_os' format 'uname_os_format'
-    if [[ -n "$uname_os_format" ]]; then
-      # -o option is not supported on all OS (at least Linux and FreeBSD)
-      uname_os="$(uname -o 2>/dev/null)"
-      if [[ -n "$uname_os" ]]; then
-        zformat -f uname_os_formatted "$uname_os_format" "O:$uname_os"
-      fi
-    fi
-  fi
-  # CHROOT
-  zstyle -s ':prezto:module:sys:info:chroot' format 'chroot_format'
-  if [[ -n "$chroot_format" ]]; then
-    if [[ -f /etc/debian_chroot ]]; then
-      chroot="Debian"
-    fi
-    if [[ -n "$chroot" ]]; then
-      zformat -f chroot_formatted "$chroot_format" "C:$chroot"
-    fi
-  fi
-  # SSH CONNECTION
-  if [[ -n "${SSH_CONNECTION}" ]]; then
-    zstyle -s ':prezto:module:sys:info:ssh_tty' format 'ssh_tty_format'
-    if [[ -n "$ssh_tty_format" ]]; then
-      if [[ -n "${SSH_TTY}" ]]; then
-        ssh_tty="${SSH_TTY}"
-      fi
-      if [[ -n "$ssh_tty" ]]; then
-        zformat -f ssh_tty_formatted "$ssh_tty_format" "T:$ssh_tty"
-      fi
-    fi
-    echo ${SSH_CONNECTION} | read ssh_client_address ssh_client_port ssh_server_address ssh_server_port
-    zstyle -s ':prezto:module:sys:info:ssh_server_address' format 'ssh_server_address_format'
-    if [[ -n "$ssh_server_address_format" ]]; then
-      if [[ -n "$ssh_server_address" ]]; then
-        zformat -f ssh_server_address_formatted "$ssh_server_address_format" "X:$ssh_server_address"
-      fi
-    fi
-    zstyle -s ':prezto:module:sys:info:ssh_server_port' format 'ssh_server_port_format'
-    if [[ -n "$ssh_server_port_format" ]]; then
-      if [[ -n "$ssh_server_port" ]]; then
-        zformat -f ssh_server_port_formatted "$ssh_server_port_format" "Y:$ssh_server_port"
-      fi
-    fi
-    zstyle -s ':prezto:module:sys:info:ssh_client_address' format 'ssh_client_address_format'
-    if [[ -n "$ssh_client_address_format" ]]; then
-      if [[ -n "$ssh_client_address" ]]; then
-        zformat -f ssh_client_address_formatted "$ssh_client_address_format" "x:$ssh_client_address"
-      fi
-    fi
-    zstyle -s ':prezto:module:sys:info:ssh_client_port' format 'ssh_client_port_format'
-    if [[ -n "$ssh_client_port_format" ]]; then
-      if [[ -n "$ssh_client_port" ]]; then
-        zformat -f ssh_client_port_formatted "$ssh_client_port_format" "y:$ssh_client_port"
-      fi
-    fi
-  fi
-
-  # Format info.
-  zstyle -a ':prezto:module:sys:info:keys' format 'info_formats'
-  for info_format in ${(k)info_formats}; do
-    zformat -f REPLY "$info_formats[$info_format]" \
-      "i:$lsb_id_formatted" \
-      "d:$lsb_description_formatted" \
-      "r:$lsb_release_formatted" \
-      "c:$lsb_codename_formatted" \
-      "c:$lsb_codename_formatted" \
-      "A:$uname_all_formatted" \
-      "H:$uname_hw_formatted" \
-      "K:$uname_kernel_name_formatted" \
-      "R:$uname_kernel_release_formatted" \
-      "V:$uname_kernel_version_formatted" \
-      "M:$uname_machine_formatted" \
-      "N:$uname_nodename_formatted" \
-      "P:$uname_processor_formatted" \
-      "O:$uname_os_formatted" \
-      "C:$chroot_formatted" \
-      "T:$ssh_tty_formatted" \
-      "X:$ssh_server_address_formatted" \
-      "Y:$ssh_server_port_formatted" \
-      "x:$ssh_client_address_formatted" \
-      "y:$ssh_client_port_formatted"
-    sys_info[$info_format]="$REPLY"
-  done
-
-  unset REPLY
-
-  return 0
-}
-
-sys-info "$@"

.zsh/overrides/prezto/modules/sys/init.zsh

@@ -1,11 +0,0 @@
-#
-# Provides System informations based on lsb_release and uname
-#
-# Authors:
-#   Emmanuel Bouthenot <kolter@openics.org>
-#
-
-# Return if requirements are not found.
-if (( ! $+commands[lsb_release] )) || (( ! $+commands[uname] )) ; then
-  return 1
-fi

.zsh/overrides/preztorc

@@ -1,11 +0,0 @@
-#
-# Prezto Overrides
-#
-
-zstyle ':prezto:load' pmodule \
-  'myprompt' \
-  'sys'
-
-zstyle ':prezto:module:myprompt' theme 'kolter'
-
-# vim: ft=zsh