I need to eat more fish

Minimize

zsh.d/10-environment.zsh

@@ -2,7 +2,7 @@
 # Variables
 
 ## Vars used always
-MIBS=all
+# MIBS=all
 LOGD=/var/log
 
 ## If we are not interactive quit
@@ -25,7 +25,36 @@ VISUAL=vim
 
 export QUOTING_STYLE=escape
 
+#######################################################################################
+# Setup LESS
+
+## make less colourful
+LESS_TERMCAP_mb=$'\E[01;34m'     # begin blinking
+LESS_TERMCAP_md=$'\E[01;36m'     # begin bold
+LESS_TERMCAP_me=$'\E[0m'         # end mode
+LESS_TERMCAP_so=$'\E[01;47;34m'  # begin standout-mode - info box
+LESS_TERMCAP_se=$'\E[0m'         # end standout-mode
+LESS_TERMCAP_us=$'\E[04;32m'     # begin underline
+LESS_TERMCAP_ue=$'\E[0m'         # end underline
+
+LESS="-c -x4 -R -MM -PMFile\:?f%f:STDIN. ?BSize\:?B%B:Unk.?B\:?pb%pb\%:Unk.?B\:%i/%m"
+LESSCHARSET=utf-8
+READNULLCMD=/usr/bin/less
+PAGER=/usr/bin/less
+
+export LESS
+export PAGER
+
+local LESSOPEN_SCRIPT=$(whence lesspipe lesspipe.sh)
+if [ $LESSOPEN_SCRIPT ]; then
+    LESSOPEN="|${LESSOPEN_SCRIPT} %s"
+    LESS_ADVANCED_PREPROCESSOR=1
+
+    export LESSOPEN
+    export LESS_ADVANCED_PREPROCESSOR
+fi
+
 # Set umask to collaborative mode
 umask 002
 
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
+#  vim: set ts=4 sw=4 tw=0 ft=zsh :

zsh.d/20-complete.zsh

@@ -10,6 +10,7 @@ done
 compinit -C
 
 autoload bashcompinit && bashcompinit
+# autoload bashcompinit
 
 # allow approximate
 zstyle ':completion:*' completer _complete _match _approximate

zsh.d/30-aliases.zsh

@@ -2,7 +2,7 @@
 # Aliases
 
 # alias ls='ls -F --color'
-alias dir='ls -l'
+# alias dir='ls -l'
 alias la='ls -A'
 alias ll='ls -l'
 alias lla='ls -Al'
@@ -13,11 +13,11 @@ alias cls='clear'
 alias dc=cd
 alias les=less
 alias fu='sudo $(fc -ln -1)'
-alias sudo='sudo '
+# alias sudo='sudo '
 
 alias mkdir='mkdir -p'
 alias zap='rm -rf'
-alias ftail='tail -f'
+# alias ftail='tail -f'
 alias grep='grep --colour'
 
 alias ns='host -t ns'
@@ -25,14 +25,17 @@ alias mx='host -t mx'
 alias soa='host -t soa'
 alias ptr='host -t ptr'
 
-alias vi="vim "
+# alias vi="vim "
 
-alias du1="du -h --max-depth=1"
-alias psg="ps ax|grep "
+# alias du1="du -h --max-depth=1"
+# alias psg="ps ax|grep "
 alias myip="dig +short ANY @resolver1.opendns.com myip.opendns.com"
 
 alias delkey="ssh-keygen -R "
 
+alias k=kubectl
+alias kk='kubectl konfig merge ~/.kube/configs/* > ~/.kube/config'
+
 # Global Aliases
 #
 alias -g G="|grep "
@@ -42,4 +45,4 @@ alias -g NO="> /dev/null"
 alias -g NE="2> /dev/null"
 alias -g NA="> /dev/null 2>&1"
 
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
+#  vim: set ts=4 sw=4 tw=0 ft=zsh :

zsh.d/30-less.zsh

@@ -1,30 +0,0 @@
-#######################################################################################
-# Setup LESS
-
-## make less colourful
-LESS_TERMCAP_mb=$'\E[01;34m'     # begin blinking
-LESS_TERMCAP_md=$'\E[01;36m'     # begin bold
-LESS_TERMCAP_me=$'\E[0m'         # end mode
-LESS_TERMCAP_so=$'\E[01;47;34m'  # begin standout-mode - info box
-LESS_TERMCAP_se=$'\E[0m'         # end standout-mode
-LESS_TERMCAP_us=$'\E[04;32m'     # begin underline
-LESS_TERMCAP_ue=$'\E[0m'         # end underline
-
-LESS="-c -x4 -R -MM -PMFile\:?f%f:STDIN. ?BSize\:?B%B:Unk.?B\:?pb%pb\%:Unk.?B\:%i/%m"
-LESSCHARSET=utf-8
-READNULLCMD=/usr/bin/less
-PAGER=/usr/bin/less
-
-export LESS
-export PAGER
-
-local LESSOPEN_SCRIPT=$(whence lesspipe lesspipe.sh)
-if [ $LESSOPEN_SCRIPT ]; then
-    LESSOPEN="|${LESSOPEN_SCRIPT} %s"
-    LESS_ADVANCED_PREPROCESSOR=1
-
-    export LESSOPEN
-    export LESS_ADVANCED_PREPROCESSOR
-fi
-
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 

zsh.d/50-functions.zsh

@@ -18,3 +18,24 @@ autoload -Uz add-zsh-hook
 
 # Add async support
 autoload -Uz async && async
+
+# Async Git update
+autoload -Uz vcs_info
+
+_vbe_vcs_info_done() {
+  local stdout=$3
+  vcs_info_msg_0_=$stdout
+	# echo $(date +"%Y-%m-%d %H:%M:%S") $PWD info $vcs_info_msg_0_  $vcs_info_msg_1_ >> ~/vcs.log
+  zle reset-prompt
+}
+
+_vbe_vcs_precmd() {
+  # echo $(date +"%Y-%m-%d %H:%M:%S") $PWD pre >> ~/vcs.log
+  async_flush_jobs vcs_info
+  async_job vcs_info _vbe_vcs_info $PWD
+}
+
+async_init
+async_start_worker vcs_info
+async_register_callback vcs_info _vbe_vcs_info_done
+add-zsh-hook precmd _vbe_vcs_precmd

zsh.d/60-hooks.zsh

@@ -1,30 +0,0 @@
-# Hooks for zsh
-#
-# - precmd
-# - chpwd
-# - preexec
-# - periodic
-# - zshaddhistory
-# - zshexit
-#
-
-# Async Git update
-autoload -Uz vcs_info
-
-_vbe_vcs_info_done() {
-  local stdout=$3
-  vcs_info_msg_0_=$stdout
-	# echo $(date +"%Y-%m-%d %H:%M:%S") $PWD info $vcs_info_msg_0_  $vcs_info_msg_1_ >> ~/vcs.log
-  zle reset-prompt
-}
-
-_vbe_vcs_precmd() {
-  # echo $(date +"%Y-%m-%d %H:%M:%S") $PWD pre >> ~/vcs.log
-  async_flush_jobs vcs_info
-  async_job vcs_info _vbe_vcs_info $PWD
-}
-
-async_init
-async_start_worker vcs_info
-async_register_callback vcs_info _vbe_vcs_info_done
-add-zsh-hook precmd _vbe_vcs_precmd

zsh.d/90-plugins.zsh

@@ -6,8 +6,8 @@ if type pyenv > /dev/null; then
   eval "$(pyenv virtualenv-init -)"
 fi
 
-# # thefuck
-# type thefuck > /dev/null && eval $(thefuck --alias)
+# thefuck
+type thefuck > /dev/null && eval $(thefuck --alias)
 
 # z
 # [ -f $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh ] && source $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh
@@ -24,10 +24,5 @@ fi
 # kubectl/krew
 export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
 
