Merge branch 'master' into master

plugins/nyan/nyan.plugin.zsh

-if [[ -x `which nc` ]]; then
-  alias nyan='nc -v nyancat.dakko.us 23' # nyan cat
-fi
-
-
+print -Pn '%F{yellow}'
+cat >&2 <<-EOD
+	nyan plugin:
+	The nyancat server used by this plugin was shut down due to increased
+	bandwidth costs, so the nyan plugin no longer works. You can get the
+	same functionality in some distributions by installing the nyancat package,
+	or you can compile it yourself.
+	See https://github.com/klange/nyancat for more information.
+EOD
+print -Pn '%f'

plugins/osx/README.md

@@ -42,19 +42,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Commands
 
-| Command         | Description                                      |
-| :-------------- | :----------------------------------------------- |
-| `tab`           | Open the current directory in a new tab          |
-| `split_tab`     | Split the current terminal tab horizontally      |
-| `vsplit_tab`    | Split the current terminal tab vertically        |
-| `ofd`           | Open the current directory in a Finder window    |
-| `pfd`           | Return the path of the frontmost Finder window   |
-| `pfs`           | Return the current Finder selection              |
-| `cdf`           | `cd` to the current Finder directory             |
-| `pushdf`        | `pushd` to the current Finder directory          |
-| `quick-look`    | Quick-Look a specified file                      |
-| `man-preview`   | Open a specified man page in Preview app         |
-| `showfiles`     | Show hidden files                                |
-| `hidefiles`     | Hide the hidden files                            |
-| `itunes`        | Control iTunes. User `itunes -h` for usage details |
-| `spotify`       | Control Spotify and search by artist, album, track and etc.|
+| Command         | Description                                         |
+| :-------------- | :-------------------------------------------------- |
+| `tab`           | Open the current directory in a new tab             |
+| `split_tab`     | Split the current terminal tab horizontally         |
+| `vsplit_tab`    | Split the current terminal tab vertically           |
+| `ofd`           | Open the current directory in a Finder window       |
+| `pfd`           | Return the path of the frontmost Finder window      |
+| `pfs`           | Return the current Finder selection                 |
+| `cdf`           | `cd` to the current Finder directory                |
+| `pushdf`        | `pushd` to the current Finder directory             |
+| `quick-look`    | Quick-Look a specified file                         |
+| `man-preview`   | Open a specified man page in Preview app            |
+| `showfiles`     | Show hidden files                                   |
+| `hidefiles`     | Hide the hidden files                               |
+| `itunes`        | Control iTunes. Use `itunes -h` for usage details   |
+| `spotify`       | Control Spotify and search by artist, album, track… |
+| `rmdsstore`     | Remove .DS\_Store files recursively in a directory  |

plugins/osx/osx.plugin.zsh

@@ -51,6 +51,17 @@ EOF
           end tell
         end tell
 EOF
+  elif [[ "$the_app" == 'Hyper' ]]; then
+    osascript >/dev/null <<EOF
+          tell application "System Events"
+            tell process "Hyper" to keystroke "t" using command down
+          end tell
+          delay 1
+          tell application "System Events"
+              keystroke "${command}"
+              key code 36  #(presses enter)
+            end tell
+EOF
 
   else
     echo "tab: unsupported terminal app: $the_app"
@@ -91,6 +102,19 @@ EOF
           end tell
         end tell
 EOF
+  
+  elif [[ "$the_app" == 'Hyper' ]]; then
+      osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Hyper"
+          tell menu item "Split Vertically" of menu "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        delay 1
+        keystroke "${command} \n"
+      end tell
+EOF
 
   else
     echo "$0: unsupported terminal app: $the_app" >&2
@@ -132,6 +156,19 @@ EOF
         end tell
 EOF
 
+  elif [[ "$the_app" == 'Hyper' ]]; then
+      osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Hyper"
+          tell menu item "Split Horizontally" of menu "Shell" of menu bar 1
+            click
+          end tell
+        end tell
+        delay 1
+        keystroke "${command} \n"
+      end tell
+EOF
+
   else
     echo "$0: unsupported terminal app: $the_app" >&2
     false
@@ -209,7 +246,7 @@ if [[ ! -z "$playlist" ]]; then
 					opt="play"
 				else
 					opt="stop"
-				fi	
+				fi
                   else
                     opt="set allPlaylists to (get name of every playlist)"
                   fi
@@ -241,7 +278,7 @@ if [[ ! -z "$playlist" ]]; then
 
 			case "$state" in
 				on|off)
