X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=zsh%2Frc;h=ca125967f14840a584ef057b9de0ad8c87d8a0d5;hb=b461c7e7165cf9e403a4d0dbeba79dfa0bbc968d;hp=ccc8ea7638fcb3f85cca76e3fbe2e77f724687a9;hpb=63303c2286c404830994aa1a7f7f62dc1e2be248;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index ccc8ea7..ca12596 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,5 +1,20 @@
# Zsh configuration file.
+# Copyright (C) 2011-2012 Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file. If not, see .
+
source_debug ". ~/.zsh/rc"
@@ -313,21 +328,21 @@ $green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \
add-zsh-hook precmd prompt_precmd
-# When screen, xterm or rxvt is used set the name of the window to the
+# When screen, tmux, xterm or rxvt is used set the name of the window to the
# currently running program.
#
# When a program is started preexec() sets the window's name to it; when it
# stops precmd() resets the window's name to 'zsh'. 'fg' is supported and sets
# the window's name to the resumed job.
#
-# It works with screen, xterm and rxvt.
+# It works with screen, tmux, xterm and rxvt.
#
# If a command is run with sudo or if the shell is running as root then a ! is
# added at the beginning of the command to make this clear. If a command is
# running on a different computer with ssh a @ is added at the beginning. If
-# screen is running on the remote machine instead of @screen @:hostname
-# (hostname replaced by the machine's hostname) is displayed. This only works
-# if the .zshrc on the server also uses this command.
+# screen/tmux is running on the remote machine instead of @screen @:hostname
+# (or @tmux ..; hostname replaced by the machine's hostname) is displayed.
+# This only works if the .zshrc on the server also uses this command.
#
# screen* is necessary as `screen` uses screen.linux for example for a linux
# console.
@@ -355,7 +370,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# Replace fg with the resumed job name.
if [[ $program_name == fg ]]; then
program_name=${jobtexts[%+]}
- elif [[ $program_name == fg* ]]; then
+ elif [[ $program_name == fg\ * ]]; then
program_name=${jobtexts[${program_name#fg }]}
fi
@@ -396,10 +411,10 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# If screen is running in SSH then display "@:hostname" as title
# in the term/outer screen.
- if [[ $program_name == @screen ]]; then
+ if [[ $program_name == @screen || $program_name == @tmux ]]; then
program_name="@:${HOST//.*/}"
# Use "@:!hostname" for root screens.
- elif [[ $program_name == @!screen ]]; then
+ elif [[ $program_name == @!screen || $program_name == @!tmux ]]; then
program_name="@:!${HOST//.*/}"
fi
fi
@@ -436,9 +451,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
window_reset=
}
- # Sets the window title. Works with screen, xterm and rxvt. (V) escapes
- # all non-printable characters. Thanks to Mikachu in #zsh on Freenode
- # (2010-08-07 17:09 CEST).
+ # Sets the window title. Works with screen, tmux (which uses screen as
+ # TERM), xterm and rxvt. (V) escapes all non-printable characters. Thanks
+ # to Mikachu in #zsh on Freenode (2010-08-07 17:09 CEST).
if [[ $TERM == screen* ]]; then
window_title() {
print -n "\ek${(V)1}\e\\"
@@ -494,10 +509,20 @@ setopt completeinword
zstyle ':completion:::::' completer \
_expand _complete _prefix _ignored _approximate
-# Try uppercase if the currently typed string doesn't match. This allows
-# typing in lowercase most of the time and completion fixes the case. Don't
-# perform these fixes in _approximate to prevent it from changing the input
-# too much. Thanks to the book "From Bash to Z Shell" page 249.
+# Match specification to be tried when completing items. Each group ('...') is
+# tried after another if no matches were found, once matches are found no
+# other groups are tried. Thanks to Mikachu in #zsh on Freenode (2012-08-28
+# 18:48 CEST) for explanations.
+#
+# When matching also include the uppercase variant of typed characters
+# ('m:{a-z}={A-Z}'); using '' before this group would try the unmodified match
+# first, but I prefer to get all matches immediately (e.g. if Makefile and
+# makefile exist in the current directory echo m matches both, with '' it
+# would only match makefile because it found one match). This allows typing in
+# lowercase most of the time and completion fixes the case, which is faster.
+#
+# Don't perform these fixes in _approximate to prevent it from changing the
+# input too much. Thanks to the book "From Bash to Z Shell" page 249.
zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}'
# Allow one mistake per three characters. Thanks to the book "From Bash to Z
@@ -526,7 +551,7 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
# is no longer displayed. Display current position in percent (%p).
zstyle ':completion:*:default' list-prompt '%p'
# Display group name (%d) (like 'external command', 'alias', etc.), in bold.
-# Also display a message if _approximate found errors and if no matches were
+# Also display a message if _approximate found errors and no matches were
# found.
zstyle ':completion:*' format ' %B%d%b:'
zstyle ':completion:*:corrections' format ' %B%d%b (errors: %e)'
@@ -644,11 +669,22 @@ tree() {
command tree -C "$@" | less
}
-# Automatically disown.
-xpdf() {
- command xpdf "$@" &
- disown %command
-}
+# Choose the "best" PDF viewer available: zathura, then xpdf. Also setup
+# completion for `pdf`.
+if (( $+commands[zathura] )); then
+ pdf() {
+ command zathura "$@" 2>/dev/null &
+ disown %command
+ }
+ # No completion for zathura yet.
+ compdef _xpdf pdf
+elif (( $+commands[xpdf] )); then
+ pdf() {
+ command xpdf "$@" 2>/dev/null &
+ disown %command
+ }
+ compdef _xpdf pdf
+fi
# GHCI doesn't use readline, force it if rlwrap is available.
(( $+commands[rlwrap] )) && ghci() {
@@ -673,26 +709,47 @@ fi
# LOAD ADDITIONAL CONFIGURATION FILES
+# Configuration option for rc.local to use tmux. By default screen is used.
+use_tmux=
+
source_config ~/.zsh/rc.local
# RUN COMMANDS
-# If not already in screen reattach to a running session or create a new one.
-# This also starts screen on a remote server when connecting through ssh.
-if [[ $TERM != dumb && $TERM != linux && -z $STY ]]; then
+# If not already in screen or tmux, reattach to a running session or create a
+# new one. This also starts screen/tmux on a remote server when connecting
+# through ssh.
+if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
# Get running detached sessions.
- session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+ if [[ -z $use_tmux ]]; then
+ session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+ else
+ session=$(tmux list-sessions 2>/dev/null \
+ | sed '/(attached)$/ d; s/^\([0-9]\{1,\}\).*$/\1/; q')
+ fi
# As we exec later we have to set the title here.
- window_preexec "screen"
+ if [[ -z $use_tmux ]]; then
+ window_preexec "screen"
+ else
+ window_preexec "tmux"
+ fi
# Create a new session if none is running.
if [[ -z $session ]]; then
- exec screen
+ if [[ -z $use_tmux ]]; then
+ exec screen
+ else
+ exec tmux
+ fi
# Reattach to a running session.
else
- exec screen -r $session
+ if [[ -z $use_tmux ]]; then
+ exec screen -r $session
+ else
+ exec tmux attach-session -t $session
+ fi
fi
fi
@@ -704,7 +761,7 @@ fi
# cases it doesn't work, the E alias can be used as workaround.
#
# Moved in the "run commands" section to prevent one unnecessary zsh process
-# when starting screen (see above).
+# when starting screen/tmux (see above).
exec 2>>(while read -r -k -u 0 line; do
printf '\e[91m%s\e[0m' "$line";
print -n $'\0';
@@ -713,7 +770,7 @@ done &)
# Run reminder and redisplay it every four hours (if it's available).
PERIOD=14400
periodic() {
- which rem > /dev/null && [ -f ~/.reminders ] && rem -h
+ (( $+commands[rem] )) && [ -f ~/.reminders ] && rem -h
}