-if type kubectl > /dev/null; then
-  alias k=kubectl
-  alias kk='kubectl konfig merge ~/.kube/configs/* > ~/.kube/config'
-fi
-
 # Setup iTerm shell integration
-#test -e $HOME/.iterm2_shell_integration.zsh && source $HOME/.iterm2_shell_integration.zsh && export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES || echo "iTerm sh integration not installed"
+test -e $HOME/.iterm2_shell_integration.zsh && source $HOME/.iterm2_shell_integration.zsh && export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES || echo "iTerm integration not installed"

zsh.d/Darwin/50-darwin.zsh

@@ -6,21 +6,17 @@
 # We need it here to fix the PATH
 # so we can setup pyenv and other stuff
 #
-for prefix in /usr/local /opt/homebrew; do
-    brew=$(whence $prefix/bin/brew)
-    if [ $brew ]; then
-        eval "$($brew shellenv)"
-        FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
-        break
-    fi
-done
+if type /opt/homebrew/bin/brew > /dev/null; then
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+    FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}"
+fi
 
 export LSCOLORS="ExgxcxdxCxegedabagacad"
 
 alias ls='ls -F -G'
 alias ldd='otool -L'
-alias skill=killall
+# alias skill=killall
 alias lsrebuild='/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -r -domain local -domain system -domain user'
 
 
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
+#  vim: set ts=4 sw=4 tw=0 ft=zsh :

zsh.d/README-local.txt

@@ -4,12 +4,4 @@ Useful customizations that you can add are
 
 prompt <promptname> - redefine prompt
 
-To use virtualenvs you MUST define
-export WORKON_HOME <path to virtualenvs>
-export PROJECT_HOME <path to projects>
-
-then you can explicitly call 'venv' or leave it as a function to invoke at the
-right moment
-
-
 /* vim: set ts=4 sw=4 tw=78 ft=text : */

zsh.d/completions/_adb

