Aliases to digital sign/verify commits and tags

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>

modules/git/alias.zsh

@@ -55,6 +55,8 @@ alias gcr='git revert'
 alias gcR='git reset "HEAD^"'
 alias gcs='git show'
 alias gcl='git-commit-lost'
+alias gcS='git commit -S'
+alias gpS='git show --pretty=short --show-signature'
 
 # Conflict (C)
 alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
@@ -107,6 +109,7 @@ alias glo='git log --topo-order --pretty=format:${_git_log_oneline_format}'
 alias glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
 alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
 alias glc='git shortlog --summary --numbered'
+alias glS='git log --show-signature'
 
 # Merge (m)
 alias gm='git merge'
@@ -168,6 +171,10 @@ alias gSs='git submodule sync'
 alias gSu='git submodule foreach git pull origin master'
 alias gSx='git-submodule-remove'
 
+# Tag (t)
+alias gts='git tag -s'
+alias gtv='git verify-tag'
+
 # Working Copy (w)
 alias gws='git status --ignore-submodules=${_git_status_ignore_submodules} --short'
 alias gwS='git status --ignore-submodules=${_git_status_ignore_submodules}'

modules/git/functions/git-info

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

modules/perl/README.md

@@ -30,10 +30,6 @@ Perlbrew
 An alternative to the above is to use [Perlbrew][2], which allows for the
 management of multiple, isolated Perl installations in the home directory.
 
-You can specify the perlbrew location so the environment is automatically loaded.
-
-    zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
-
 Aliases
 -------
 

modules/perl/init.zsh

@@ -29,13 +29,6 @@ if [[ "$OSTYPE" == darwin* ]]; then
 
   unset perl_path
   unset cache_file
-
-  # Perlbrew
-  zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root' 
-  if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
-    export PERLBREW_ROOT="${_perlbrew_root}"
-    source "${_perlbrew_root}/etc/bashrc"
-  fi
 fi
 
 #

modules/python/init.zsh

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

modules/screen/init.zsh

@@ -15,7 +15,7 @@ fi
 # Auto Start
 #
 
-if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
+if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
 ); then

modules/tmux/README.md

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

modules/tmux/init.zsh

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

runcoms/zpreztorc

@@ -152,4 +152,3 @@ zstyle ':prezto:module:prompt' theme 'sorin'
 
 # Auto start a session when Zsh is launched in a SSH connection.
 # zstyle ':prezto:module:tmux:auto-start' remote 'yes'
-