Merge remote-tracking branch 'upstream/master'

README.md

@@ -6,6 +6,8 @@ and prompt themes.
 
 ## Installation
 
+### Manual
+
 Prezto will work with any recent release of Zsh, but the minimum required
 version is **4.3.11**.
 
@@ -71,6 +73,14 @@ version is **4.3.11**.
 
 05. Open a new Zsh terminal window or tab.
 
+### [Fig](https://fig.io)
+
+Fig adds apps, shortcuts, and autocomplete to your existing terminal.
+
+Install `prezto` in just one click.
+
+<a href="https://fig.io/plugins/other/prezto" target="_blank"><img src="https://fig.io/badges/install-with-fig.svg" /></a>
+
 ### Troubleshooting
 
 If you are not able to find certain commands after switching to Prezto, modify

modules/completion/external

@@ -1 +1 @@
-Subproject commit 11ad0a45ff1695cac00e86c687cce6fa1fd1cdbd
+Subproject commit 0331b2908f93556453e45fa5a899aa21e0a7f64d

modules/docker/alias.zsh

@@ -152,26 +152,26 @@ alias dkmv='docker-machine version'
 alias dkmx='docker-machine stop'
 
 # Docker Compose (c)
-alias dkc='docker-compose'
+alias dkc='docker compose'
-alias dkcb='docker-compose build'
+alias dkcb='docker compose build'
-alias dkcB='docker-compose build --no-cache'
+alias dkcB='docker compose build --no-cache'
-alias dkcd='docker-compose down'
+alias dkcd='docker compose down'
-alias dkce='docker-compose exec'
+alias dkce='docker compose exec'
-alias dkck='docker-compose kill'
+alias dkck='docker compose kill'
-alias dkcl='docker-compose logs'
+alias dkcl='docker compose logs'
-alias dkcls='docker-compose ps'
+alias dkcls='docker compose ps'
-alias dkcp='docker-compose pause'
+alias dkcp='docker compose pause'
-alias dkcP='docker-compose unpause'
+alias dkcP='docker compose unpause'
-alias dkcpl='docker-compose pull'
+alias dkcpl='docker compose pull'
-alias dkcph='docker-compose push'
+alias dkcph='docker compose push'
-alias dkcps='docker-compose ps'
+alias dkcps='docker compose ps'
-alias dkcr='docker-compose run'
+alias dkcr='docker compose run'
-alias dkcR='docker-compose run --rm'
+alias dkcR='docker compose run --rm'
-alias dkcrm='docker-compose rm'
+alias dkcrm='docker compose rm'
-alias dkcs='docker-compose start'
+alias dkcs='docker compose start'
-alias dkcsc='docker-compose scale'
+alias dkcsc='docker compose scale'
-alias dkcS='docker-compose restart'
+alias dkcS='docker compose restart'
-alias dkcu='docker-compose up'
+alias dkcu='docker compose up'
-alias dkcU='docker-compose up -d'
+alias dkcU='docker compose up -d'
-alias dkcv='docker-compose version'
+alias dkcv='docker compose version'
-alias dkcx='docker-compose stop'
+alias dkcx='docker compose stop'

modules/ssh/init.zsh

@@ -52,9 +52,9 @@ if ssh-add -l 2>&1 | grep -q 'The agent has no identities'; then
   # program specified by SSH_ASKPASS and open an X11 window to read the
   # passphrase.
   if [[ -n "$DISPLAY" && -x "$SSH_ASKPASS" ]]; then
-    ssh-add ${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}} < /dev/null 2> /dev/null
+    ssh-add ${_ssh_identities:+$_ssh_dir/${^~_ssh_identities[@]}} < /dev/null 2> /dev/null
   else
-    ssh-add ${_ssh_identities:+$_ssh_dir/${^_ssh_identities[@]}} 2> /dev/null
+    ssh-add ${_ssh_identities:+$_ssh_dir/${^~_ssh_identities[@]}} 2> /dev/null
   fi
 fi
 

modules/utility/init.zsh

@@ -196,12 +196,14 @@ fi
 # Serves a directory via HTTP.
 if (( $#commands[(i)python(|[23])] )); then
   autoload -Uz is-at-least
-  if is-at-least 3 ${"$(python --version 2>&1)"[(w)2]}; then
+  if (( $+commands[python3] )); then
-    alias http-serve='python -m http.server'
-  elif (( $+commands[python3] )); then
     alias http-serve='python3 -m http.server'
+  elif (( $+commands[python2] )); then
+    alias http-serve='python2 -m SimpleHTTPServer'
+  elif is-at-least 3 ${"$(python --version 2>&1)"[(w)2]}; then
+    alias http-serve='python -m http.server'
   else
-    alias http-serve='$commands[(i)python(|2)] -m SimpleHTTPServer'
+    alias http-serve='python -m SimpleHTTPServer'
   fi
 fi