@@ -1,417 +0,0 @@
-#compdef adb
-# ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the zsh-users nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for adb (Android Debug Bridge) 1.0.26
-#  (http://developer.android.com/guide/developing/tools/adb.html).
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
-#
-# ------------------------------------------------------------------------------
-
-
-_adb() {
-  typeset -A opt_args
-  local context state line curcontext="$curcontext" adb_args
-
-  local ret=1
-
-  _arguments -C \
-    '(-e -s)-d[directs command to the only connected USB device, returns an error if more than one USB device is present]' \
-    '(-d -s)-e[directs command to the only running emulator, returns an error if more than one emulator is running]' \
-    '(-d -e)-s[directs command to the USB device or emulator with the given serial number]: :_adb_serial_numbers' \
-    '-p[simple product name or a relative/absolute path to a product out directory]: :_adb_products' \
-    '1: :_adb_cmds' \
-    '*::arg:->args' \
-  && ret=0
-
-  adb_args="${(fkv)opt_args[(I)-d|-e|-s|-p]}"
-
-  case "$state" in
-    (args)
-      curcontext="${curcontext%:*:*}:adb-cmd-$words[1]:"
-      case $words[1] in
-        (help|version|devices|jdwp|bugreport|wait-for-device|start-server|kill-server|get-state|get-serialno|status-window|remount|reboot-bootloader|root|usb)
-          _message 'no more arguments' && ret=0
-        ;;
-        (connect|disconnect)
-          _arguments \
-            '1: :_adb_host_colon_ports' \
-          && ret=0
-        ;;
-        (push)
-          _arguments \
-            '1:local directory:_files -/' \
-            '2: :_adb_remote_files -/' \
-          && ret=0
-        ;;
-        (pull)
-          _arguments \
-            '1: :_adb_remote_files -/' \
-            '2:local directory:_files -/' \
-          && ret=0
-        ;;
-        (sync)
-          _arguments \
-            '-l[list but do not copy]' \
-            '1: :_adb_sync_directories' \
-          && ret=0
-        ;;
-        (shell|emu)
-          _arguments -C \
-            '1: :_adb_remote_commands' \
-            '*::remote-command-arg:->remote-command-args' \
-          && ret=0
-          case "$state" in
-            (remote-command-args)
-              curcontext="${curcontext%:*:*}:adb-remote-cmd-$words[1]:"
-              if (( $+functions[_adb_remote_command_$words[1]_args] )); then
-                _adb_remote_command_$words[1] && ret=0
-                # TODO Write handlers for following commands:
-                #  * am (Activity Manager)
-                #  * pm (Package Manager)
-                # TODO Reuse existing compdefs for standard commands (ls, id, ifconfig, kill, etc) ?
-                #      How do we tell them to use _remote_ files/pids/users/etc ?
-              else
-                _adb_remote_command_default && ret=0
-              fi
-            ;;
-          esac
-        ;;
-        (logcat)
-           local -a rotation_opts
-           [[ -n ${(M)words:#"-f"} ]] && rotation_opts+=('-r[rotates the log file every kbytes of output. The default value is 16]:value (in kb)')
-           [[ -n ${(M)words:#"-r"} ]] && rotation_opts+=('-n[sets the maximum number of rotated logs. The default value is 4]:count')
-          _arguments \
-            '-b[loads an alternate log buffer for viewing, such as event or radio. The main buffer is used by default]: :_adb_logcat_buffers' \
-            '-c[clears (flushes) the entire log and exits]' \
-            '-d[dumps the log to the screen and exits]' \
-            '-f[writes log message output to file. The default is stdout]: :_files' \
-            '-g[prints the size of the specified log buffer and exits]' \
-            '-s[sets the default filter spec to silent]' \
-            '-v[sets the output format for log messages]: :_adb_logcat_output_formats' \
-            "${rotation_opts[@]}" \
-            '*: :_adb_logcat_filter_specs' \
-          && ret=0
-        ;;
-        (forward)
-          _arguments \
-            '1: :_adb_local_forward_specs' \
-            '2: :_adb_remote_forward_specs' \
-          && ret=0
-        ;;
-        (install)
-          _arguments \
-            '-l[forward-lock the app]' \
-            '-r[reinstall the app, keeping its data]' \
-            '-s[install on SD card instead of internal storage]' \
-            '1: :_files' \
-          && ret=0
-        ;;
-        (uninstall)
-          _arguments \
-            '-k[keep the data and cache directories]' \
-            '1: :_adb_packages' \
-          && ret=0
-        ;;
-        (reboot)
-          _arguments \
-            '1:program:((bootloader:reboot\ into\ the\ bootloader\ program recovery:reboot\ into\ the\ recovery\ program))' \
-          && ret=0
-        ;;
-        (tcpip)
-          _arguments \
-            '1::port' \
-          && ret=0
-        ;;
-        (ppp)
-          # TODO Complete tty (See http://developer.android.com/guide/developing/tools/adb.html#commandsummary)
-          # TODO Complete PPP parameters (See http://ppp.samba.org/pppd.html)
-          _arguments \
-            '1::tty' \
-            '*::parameters' \
-          && ret=0
-        ;;
-      esac
-    ;;
-  esac
-
-  return ret
-}
-
-(( $+functions[_adb_cmds] )) ||
-_adb_cmds() {
-  _alternative \
-    'general-commands:general command:_adb_general_cmds' \
-    'device-commands:device command:_adb_device_cmds' \
-    'scripting-commands:scripting command:_adb_scripting_cmds'
-}
-
-(( $+functions[_adb_general_cmds] )) ||
-_adb_general_cmds() {
-  local commands; commands=(
-    'help:show help message'
-    'version:show version number'
-    'devices:list all connected devices'
-    'connect:connect to a device via TCP/IP'
-    'disconnect:disconnect from a TCP/IP device'
-  )
-  _describe -t general-commands 'general command' commands "$@"
-}
-
-(( $+functions[_adb_device_cmds] )) ||
-_adb_device_cmds() {
-  local commands; commands=(
-    'push:copy file/dir to device'
-    'pull:copy file/dir from device'
-    'sync:copy host->device only if changed'
-    'shell:run remote shell interactively or command'
-    'emu:run emulator console command'
-    'logcat:view device log'
-    'forward:forward socket connections'
-    'jdwp:list PIDs of processes hosting a JDWP transport'
-    'install:push this padbage file to the device and install it'
-    'uninstall:remove this app padbage from the device'
-    'bugreport:return all information from the device'
-  )
-  _describe -t device-commands 'device command' commands "$@"
-}
-
-(( $+functions[_adb_scripting_cmds] )) ||
-_adb_scripting_cmds() {
-  local commands; commands=(
-    'wait-for-device:block until device is online'
-    'start-server:ensure that there is a server running'
-    'kill-server:kill the server if it is running'
-    'get-state:prints\: offline | bootloader | device'
-    'get-serialno:prints\: <serial-number>'
-    'status-window:continuously print device status for a specified device'
-    'remount:remounts the /system partition on the device read-write'
-    'reboot:reboots the device, optionally into the bootloader or recovery program'
-    'reboot-bootloader:reboots the device into the bootloader'
-    'root:restarts the adbd daemon with root permissions'
-    'usb:restarts the adbd daemon listening on USB'
-    'tcpip:restarts the adbd daemon listening on TCP on the specified port'
-    'ppp:run PPP over USB'
-  )
-  _describe -t scripting-commands 'scripting command' commands "$@"
-}
-
-(( $+functions[_adb_products] )) ||
-_adb_products() {
-  _alternative \
-    'product-names:product name:_adb_product_names' \
-    'directories:directory:_files -/'
-}
-
-(( $+functions[_adb_product_names] )) ||
-_adb_product_names() {
-  local ret=1
-  if [[ -n "$ANDROID_PRODUCT_OUT" ]]; then
-    local product_names; product_names=("$ANDROID_PRODUCT_OUT:default value set in ANDROID_PRODUCT_OUT environment variable")
-    _describe -t product-names 'product name' product_names && ret=0
-  else
-    _message -e product-names 'product name' && ret=0
-  fi
-  return ret
-}
-
-(( $+functions[_adb_serial_numbers] )) ||
-_adb_serial_numbers() {
-  local serial_numbers; serial_numbers=(${${(M)${(f)"$(_call_program devices $service devices)"}:#*device}%%[[:space:]]*}":connected device")
-  [[ -n "$ANDROID_SERIAL" ]] && serial_numbers+=("$ANDROID_SERIAL:default value set in ANDROID_SERIAL environment variable")
-  _describe -t serial-numbers 'serial number' serial_numbers "$@" && ret=0
-}
-
-(( $+functions[_adb_packages] )) ||
-_adb_packages() {
-  local packages; packages=(${${(ps:\r\n:)"$(_call_program packages $service $adb_args shell 'ls /data/data 2>/dev/null')"}:#\**\*})
-  _multi_parts . packages
-}
-
-(( $+functions[_adb_host_colon_ports] )) ||
-_adb_host_colon_ports() {
-  local ret=1
-  if compset -P '*:'; then
-    _message -e ports 'port' && ret=0
-  else
-    _wanted hosts expl 'host' _hosts -qS: && ret=0
-  fi
-  return ret
-}
-
-(( $+functions[_adb_remote_files] )) ||
-_adb_remote_files() {
-  local dirsonly command="ls -d ${(S)words[CURRENT]/\/*//}*/ 2>/dev/null"
-  zparseopts -D -E '/=dirsonly'
-  (( ! $#dirsonly )) && command+="; ls -d ${words[CURRENT]}* 2>/dev/null"
-  local files; files=(${${(ps:\r\n:)"$(_call_program files $service $adb_args shell "'$command'" 2>/dev/null)"}:#\**\*})
-  _multi_parts "$@" / files
-}
-
-(( $+functions[_adb_remote_commands] )) ||
-_adb_remote_commands() {
-  local commands; commands=(${${(ps:\r\n:)"$(_call_program commands $service $adb_args shell "'IFS=:;for path_dir in \$PATH; do ls \$path_dir 2>/dev/null; done'" 2>/dev/null)"}:#\**\*})
-  _describe -t remote-commands 'remote command' commands && ret=0
-}
-
-(( $+functions[_adb_local_forward_specs] )) ||
-_adb_local_forward_specs() {
-  local ret=1
-  if compset -P '*:'; then
-    case ${IPREFIX%:} in
-      (tcp)
-        _message -e ports 'port' && ret=0
-      ;;
-      (localabstract|localreserved)
-        _wanted sockets expl 'socket' _socket && ret=0
-      ;;
-      (localfilesystem)
-        _wanted socket-files expl 'socket file' _files && ret=0
-      ;;
-      (dev)
-        _wanted devices expl 'device' _files -g "/dev/**" && ret=0
-      ;;
-    esac
-  else
-    local modes; modes=(
-      'tcp:TCP socket'
-      'localabstract:local abstract socket'
-      'localreserved:local reserved socket'
-      'localfilesystem:local filesystem socket'
-      'dev:device'
-    )
-    _describe -t forward-modes 'forward mode' modes -qS: && ret=0
-  fi
-  return ret
-}
-
-(( $+functions[_adb_remote_forward_specs] )) ||
-_adb_remote_forward_specs() {
-  local ret=1
-  if compset -P '*:'; then
-    case ${IPREFIX%:} in
-      (tcp)
-        _message -e ports 'remote port' && ret=0
-      ;;
-      (localabstract|localreserved|localfilesystem)
-        _message -e sockets 'remote socket' && ret=0
-      ;;
-      (dev)
-        _message -e devices 'remote device' && ret=0
-      ;;
-      (jdwp)
-        local pids; pids=(${${(f)"$(_call_program pids $service $adb_args jdwp 2>/dev/null)"}:#\**\*})
-        _describe -t remote-pids 'remote pid' pids && ret=0
-      ;;
-    esac
-  else
-    local modes; modes=(
-      'tcp:TCP socket'
-      'localabstract:local abstract socket'
-      'localreserved:local reserved socket'
-      'localfilesystem:local filesystem socket'
-      'dev:device'
-      'jdwp:Java Debug Wire Protocol'
-    )
-    _describe -t forward-modes 'forward mode' modes -qS: && ret=0
-  fi
-  return ret
-}
-
-(( $+functions[_adb_sync_directories] )) ||
-_adb_sync_directories() {
-  _alternative \
-    'partitions:partition:((system:the\ /system\ partition data:the\ /data\ partition))' \
-    'directories:directory:_adb_remote_files -/'
-}
-
-(( $+functions[_adb_logcat_filter_specs] )) ||
-_adb_logcat_filter_specs() {
-  local ret=1
-  if compset -P '*:'; then
-    local priorities; priorities=(
-      'V:verbose (lowest priority)'
-      'D:debug'
-      'I:info'
-      'W:warning'
-      'E:error'
-      'F:fatal'
-      'S:silent (highest priority, on which nothing is ever printed)'
-    )
-    _describe -t log-priorities 'log priority' priorities "$@" && ret=0
-  else
-    local tags; tags=(${(u)${${${(f)"$(_call_program tags $service $adb_args logcat -d 2>/dev/null)"}%%[[:space:]]#\(*}##*\/}:#\**\*})
-    _describe -t log-tags 'log tag' tags -qS: "$@" && ret=0
-  fi
-  return ret
-}
-
-(( $+functions[_adb_logcat_output_formats] )) ||
-_adb_logcat_output_formats() {
-  local formats; formats=(
-    'brief:display priority/tag and PID of originating process (the default format)'
-    'process:display PID only'
-    'tag:display the priority/tag only'
-    'thread:display process:thread and priority/tag only'
-    'raw:display the raw log message, with no other metadata fields'
-    'time:display the date, invocation time, priority/tag, and PID of the originating process'
-    'long:display all metadata fields and separate messages with a blank lines'
-  )
-  _describe -t log-formats 'log format' formats "$@" && ret=0
-}
-
-(( $+functions[_adb_logcat_buffers] )) ||
-_adb_logcat_buffers() {
-  local buffers; buffers=(
-    'main:view the main log buffer (default)'
-    'radio:view the buffer that contains radio/telephony related messages'
-    'events:view the buffer containing events-related messages'
-  )
-  _describe -t log-buffers 'log buffer' buffers "$@" && ret=0
-}
-
-(( $+functions[_adb_remote_command_default] )) ||
-_adb_remote_command_default() {
-  _wanted remote-files expl 'remote file' _adb_remote_files
-}
-
-_adb "$@"
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 2
-# indent-tabs-mode: nil
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et

zsh.d/completions/_debuild

@@ -1,65 +0,0 @@
-#compdef debuild
-# ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the zsh-users nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for debuild 2.10.
-#
-#  Status: incomplete.
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
-#
-# ------------------------------------------------------------------------------
-
-
-# FIXME --noconf is only allowed in first position
-_arguments \
-  '(- 1 *)'{-h,--help}'[show help]' \
-  '(- 1 *)--version[show version and copyright information]' \
-  {--no-conf,--noconf}'[don'\''t read devscripts config files]' \
-  {-r-,--rootcmd=}'[command used to become root if debuild not setuid root (default: fakeroot)]: :_command_names' \
-  '*'{-e-,--preserve-envvar=}'[preserve environment variable]: :_vars' \
-  '(-e --preserve-envvar)--preserve-env[preserve all environment vars (except PATH)]' \
-  '*'{-e-,--set-envvar=}'[preserve environment variable]: :_vars -qS=' \
-  '--prepend-path=[prepend to the sanitised PATH]: :_files -/' \
-  '(-D)-d[skip checking of build dependencies]' \
-  '(-d)-D[force checking of build dependencies]' \
-  '--check-dirname-level[how much to check directory names]:level:((0\:never 1\:only\ if\ program\ changes\ directory\ \(default\) 2\:always))' \
-  '--check-dirname-regex[Perl regex defining matching directory names, the string PACKAGE will be replaced by the package name (default: '\''PACKAGE(-.+)?'\'')]:regex'
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 2
-# indent-tabs-mode: nil
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et

zsh.d/completions/_pip

@@ -1,125 +0,0 @@
-#compdef pip
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for pip (http://pypi.python.org/pypi/pip).
-#
-#  Source: https://github.com/technolize/zsh-completion-funcs
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * technolize (https://github.com/technolize)
-#
-# ------------------------------------------------------------------------------
-
-
-local ret=1 state
-
-local -a common_ops
-common_ops=(
-  "--version[display version number]"
-  {-h,--help}"[show help]"
-  {-E,--environment=}"[virtualenv environment to run pip]:environment:_directories"
-  {-s,--enable-site-packages}"[include site-packages in virtualenv]"
-  {-v,--verbose}"[give more output]"
-  {-q,--quiet}"[give less output]"
-  "--log=[log file where a complete record will be kept]"
-  "--proxy=[specify a proxy in the form user:passwd@proxy.server:port]:proxy"
-  "--timeout=[set the socket timeout (default 15 seconds)]:second"
-)
-
-_directories () {
-  _wanted directories expl directory _path_files -/ "$@" -
-}
-
-typeset -A opt_args
-_arguments \
-  ':subcommand:->subcommand' \
-  $common_ops \
-  '*::options:->options' && ret=0
-
-case $state in
-  subcommand)
-    local -a subcommands
-    subcommands=(
-      "bundle:create pybundle"
-      "freeze:put all currently installed packages"
-      "help:show available commands"
-      "install:install packages"
-      "search:search pypi"
-      "uninstall:uninstall packages"
-      "unzip:unzip undividual packages"
-      "zip:zip dividual packages"
-    )
-
-    _describe -t subcommands 'pip subcommand' subcommands && ret=0
-  ;;
-
-  options)
-    local -a args
-    args=(
-      $common_ops
-    )
-
-    local -a requirement
-    requirement=(
-      {-r,--requirement=}"[install all the packages listed in the given requirements file]:filename:_files"
-    )
-
-    local -a findlink
-    findlink=(
-      {-f,--find-links=}"[URL to look for packages at]:url"
-    )
-
-    case $words[1] in
-      bundle | install)
-        args+=(
-          {-e,--editable=}"[install a package directly from a checkout]:VCS+REPOS_URL[@REV]#egg=PACKAGE"
-          $requirement
-          $findlink
-          {-i,--index-url=,--pypi-url=}"[base URL of Python Package Index]:URL"
-          "--extra-index-url=[extra URLs of package indexes to use]:URL"
-          {-b,--build=,--build-dir=}"[unpack packages into DIR]:directory:_directories"
-          {--src=,--source=}"[check out --editable packages into DIR]:directory:_directories"
-          {-U,--upgrade}"[upgrade all packages to the newest available version]"
-          {-I,--ignore-installed}"[ignore the installed packages]"
-          "--noinstall[download and unpack all packages, but don't actually install them]"
-          "--install-option=[extra arguments to be supplied to the setup.py install command]"
-        )
-      ;;
-
-      freeze)
-        args+=(
-          $requirement
-          $findlink
-        )
-      ;;
-
-      unzip | zip)
-        args+=(
-          "--unzip[unzip a package]"
-          "--no-pyc[do not include .pyc files in zip files]"
-          {-l,--list}"[list the packages available, and their zip status]"
-          "--sort-files[with --list, sort packages according to how many files they contain]"
-          "--path=[restrict operation to the given paths]:paths"
-          {-n,--simulate}"[do not actually perform the zip/unzip operation]"
-        )
-      ;;
-    esac
-
-    _arguments $args && ret=0
-  ;;
-esac
-
-return ret
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 2
-# indent-tabs-mode: nil
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et

zsh.d/completions/_setup.py

@@ -1,708 +0,0 @@
-#compdef setup.py
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for setup.py (http://docs.python.org/distutils/).
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * Hideo Hattori (https://github.com/hhatto)
-#
-# ------------------------------------------------------------------------------
-
-_setup.py() {
-  typeset -A opt_args
-  local context state line
-
-  _arguments -s -S \
-    "--verbose[run verbosely (default)]" \
-    "-v[run verbosely (default)]" \
-    "--quiet[run quietly (turns verbosity off)]" \
-    "-q[run quietly (turns verbosity off)]" \
-    "--dry-run[don't actually do anything]" \
-    "-n[don't actually do anything]" \
-    "--help[show detailed help message]" \
-    "-h[show detailed help message]" \
-    "--no-user-cfg[ignore pydistutils.cfg in your home directory]" \
-    "--command-packages=[list of packages that provide distutils commands]" \
-    "--help-commands[list all available commands]" \
-    "--name[print package name]" \
-    "--version[print package version]" \
-    "-V[print package version]" \
-    "--fullname[print <package name>-<version>]" \
-    "--author[print the author's name]" \
-    "--author-email[print the author's email address]" \
-    "--maintainer[print the maintainer's name]" \
-    "--maintainer-email[print the maintainer's email address]" \
-    "--contact[print the maintainer's name if known, else the author's]" \
-    "--contact-email[print the maintainer's email address if known, else the author's]" \
-    "--url[print the URL for this package]" \
-    "--license[print the license of the package]" \
-    "--licence[alias for --license]" \
-    "--description[print the package description]" \
-    "--long-description[print the long package description]" \
-    "--platforms[print the list of platforms]" \
-    "--classifiers[print the list of classifiers]" \
-    "--keywords[print the list of keywords]" \
-    "--provides[print the list of packages/modules provided]" \
-    "--requires[print the list of packages/modules required]" \
-    "--obsoletes[print the list of packages/modules made obsolete]" \
-    "*::setup.py commands:_setuppy_command"
-}
-
-(( $+functions[_setuppy_command] )) ||
-_setuppy_command() {
-  local cmd ret=1
-
-  (( $+setuppy_cmds )) || _setuppy_cmds=(
-    "build:build everything needed to install" \
-    "build_py:\"build\" pure Python modules (copy to build directory)" \
-    "build_ext:build C/C++ extensions (compile/link to build directory)" \
-    "build_clib:build C/C++ libraries used by Python extensions" \
-    "build_scripts:\"build\" scripts (copy and fixup #! line)" \
-    "clean:clean up temporary files from 'build' command" \
-    "install:install everything from build directory" \
-    "install_lib:install all Python modules (extensions and pure Python)" \
-    "install_headers:install C/C++ header files" \
-    "install_scripts:install scripts (Python or otherwise)" \
-    "install_data:install data files" \
-    "sdist:create a source distribution (tarball, zip file, etc.)" \
-    "register:register the distribution with the Python package index" \
-    "bdist:create a built (binary) distribution" \
-    "bdist_dumb:create a \"dumb\" built distribution" \
-    "bdist_rpm:create an RPM distribution" \
-    "bdist_wininst:create an executable installer for MS Windows" \
-    "upload:upload binary package to PyPI" \
-    "check:perform some checks on the package" \
-    "alias:define a shortcut to invoke one or more commands" \
-    "bdist_egg:create an \"egg\" distribution" \
-    "develop:install package in 'development mode'" \
-    "easy_install:Find/get/install Python packages" \
-    "egg_info:create a distribution's .egg-info directory" \
-    "rotate:delete older distributions, keeping N newest files" \
-    "saveopts:save supplied options to setup.cfg or other config file" \
-    "setopt:set an option in setup.cfg or another config file" \
-    "test:run unit tests after in-place build" \
-    "install_egg_info:Install an .egg-info directory for the package" \
-    "upload_docs:Upload documentation to PyPI" \
-    )
-
-  if (( CURRENT == 1 )); then
-    _describe -t commands 'setup.py subcommand' _setuppy_cmds || compadd "$@" - ${(s.:.)${(j.:.)_setuppy_syns}}
-  else
-    local curcontext="$curcontext"
-
-    cmd="${${_setuppy_cmds[(r)$words[1]:*]%%:*}:-${(k)_setuppy_syns[(r)(*:|)$words[1](:*|)]}}"
-    if (( $#cmd )); then
-      curcontext="${curcontext%:*:*}:setuppy-${cmd}:"
-      _call_function ret _setuppy_$cmd || _message 'no more arguments'
-    else
-      _message "unknown setup.py command: $words[1]"
-      fi
-    return ret
-  fi
-}
-
-(( $+functions[_setuppy_build] )) ||
-_setuppy_build() {
-  _arguments -s \
-    "--build-base=[base directory for build library]" \
-    "-b[base directory for build library]" \
-    "--build-purelib=[build directory for platform-neutral distributions]" \
-    "--build-platlib=[build directory for platform-specific distributions]" \
-    "--build-lib=[build directory for all distribution (defaults to either build-purelib or build-platlib]" \
-    "--build-scripts=[build directory for scripts]" \
-    "--build-temp=[temporary build directory]" \
-    "-t[temporary build directory]" \
-    "--plat-name=[platform name to build for, if supported (default: linux-i686)]" \
-    "-p[platform name to build for, if supported (default: linux-i686)]" \
-    "--compiler=[specify the compiler type]" \
-    "-c[specify the compiler type]" \
-    "--debug[compile extensions and libraries with debugging information]" \
-    "-g[compile extensions and libraries with debugging information]" \
-    "--force[forcibly build everything (ignore file timestamps)]" \
-    "-f[forcibly build everything (ignore file timestamps)]" \
-    "--executable=[specify final destination interpreter path (build.py)]" \
-    "-e[specify final destination interpreter path (build.py)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_build_py] )) ||
-_setuppy_build_py() {
-  _arguments -s \
-    "--build-lib=[directory to \"build\" (copy) to]" \
-    "-d[directory to \"build\" (copy) to]" \
-    "--compile[compile .py to .pyc]" \
-    "-c[compile .py to .pyc]" \
-    "--no-compile[don't compile .py files \[default\]]" \
-    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "--force[forcibly build everything (ignore file timestamps)]" \
-    "-f[forcibly build everything (ignore file timestamps)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_build_ext] )) ||
-_setuppy_build_ext() {
-  _arguments -s \
-    "--build-lib=[directory for compiled extension modules]" \
-    "-b[directory for compiled extension modules]" \
-    "--build-temp=[directory for temporary files (build by-products)]" \
-    "-t[directory for temporary files (build by-products)]" \
-    "--plat-name=[platform name to cross-compile for, if supported (default: linux-i686)]" \
-    "-p[platform name to cross-compile for, if supported (default: linux-i686)]" \
-    "--inplace[ignore build-lib and put compiled extensions into the source directory alongside your pure Python modules]" \
-    "-i[ignore build-lib and put compiled extensions into the source directory alongside your pure Python modules]" \
-    "--include-dirs=[list of directories to search for header files (separated by ':')]" \
-    "-I[list of directories to search for header files (separated by ':')]" \
-    "--define=[C preprocessor macros to define]" \
-    "-D[C preprocessor macros to define]" \
-    "--undef=[C preprocessor macros to undefine]" \
-    "-U[C preprocessor macros to undefine]" \
-    "--libraries=[external C libraries to link with]" \
-    "-l[external C libraries to link with]" \
-    "--library-dirs=[directories to search for external C libraries (separated by ':')]" \
-    "-L[directories to search for external C libraries (separated by ':')]" \
-    "--rpath=[directories to search for shared C libraries at runtime]" \
-    "-R[directories to search for shared C libraries at runtime]" \
-    "--link-objects=[extra explicit link objects to include in the link]" \
-    "-O[extra explicit link objects to include in the link]" \
-    "--debug[compile/link with debugging information]" \
-    "-g[compile/link with debugging information]" \
-    "--force[forcibly build everything (ignore file timestamps)]" \
-    "-f[forcibly build everything (ignore file timestamps)]" \
-    "--compiler=[specify the compiler type]" \
-    "-c[specify the compiler type]" \
-    "--swig-cpp[make SWIG create C++ files (default is C)]" \
-    "--swig-opts=[list of SWIG command line options]" \
-    "--swig=[path to the SWIG executable]" \
-    "--user[add user include, library and rpath]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_build_clib] )) ||
-_setuppy_build_clib() {
-  _arguments -s \
-    "--build-clib=[directory to build C/C++ libraries to]" \
-    "-b[directory to build C/C++ libraries to]" \
-    "--build-temp=[directory to put temporary build by-products]" \
-    "-t[directory to put temporary build by-products]" \
-    "--debug[compile with debugging information]" \
-    "-g[compile with debugging information]" \
-    "--force[forcibly build everything (ignore file timestamps)]" \
-    "-f[forcibly build everything (ignore file timestamps)]" \
-    "--compiler=[specify the compiler type]" \
-    "-c[specify the compiler type]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_build_scripts] )) ||
-_setuppy_build_scripts() {
-  _arguments -s \
-    "--build-dir=[directory to \"build\" (copy) to]" \
-    "-d[directory to \"build\" (copy) to]" \
-    "--force[forcibly build everything (ignore file timestamps]" \
-    "-f[forcibly build everything (ignore file timestamps]" \
-    "--executable=[specify final destination interpreter path]" \
-    "-e[specify final destination interpreter path]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_clean] )) ||
-_setuppy_clean() {
-  _arguments -s \
-    "--build-base=[base build directory (default: 'build.build-base')]" \
-    "-b[base build directory (default: 'build.build-base')]" \
-    "--build-lib=[build directory for all modules (default: 'build.build-lib')]" \
-    "--build-temp=[temporary build directory (default: 'build.build-temp')]" \
-    "-t[temporary build directory (default: 'build.build-temp')]" \
-    "--build-scripts=[build directory for scripts (default: 'build.build-scripts')]" \
-    "--bdist-base=[temporary directory for built distributions]" \
-    "--all[remove all build output, not just temporary by-products]" \
-    "-a[remove all build output, not just temporary by-products]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install] )) ||
-_setuppy_install() {
-  _arguments -s \
-    "--prefix=[installation prefix]" \
-    "--exec-prefix=[(Unix only) prefix for platform-specific files]" \
-    "--home=[(Unix only) home directory to install under]" \
-    "--user[install in user site-package '/home/hattori/.local/lib/python2.7/site-packages']" \
-    "--install-base=[base installation directory (instead of --prefix or --home)]" \
-    "--install-platbase=[base installation directory for platform-specific files (instead of --exec-prefix or --home)]" \
-    "--root=[install everything relative to this alternate root directory]" \
-    "--install-purelib=[installation directory for pure Python module distributions]" \
-    "--install-platlib=[installation directory for non-pure module distributions]" \
-    "--install-lib=[installation directory for all module distributions (overrides --install-purelib and --install-platlib)]" \
-    "--install-headers=[installation directory for C/C++ headers]" \
-    "--install-scripts=[installation directory for Python scripts]" \
-    "--install-data=[installation directory for data files]" \
-    "--compile[compile .py to .pyc \[default\]]" \
-    "-c[compile .py to .pyc \[default\]]" \
-    "--no-compile[don't compile .py files]" \
-    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "--force[force installation (overwrite any existing files)]" \
-    "-f[force installation (overwrite any existing files)]" \
-    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
-    "--record=[filename in which to record list of installed files]" \
-    "--install-layout=[installation layout to choose (known values: deb, unix)]" \
-    "--old-and-unmanageable[Try not to use this!]" \
-    "--single-version-externally-managed[used by system package builders to create 'flat' eggs]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install_lib] )) ||
-_setuppy_install_lib() {
-  _arguments -s \
-    "--install-dir=[directory to install to]" \
-    "-d[directory to install to]" \
-    "--build-dir=[build directory (where to install from)]" \
-    "-b[build directory (where to install from)]" \
-    "--force[force installation (overwrite existing files)]" \
-    "-f[force installation (overwrite existing files)]" \
-    "--compile[compile .py to .pyc \[default\]]" \
-    "-c[compile .py to .pyc \[default\]]" \
-    "--no-compile[don't compile .py files]" \
-    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "--skip-build[skip the build steps]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install_headers] )) ||
-_setuppy_install_headers() {
-  _arguments -s \
-    "--install-dir=[directory to install header files to]" \
-    "-d[directory to install header files to]" \
-    "--force[force installation (overwrite existing files)]" \
-    "-f[force installation (overwrite existing files)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install_scripts] )) ||
-_setuppy_install_scripts() {
-  _arguments -s \
-    "--install-dir=[directory to install scripts to]" \
-    "-d[directory to install scripts to]" \
-    "--build-dir=[build directory (where to install from)]" \
-    "-b[build directory (where to install from)]" \
-    "--force[force installation (overwrite existing files)]" \
-    "-f[force installation (overwrite existing files)]" \
-    "--skip-build[skip the build steps]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install_data] )) ||
-_setuppy_install_data() {
-  _arguments -s \
-    "--install-dir=[base directory for installing data files (default: installation base dir)]" \
-    "-d[base directory for installing data files (default: installation base dir)]" \
-    "--root=[install everything relative to this alternate root directory]" \
-    "--force[force installation (overwrite existing files)]" \
-    "-f[force installation (overwrite existing files)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_sdist] )) ||
-_setuppy_sdist() {
-  _arguments -s \
-    "--formats=[formats for source distribution (comma-separated list)]" \
-    "--keep-temp[keep the distribution tree around after creating archive file(s)]" \
-    "-k[keep the distribution tree around after creating archive file(s)]" \
-    "--dist-dir=[directory to put the source distribution archive(s) in \[default: dist\]]" \
-    "-d[directory to put the source distribution archive(s) in \[default: dist\]]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_register] )) ||
-_setuppy_register() {
-  _arguments -s \
-    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "--show-response[display full response text from server]" \
-    "--list-classifiers[list the valid Trove classifiers]" \
-    "--strict[Will stop the registering if the meta-data are not fully compliant]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_bdist] )) ||
-_setuppy_bdist() {
-  _arguments -s \
-    "--bdist-base=[temporary directory for creating built distributions]" \
-    "-b[temporary directory for creating built distributions]" \
-    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
-    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
-    "--formats=[formats for distribution (comma-separated list)]" \
-    "--dist-dir=[directory to put final built distributions in \[default: dist\]]" \
-    "-d[directory to put final built distributions in \[default: dist\]]" \
-    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
-    "--owner=[Owner name used when creating a tar file \[default: current user\]]" \
-    "-u[Owner name used when creating a tar file \[default: current user\]]" \
-    "--group=[Group name used when creating a tar file \[default: current group\]]" \
-    "-g[Group name used when creating a tar file \[default: current group\]]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_bdist_dumb] )) ||
-_setuppy_bdist_dumb() {
-  _arguments -s \
-    "--bdist-dir=[temporary directory for creating the distribution]" \
-    "-d[temporary directory for creating the distribution]" \
-    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
-    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
-    "--format=[archive format to create (tar, ztar, gztar, zip)]" \
-    "-f[archive format to create (tar, ztar, gztar, zip)]" \
-    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "--dist-dir=[directory to put final built distributions in]" \
-    "-d[directory to put final built distributions in]" \
-    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
-    "--relative[build the archive using relative paths(default: false)]" \
-    "--owner=[Owner name used when creating a tar file \[default: current user\]]" \
-    "-u[Owner name used when creating a tar file \[default: current user\]]" \
-    "--group=[Group name used when creating a tar file \[default: current group\]]" \
-    "-g[Group name used when creating a tar file \[default: current group\]]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_bdist_rpm] )) ||
-_setuppy_bdist_rpm() {
-  _arguments -s \
-    "--bdist-base=[base directory for creating built distributions]" \
-    "--rpm-base=[base directory for creating RPMs (defaults to \"rpm\" under --bdist-base; must be specified for RPM 2)]" \
-    "--dist-dir=[directory to put final RPM files in (and .spec files if --spec-only)]" \
-    "-d[directory to put final RPM files in (and .spec files if --spec-only)]" \
-    "--python=[path to Python interpreter to hard-code in the .spec file (default: \"python\")]" \
-    "--fix-python[hard-code the exact path to the current Python interpreter in the .spec file]" \
-    "--spec-only[only regenerate spec file]" \
-    "--source-only[only generate source RPM]" \
-    "--binary-only[only generate binary RPM]" \
-    "--use-bzip2[use bzip2 instead of gzip to create source distribution]" \
-    "--distribution-name=[name of the (Linux) distribution to which this RPM applies (*not* the name of the module distribution!)]" \
-    "--group=[package classification \[default: \"Development/Libraries\"\]]" \
-    "--release=[RPM release number]" \
-    "--serial=[RPM serial number]" \
-    "--vendor=[RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") \[default: maintainer or author from setup script\]]" \
-    "--packager=[RPM packager (eg. \"Jane Doe <jane@example.net>\")\[default: vendor\]]" \
-    "--doc-files=[list of documentation files (space or comma-separated)]" \
-    "--changelog=[RPM changelog]" \
-    "--icon=[name of icon file]" \
-    "--provides=[capabilities provided by this package]" \
-    "--requires=[capabilities required by this package]" \
-    "--conflicts=[capabilities which conflict with this package]" \
-    "--build-requires=[capabilities required to build this package]" \
-    "--obsoletes=[capabilities made obsolete by this package]" \
-    "--no-autoreq[do not automatically calculate dependencies]" \
-    "--keep-temp[don't clean up RPM build directory]" \
-    "-k[don't clean up RPM build directory]" \
-    "--no-keep-temp[clean up RPM build directory \[default\]]" \
-    "--use-rpm-opt-flags[compile with RPM_OPT_FLAGS when building from source RPM]" \
-    "--no-rpm-opt-flags[do not pass any RPM CFLAGS to compiler]" \
-    "--rpm3-mode[RPM 3 compatibility mode (default)]" \
-    "--rpm2-mode[RPM 2 compatibility mode]" \
-    "--prep-script=[Specify a script for the PREP phase of RPM building]" \
-    "--build-script=[Specify a script for the BUILD phase of RPM building]" \
-    "--pre-install=[Specify a script for the pre-INSTALL phase of RPM building]" \
-    "--install-script=[Specify a script for the INSTALL phase of RPM building]" \
-    "--post-install=[Specify a script for the post-INSTALL phase of RPM building]" \
-    "--pre-uninstall=[Specify a script for the pre-UNINSTALL phase of RPM building]" \
-    "--post-uninstall=[Specify a script for the post-UNINSTALL phase of RPM building]" \
-    "--clean-script=[Specify a script for the CLEAN phase of RPM building]" \
-    "--verify-script=[Specify a script for the VERIFY phase of the RPM build]" \
-    "--force-arch=[Force an architecture onto the RPM build process]" \
-    "--quiet[Run the INSTALL phase of RPM building in quiet mode]" \
-    "-q[Run the INSTALL phase of RPM building in quiet mode]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_bdist_wininst] )) ||
-_setuppy_bdist_wininst() {
-  _arguments -s \
-    "--bdist-dir=[temporary directory for creating the distribution]" \
-    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
-    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
-    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "--target-version=[require a specific python version on the target system]" \
-    "--no-target-compile[do not compile .py to .pyc on the target system]" \
-    "-c[do not compile .py to .pyc on the target system]" \
-    "--no-target-optimize[do not compile .py to .pyo (optimized)on the target system]" \
-    "-o[do not compile .py to .pyo (optimized)on the target system]" \
-    "--dist-dir=[directory to put final built distributions in]" \
-    "-d[directory to put final built distributions in]" \
-    "--bitmap=[bitmap to use for the installer instead of python-powered logo]" \
-    "-b[bitmap to use for the installer instead of python-powered logo]" \
-    "--title=[title to display on the installer background instead of default]" \
-    "-t[title to display on the installer background instead of default]" \
-    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
-    "--install-script=[basename of installation script to be run afterinstallation or before deinstallation]" \
-    "--pre-install-script=[Fully qualified filename of a script to be run before any files are installed.  This script need not be in the distribution]" \
-    "--user-access-control=[specify Vista's UAC handling - 'none'/default=no handling, 'auto'=use UAC if target Python installed for all users, 'force'=always use UAC]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_upload] )) ||
-_setuppy_upload() {
-  _arguments -s \
-    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "--show-response[display full response text from server]" \
-    "--sign[sign files to upload using gpg]" \
-    "-s[sign files to upload using gpg]" \
-    "--identity=[GPG identity used to sign files]" \
-    "-i[GPG identity used to sign files]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_check] )) ||
-_setuppy_check() {
-  _arguments -s \
-    "--metadata[Verify meta-data]" \
-    "-m[Verify meta-data]" \
-    "--restructuredtext[Checks if long string meta-data syntax are reStructuredText-compliant]" \
-    "-r[Checks if long string meta-data syntax are reStructuredText-compliant]" \
-    "--strict[Will exit with an error if a check fails]" \
-    "-s[Will exit with an error if a check fails]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_alias] )) ||
-_setuppy_alias() {
-  _arguments -s \
-    "--remove[remove (unset) the alias]" \
-    "-r[remove (unset) the alias]" \
-    "--global-config[save options to the site-wide distutils.cfg file]" \
-    "-g[save options to the site-wide distutils.cfg file]" \
-    "--user-config[save options to the current user's pydistutils.cfg file]" \
-    "-u[save options to the current user's pydistutils.cfg file]" \
-    "--filename=[configuration file to use (default=setup.cfg)]" \
-    "-f[configuration file to use (default=setup.cfg)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_bdist_egg] )) ||
-_setuppy_bdist_egg() {
-  _arguments -s \
-    "--bdist-dir=[temporary directory for creating the distribution]" \
-    "-b[temporary directory for creating the distribution]" \
-    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
-    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
-    "--exclude-source-files[remove all .py files from the generated egg]" \
-    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
-    "--dist-dir=[directory to put final built distributions in]" \
-    "-d[directory to put final built distributions in]" \
-    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_develop] )) ||
-_setuppy_develop() {
-  _arguments -s \
-    "--prefix=[installation prefix]" \
-    "--zip-ok[install package as a zipfile]" \
-    "-z[install package as a zipfile]" \
-    "--multi-version[make apps have to require() a version]" \
-    "-m[make apps have to require() a version]" \
-    "--upgrade[force upgrade (searches PyPI for latest versions)]" \
-    "-U[force upgrade (searches PyPI for latest versions)]" \
-    "--install-dir=[install package to DIR]" \
-    "-d[install package to DIR]" \
-    "--script-dir=[install scripts to DIR]" \
-    "-s[install scripts to DIR]" \
-    "--exclude-scripts[Don't install scripts]" \
-    "-x[Don't install scripts]" \
-    "--always-copy[Copy all needed packages to install dir]" \
-    "-a[Copy all needed packages to install dir]" \
-    "--index-url=[base URL of Python Package Index]" \
-    "-i[base URL of Python Package Index]" \
-    "--find-links=[additional URL(s) to search for packages]" \
-    "-f[additional URL(s) to search for packages]" \
-    "--delete-conflicting[no longer needed; don't use this]" \
-    "-D[no longer needed; don't use this]" \
-    "--ignore-conflicts-at-my-risk[no longer needed; don't use this]" \
-    "--build-directory=[download/extract/build in DIR; keep the results]" \
-    "-b[download/extract/build in DIR; keep the results]" \
-    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "--record=[filename in which to record list of installed files]" \
-    "--always-unzip[don't install as a zipfile, no matter what]" \
-    "-Z[don't install as a zipfile, no matter what]" \
-    "--site-dirs=[list of directories where .pth files work]" \
-    "-S[list of directories where .pth files work]" \
-    "--editable[Install specified packages in editable form]" \
-    "-e[Install specified packages in editable form]" \
-    "--no-deps[don't install dependencies]" \
-    "-N[don't install dependencies]" \
-    "--allow-hosts=[pattern(s) that hostnames must match]" \
-    "-H[pattern(s) that hostnames must match]" \
-    "--local-snapshots-ok[allow building eggs from local checkouts]" \
-    "-l[allow building eggs from local checkouts]" \
-    "--version[print version information and exit]" \
-    "--install-layout=[installation layout to choose (known values: deb)]" \
-    "--force-installation-into-system-dir[force installation into /usr]" \
-    "-0[force installation into /usr]" \
-    "--no-find-links[Don't load find-links defined in packages being installed]" \
-    "--user[install in user site-package '/home/hattori/.local/lib/python2.7/site-packages']" \
-    "--uninstall[Uninstall this source package]" \
-    "-u[Uninstall this source package]" \
-    "--egg-path=[Set the path to be used in the .egg-link file]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_easy_install] )) ||
-_setuppy_easy_install() {
-  _arguments -s \
-    "--prefix=[installation prefix]" \
-    "--zip-ok[install package as a zipfile]" \
-    "-z[install package as a zipfile]" \
-    "--multi-version[make apps have to require() a version]" \
-    "-m[make apps have to require() a version]" \
-    "--upgrade[force upgrade (searches PyPI for latest versions)]" \
-    "-U[force upgrade (searches PyPI for latest versions)]" \
-    "--install-dir=[install package to DIR]" \
-    "-d[install package to DIR]" \
-    "--script-dir=[install scripts to DIR]" \
-    "-s[install scripts to DIR]" \
-    "--exclude-scripts[Don't install scripts]" \
-    "-x[Don't install scripts]" \
-    "--always-copy[Copy all needed packages to install dir]" \
-    "-a[Copy all needed packages to install dir]" \
-    "--index-url=[base URL of Python Package Index]" \
-    "-i[base URL of Python Package Index]" \
-    "--find-links=[additional URL(s) to search for packages]" \
-    "-f[additional URL(s) to search for packages]" \
-    "--delete-conflicting[no longer needed; don't use this]" \
-    "-D[no longer needed; don't use this]" \
-    "--ignore-conflicts-at-my-risk[no longer needed; don't use this]" \
-    "--build-directory=[download/extract/build in DIR; keep the results]" \
-    "-b[download/extract/build in DIR; keep the results]" \
-    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
-    "--record=[filename in which to record list of installed files]" \
-    "--always-unzip[don't install as a zipfile, no matter what]" \
-    "-Z[don't install as a zipfile, no matter what]" \
-    "--site-dirs=[list of directories where .pth files work]" \
-    "-S[list of directories where .pth files work]" \
-    "--editable[Install specified packages in editable form]" \
-    "-e[Install specified packages in editable form]" \
-    "--no-deps[don't install dependencies]" \
-    "-N[don't install dependencies]" \
-    "--allow-hosts=[pattern(s) that hostnames must match]" \
-    "-H[pattern(s) that hostnames must match]" \
-    "--local-snapshots-ok[allow building eggs from local checkouts]" \
-    "-l[allow building eggs from local checkouts]" \
-    "--version[print version information and exit]" \
-    "--install-layout=[installation layout to choose (known values: deb)]" \
-    "--force-installation-into-system-dir[force installation into /usr]" \
-    "-0[force installation into /usr]" \
-    "--no-find-links[Don't load find-links defined in packages being installed]" \
-    "--user[install in user site-package '/home/hattori/.local/lib/python2.7/site-packages']" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_egg_info] )) ||
-_setuppy_egg_info() {
-  _arguments -s \
-    "--egg-base=[directory containing .egg-info directories (default: top of the source tree)]" \
-    "-e[directory containing .egg-info directories (default: top of the source tree)]" \
-    "--tag-svn-revision[Add subversion revision ID to version number]" \
-    "-r[Add subversion revision ID to version number]" \
-    "--tag-date[Add date stamp (e.g. 20050528) to version number]" \
-    "-d[Add date stamp (e.g. 20050528) to version number]" \
-    "--tag-build=[Specify explicit tag to add to version number]" \
-    "-b[Specify explicit tag to add to version number]" \
-    "--no-svn-revision[Don't add subversion revision ID \[default\]]" \
-    "-R[Don't add subversion revision ID \[default\]]" \
-    "--no-date[Don't include date stamp \[default\]]" \
-    "-D[Don't include date stamp \[default\]]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_rotate] )) ||
-_setuppy_rotate() {
-  _arguments -s \
-    "--match=[patterns to match (required)]" \
-    "-m[patterns to match (required)]" \
-    "--dist-dir=[directory where the distributions are]" \
-    "-d[directory where the distributions are]" \
-    "--keep=[number of matching distributions to keep]" \
-    "-k[number of matching distributions to keep]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_saveopts] )) ||
-_setuppy_saveopts() {
-  _arguments -s \
-    "--global-config[save options to the site-wide distutils.cfg file]" \
-    "-g[save options to the site-wide distutils.cfg file]" \
-    "--user-config[save options to the current user's pydistutils.cfg file]" \
-    "-u[save options to the current user's pydistutils.cfg file]" \
-    "--filename=[configuration file to use (default=setup.cfg)]" \
-    "-f[configuration file to use (default=setup.cfg)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_setopt] )) ||
-_setuppy_setopt() {
-  _arguments -s \
-    "--command=[command to set an option for]" \
-    "-c[command to set an option for]" \
-    "--option=[option to set]" \
-    "-o[option to set]" \
-    "--set-value=[value of the option]" \
-    "-s[value of the option]" \
-    "--remove[remove (unset) the value]" \
-    "-r[remove (unset) the value]" \
-    "--global-config[save options to the site-wide distutils.cfg file]" \
-    "-g[save options to the site-wide distutils.cfg file]" \
-    "--user-config[save options to the current user's pydistutils.cfg file]" \
-    "-u[save options to the current user's pydistutils.cfg file]" \
-    "--filename=[configuration file to use (default=setup.cfg)]" \
-    "-f[configuration file to use (default=setup.cfg)]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_test] )) ||
-_setuppy_test() {
-  _arguments -s \
-    "--test-module=[Run 'test_suite' in specified module]" \
-    "-m[Run 'test_suite' in specified module]" \
-    "--test-suite=[Test suite to run (e.g. 'some_module.test_suite')]" \
-    "-s[Test suite to run (e.g. 'some_module.test_suite')]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_install_egg_info] )) ||
-_setuppy_install_egg_info() {
-  _arguments -s \
-    "--install-dir=[directory to install to]" \
-    "-d[directory to install to]" \
-    "*::setup.py commands:_setuppy"
-}
-
-(( $+functions[_setuppy_upload_docs] )) ||
-_setuppy_upload_docs() {
-  _arguments -s \
-    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
-    "--show-response[display full response text from server]" \
-    "--upload-dir=[directory to upload]" \
-    "*::setup.py commands:_setuppy"
-}
-
-_setup.py "$@"
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 2
-# indent-tabs-mode: nil
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et

zsh.d/prompts/pure

@@ -1 +1 @@
-Subproject commit da1a722238febb9a4b97c77628fae753d1817490
+Subproject commit 92b8e9057988566b37ff695e70e2e9bbeb7196c8

zshrc

@@ -6,43 +6,36 @@
 #
 # Global Order: zshenv, zprofile, zshrc, zlogin
 #
+#
 
 # Load zprof if we need to profile startup time
 # at the bottom of ~/.zshrc add `zprof >! zsh_profile` to save
 # profiling data at startup
 # zmodload zsh/zprof
 
-# Determine zsh conf file position. On Debian/Ubuntu is /etc/zsh, on other should be /etc
-#
-[ -d /etc/zsh ] && BASE="/etc/zsh" || BASE="/etc"
+# Default PATH
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$HOME/bin"
+
+# Determine zsh conf file position.
+local BASE="/etc"
+
+# On Debian/Ubuntu is /etc/zsh, on other should be /etc
+[ -d /etc/zsh ] && BASE="/etc/zsh"
 
 # If there is a .zsh directory into user's home, use that one instead (local install)
 [ -d ~/.zsh ] && BASE=~/.zsh
 
-function loadRC {
-  [ -d $1/zshfunctions ] && fpath=($1/zshfunctions $fpath)
-  [ -d $1/completions ] && fpath=($1/completions $fpath)
 
-  for zshFile in $1/[0-9]*.zsh; do
+local LIBRARY=${BASE}/zsh.d
+local KERNLIB=${LIBRARY}/$(uname -s)
+
+for lib in $KERNLIB $LIBRARY; do
+  [ -d $lib/zshfunctions ] && fpath=($lib/zshfunctions $fpath)
+  [ -d $lib/completions ] && fpath=($lib/completions $fpath)
+
+  for zshFile in $lib/[0-9]*.zsh; do
+    # echo $zshFile
     source $zshFile
   done
-}
-
-# Default PATH
-PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
-
-local KERNEL=`uname -s`
-local LIBRARY=${BASE}/zsh.d
-local KERNLIB=${LIBRARY}/${KERNEL}
-
-loadRC ${KERNLIB}
-loadRC ${LIBRARY}
-
-# Add home bin to PATH
-PATH="$PATH:$HOME/bin"
-
-# Add local customization file
-if [ -w $LIBRARY ]; then
-  [ -f $LIBRARY/99-local.zsh ] || echo "# Local customizations" > $LIBRARY/99-local.zsh
-fi
+done