-					# Inspired by: http://stackoverflow.com/a/14675583
+					# Inspired by: https://stackoverflow.com/a/14675583
 					osascript 1>/dev/null 2>&1 <<-EOF
 					tell application "System Events" to perform action "AXPress" of (menu item "${state}" of menu "Shuffle" of menu item "Shuffle" of menu "Controls" of menu bar item "Controls" of menu bar 1 of application process "iTunes" )
 EOF
@@ -282,3 +319,8 @@ source ${ZSH}/plugins/osx/spotify
 # Show/hide hidden files in the Finder
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
 alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
+
+# Remove .DS_Store files recursively in a directory, default .
+function rmdsstore() {
+	find "${@:-.}" -type f -name .DS_Store -delete
+}

plugins/osx/spotify

 #!/usr/bin/env bash
 
 function spotify() {
-# Copyright (c) 2012--2017 Harish Narayanan <mail@harishnarayanan.org>
+# Copyright (c) 2012--2018 Harish Narayanan <mail@harishnarayanan.org>
 #
 # Contains numerous helpful contributions from Jorge Colindres, Thomas
 # Pritchard, iLan Epstein, Gabriele Bonetti, Sean Heller, Eric Martin
@@ -134,8 +134,13 @@ showStatus () {
 if [ $# = 0 ]; then
     showHelp;
 else
+	if [ ! -d /Applications/Spotify.app ] && [ ! -d $HOME/Applications/Spotify.app ]; then
+		echo "The Spotify application must be installed."
+		exit 1
+	fi
+
     if [ $(osascript -e 'application "Spotify" is running') = "false" ]; then
-        osascript -e 'tell application "Spotify" to activate'
+        osascript -e 'tell application "Spotify" to activate' || exit 1
         sleep 2
     fi
 fi
@@ -160,7 +165,7 @@ while [ $# -gt 0 ]; do
                     showAPIHelp;
                     exit 1;
                 fi
-                SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n");
+                SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n"|tr -d '\r');
                 SPOTIFY_PLAY_URI="";
 
                 getAccessToken() {
@@ -408,7 +413,7 @@ while [ $# -gt 0 ]; do
             uri=`osascript -e 'tell application "Spotify" to spotify url of current track'`;
             remove='spotify:track:'
             url=${uri#$remove}
-            url="http://open.spotify.com/track/$url"
+            url="https://open.spotify.com/track/$url"
 
             if [ "$2" = "" ]; then
                 cecho "Spotify URL: $url"

plugins/otp/otp.plugin.zsh

+export OTP_HOME=~/.otp
+mkdir -p $OTP_HOME
+
+function ot () {
+  if ! command -v oathtool > /dev/null 2>&1; then
+    echo "Note: you need to install oathtool or oath-toolkit, depending on your OS or distribution."
+    return 1
+  fi
+
+  if ! command -v gpg > /dev/null 2>&1; then
+    echo "Note: you need to install gpg and create an ID using 'gpg --gen-key', unless you have one already."
+    return 1
+  fi
+
+  if [[ `uname` == 'Darwin' ]] then # MacOS X
+    export COPY_CMD='pbcopy'
+  elif command -v xsel > /dev/null 2>&1; then # Any Unix with xsel installed
+    export COPY_CMD='xsel --clipboard --input'
+  else
+    COPY_CMD='true'
+  fi
+
+  if [[ "x$1" == "x" ]]; then
+    echo "usage: otpw <profile.name>"
+    return 1
+  elif [ ! -f $OTP_HOME/$1.otp.asc ]; then
+    echo "missing profile $1, you might need to create it first using otp_add_device"
+    return 1
+  else
+    totpkey=$(gpg --decrypt $OTP_HOME/$1.otp.asc)
+    oathtool --totp --b $totpkey | tee /dev/stderr | `echo $COPY_CMD`
+    if [[ $COPY_CMD == 'true' ]] then
+      echo "Note: you might consider installing xsel for clipboard integration"
+    fi
+  fi
+}
+
+function otp_add_device () {
+  if [[ "x$1" == "x" ]] then
+    echo "usage: otp_add <profile.name>"
+    return 1
+  else
+    echo "Enter an email address attached to your GPG private key, then paste the secret configuration key followed by ^D"
+
+    rm -f $OTP_HOME/$1.otp.asc
+    gpg --armor --encrypt --output $OTP_HOME/$1.otp.asc /dev/stdin
+  fi
+}
+
+function otp_devices () {
+  reply=($(find $OTP_HOME -name \*.otp.asc | xargs basename -s .otp.asc))
+}
+
+compctl -K otp_devices ot

plugins/pass/_pass

@@ -6,11 +6,17 @@
 #    Brian Mattern <rephorm@rephorm.com>
 #    Jason A. Donenfeld <Jason@zx2c4.com>.
 # All Rights Reserved.
-#
 # This file is licensed under the GPLv2+.
-# Please visit http://git.zx2c4.com/password-store/tree/COPYING for more information.
+# Please visit https://git.zx2c4.com/password-store/tree/COPYING for more information.
+
+
+# If you use multiple repositories, you can configure completion like this:
 #
-# Oh my zsh plugin maintainer: Santiago Borrazás <sanbor@gmail.com>
+# compdef _pass workpass
+# zstyle ':completion::complete:workpass::' prefix "$HOME/work/pass"
+# workpass() {
+#   PASSWORD_STORE_DIR=$HOME/work/pass pass $@
+# }
 
 
 _pass () {
@@ -117,8 +123,9 @@ _pass_cmd_show () {
 }
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
-	local prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' | sort):-""}
+	local prefix
+	zstyle -s ":completion:${curcontext}:" prefix prefix || prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {

plugins/pep8/README.md

+# pep8 plugin
+
+This plugin adds completion for [pep8](https://pep8.readthedocs.io/en/release-1.7.x/#), a tool to check your Python code against some of the style conventions in [PEP 8](http://www.python.org/dev/peps/pep-0008/).
+
+To use it, add pep8 to the plugins array of your zshrc file:
+```
+plugins=(... pep8)
+```

plugins/per-directory-history/README.md

-[Per-Directory-History][6]
-=========================
+per-directory-history plugin
+----------------------------
 
-Per directory history for zsh, as well as global history, and the
-ability to toggle between them with ^G.
+This plugin adds per-directory history for zsh, as well as a global history,
+and the ability to toggle between them with a keyboard shortcut. This is a
+bundle of the [official plugin by @jimhester][5].
 
-This is a implementation of per directory history for zsh, some 
-implementations of which exist in bash[1][],[2][].  It also implements 
-a per-directory-history-toggle-history function to change from using the 
-directory history to using the global history.  In both cases the history is 
-always saved to both the global history and the directory history, so the 
-toggle state will not effect the saved histories.  Being able to switch 
-between global and directory histories on the fly is a novel feature as far 
-as I am aware.
+To use it, add `per-directory-history` to the plugins array in your zshrc file:
 
-This is a standalone repository for the script, however it is also included in
-[oh-my-zsh][4] as a plugin.
+```zsh
+plugins=(... per-directory-history)
+```
 
-----------------------------------------------------------------------------
-Usage
-----------------------------------------------------------------------------
+This is an implementation of per-directory history for zsh, some implementations
+of which exist in bash[1][],[2][]. It also implements a toggle-history function
+to change from using the directory history to using the global history. In both
+cases the history is always saved to both the global history and the directory
+history, so the toggle state will not effect the saved histories. Being able to
+switch between global and directory histories on the fly is a novel feature.
 
-1.  Load this script into your interactive ZSH session:
+## Usage
 
-        % source zsh-per-directory-history.zsh
+The default mode is per directory history, interact with your history as normal.
 
-2.  The default mode if per directory history, interact with your history as normal.
+Press ^G (the <kbd>Control</kbd> and <kbd>G</kbd> keys simultaneously) to toggle
+between local and global histories. If you would prefer a different shortcut to
+toggle set the `PER_DIRECTORY_HISTORY_TOGGLE` environment variable.
 
-3.  Press ^G (the Control and G keys simultaneously) to toggle between local
-    and global histories.  If you would prefer a different shortcut to toggle
-    set the PER_DIRECTORY_HISTORY_TOGGLE environment variable.
+## Configuration
 
--------------------------------------------------------------------------------
-Configuration
--------------------------------------------------------------------------------
+* `HISTORY_BASE` is a global variable that defines the base directory in which the
+  directory histories are stored (default `$HOME/.directory_history`).
+* `per-directory-history-toggle-history` is the function to toggle between local
+  and global histories.
+* `PER_DIRECTORY_HISTORY_TOGGLE` is the key binding used to run the toggle-history
+  function above (default `^G`)
 
-* HISTORY_BASE a global variable that defines the base directory in which the 
-  directory histories are stored
-* per-directory-history-toggle-history is the function to toggle the history
+## History
 
--------------------------------------------------------------------------------
-History
--------------------------------------------------------------------------------
-
-The idea/inspiration for a per directory history is from [Stewart MacArthur][1] 
-and [Dieter][2], the implementation idea is from [Bart Schaefer][3].  The 
-implementation is by [Jim Hester][5] in September 2012.
+The idea/inspiration for a per directory history is from [Stewart MacArthur][1]
+and [Dieter][2], the implementation idea is from [Bart Schaefer][3]. The
+implementation is by [Jim Hester][4] in September 2012.
 
 [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
 [2]: http://dieter.plaetinck.be/per_directory_bash
-[3]: http://www.zsh.org/mla/users/1997/msg00226.html
-[4]: https://github.com/robbyrussell/oh-my-zsh
-[5]: http://jimhester.com
-[6]: http://github.com/jimhester/per-directory-history
-
+[3]: https://www.zsh.org/mla/users/1997/msg00226.html
+[4]: https://jimhester.com
+[5]: https://github.com/jimhester/per-directory-history

plugins/per-directory-history/per-directory-history.zsh

@@ -109,8 +109,13 @@ function _per-directory-history-change-directory() {
 }
 
 function _per-directory-history-addhistory() {
-  print -Sr -- "${1%%$'\n'}"
-  fc -p $_per_directory_history_directory
+  # respect hist_ignore_space
+  if [[ -o hist_ignore_space ]] && [[ "$1" == \ * ]]; then
+      true
+  else
+      print -Sr -- "${1%%$'\n'}"
+      fc -p $_per_directory_history_directory
+  fi
 }
 
 

plugins/percol/README.md

+## percol
+
+Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh)
+
+### Requirements
+
+```shell
+pip install percol
+```
+
+And [jump](https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
+
+### Usage
+
+For default
+
+- `^-r` bind to `percol_select_history`.You can use it to grep your history with percol.
+
+- `^-b` bind to `percol_select_marks`.You can use it to grep your bookmarks with percol.
+

plugins/percol/percol.plugin.zsh

+if which percol &> /dev/null; then
+    function percol_select_history() {
+        local tac
+        which gtac &> /dev/null && tac="gtac" || { which tac &> /dev/null && tac="tac" || { tac="tail -r" } }
+        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
+        CURSOR=$#BUFFER
+        zle -R -c
+    }
+
+    zle -N percol_select_history
+    bindkey '^R' percol_select_history
+
+    if which marks &> /dev/null; then
+        function percol_select_marks() {
+            BUFFER=$(marks | percol --query "$LBUFFER" | awk '{print $3}')
+            CURSOR=$#BUFFER # move cursor
+            zle -R -c       # refresh
+        }
+        zle -N percol_select_marks
+        bindkey '^B' percol_select_marks
+    fi
+fi

plugins/perl/perl.plugin.zsh

@@ -21,7 +21,7 @@ alias pd='perldoc'
 alias ple='perl -wlne'
 
 # show the latest stable release of Perl
-alias latest-perl='curl -s http://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
+alias latest-perl='curl -s https://www.perl.org/get.html | perl -wlne '\''if (/perl\-([\d\.]+)\.tar\.gz/) { print $1; exit;}'\'
 
 
 

plugins/perms/README.md

@@ -4,6 +4,6 @@ Plugin to handle some unix filesystem permissions quickly
 
 ### Usage
 
-* `set755` recursively sets all directories located within the current working directory and sub directories to octal 755.
-* `set644` recursively sets all files located within the current working directory and sub directories to octal 644.
-* `fixperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise. It also prompts prior to execution unlike the other two  aliases.
+* `set755` recursively sets all given directories (default to .) to octal 755.
+* `set644` recursively sets all given files (default to .) to octal 644.
+* `fixperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise. It also prompts prior to execution unlike the other two  aliases.
\ No newline at end of file

plugins/perms/perms.plugin.zsh

@@ -6,10 +6,14 @@
 ### Aliases
 
 # Set all files' permissions to 644 recursively in a directory
-alias set644='find . -type f ! -perm 644 -print0 | xargs -0 chmod 644'
+set644() {
+	find "${@:-.}" -type f ! -perm 644 -print0 | xargs -0 chmod 644
+}
 
 # Set all directories' permissions to 755 recursively in a directory
-alias set755='find . -type d ! -perm 755 -print0 | xargs -0 chmod 755'
+set755() {
+	find "${@:-.}" -type d ! -perm 755 -print0 | xargs -0 chmod 755
+}
 
 ### Functions
 

plugins/pip/pip.plugin.zsh

@@ -10,7 +10,7 @@
 # "zsh-pip-clear-cache".
 
 ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
-ZSH_PIP_INDEXES=(https://pypi.python.org/simple/)
+ZSH_PIP_INDEXES=(https://pypi.org/simple/)
 
 zsh-pip-clear-cache() {
   rm $ZSH_PIP_CACHE_FILE
@@ -31,7 +31,7 @@ zsh-pip-cache-packages() {
       tmp_cache=/tmp/zsh_tmp_cache
       for index in $ZSH_PIP_INDEXES ; do
           # well... I've already got two problems
-          curl $index 2>/dev/null | \
+          curl -L $index 2>/dev/null | \
               zsh-pip-clean-packages \
                >> $tmp_cache
       done

plugins/pipenv/README.md

+# Pipenv
+
+## Installation
+In your `.zshrc` file, add `pipenv` to the plugins section
+
+```
+plugins=(... pipenv ...)
+```
+
+## Features
+This plugin provides some features to simplify the use of Pipenv while working on ZSH. 
+- Adds completion for pipenv
+- Auto activates and deactivates pipenv shell
+- Adds short aliases for common pipenv commands
+  - `pch` is aliased to `pipenv check`
+  - `pcl` is aliased to `pipenv clean`
+  - `pgr` is aliased to `pipenv graph`
+  - `pi` is aliased to `pipenv install`
+  - `pidev` is aliased to `pipenv install --dev`
+  - `pl` is aliased to `pipenv lock`
+  - `po` is aliased to `pipenv open`
+  - `prun` is aliased to `pipenv run`
+  - `psh` is aliased to `pipenv shell`
+  - `psy` is aliased to `pipenv sync`
+  - `pu` is aliased to `pipenv uninstall`
+  - `pwh` is aliased to `pipenv --where`
+  - `pvenv` is aliased to `pipenv --venv`
+  - `ppy` is aliased to `pipenv --py`

plugins/pipenv/pipenv.plugin.zsh

+# Pipenv completion
+_pipenv() {
+  eval $(env COMMANDLINE="${words[1,$CURRENT]}" _PIPENV_COMPLETE=complete-zsh  pipenv)
+}
+compdef _pipenv pipenv
+
+# Automatic pipenv shell activation/deactivation
+_togglePipenvShell() {
+  # deactivate shell if Pipfile doesn't exist and not in a subdir
+  if [[ ! -a "$PWD/Pipfile" ]]; then
+    if [[ "$PIPENV_ACTIVE" == 1 ]]; then
+      if [[ "$PWD" != "$pipfile_dir"* ]]; then
+        exit
+      fi
+    fi
+  fi
+
+  # activate the shell if Pipfile exists
+  if [[ "$PIPENV_ACTIVE" != 1 ]]; then
+    if [[ -a "$PWD/Pipfile" ]]; then
+      export pipfile_dir="$PWD"
+      pipenv shell
+    fi
+  fi
+}
+chpwd_functions+=(_togglePipenvShell)
+
+# Aliases
+alias pch="pipenv check"
+alias pcl="pipenv clean"
+alias pgr="pipenv graph"
+alias pi="pipenv install"
+alias pidev="pipenv install --dev"
+alias pl="pipenv lock"
+alias po="pipenv open"
+alias prun="pipenv run"
+alias psh="pipenv shell"
+alias psy="pipenv sync"
+alias pu="pipenv uninstall"
+alias pwh="pipenv --where"
+alias pvenv="pipenv --venv"
+alias ppy="pipenv --py"

plugins/please/README.md

+# please plugin
+
+[Please](https://please.build) is a cross-language build system with an emphasis on
+high performance, extensibility and reproduceability. It supports a number of popular
+languages and can automate nearly any aspect of your build process.
+
+This plugin adds autocomplete and major aliases for `plz`, the command line tool for
+Please.
+
+To use it, add `please` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... please)
+```
+
+## Aliases
+
+| Alias | Command     |
+|-------|-------------|
+| `pb`  | `plz build` |
+| `pt`  | `plz test`  |
+| `pw`  | `plz watch` |
+
+## Maintainer
+
+[@thought-machine](https://github.com/thought-machine)

plugins/please/please.plugin.zsh

+if (( $+commands[plz] )); then
+    source <(plz --completion_script)
+fi
+
+alias pb='plz build'
+alias pt='plz test'
+alias pw='plz watch'

plugins/pod/_pod

@@ -7,7 +7,7 @@
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
 #   DESCRIPTION:  Cocoapods (0.33.1) autocomplete plugin for Oh-My-Zsh
-#                 http://cocoapods.org
+#                 https://cocoapods.org
 #                 Generated with `pod --completion-script
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
 #        GITHUB:  https://github.com/mekanics