X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=zsh%2Frc;h=4f5d10029e595ba1af957c5eecdf7d070440323b;hb=7b1ae14f7cb522ffc143465dd02afd2bfdad1d62;hp=902d184bc4c0970c17d7ec06b6493a163c0b2873;hpb=2dad868f3aa83676dde4b9891c49389e77b90a7e;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index 902d184..4f5d100 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,12 +1,24 @@
# 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 "sourcing ~/.zsh/rc"
-# MISCELLANEOUS SETTINGS
+source_debug ". ~/.zsh/rc"
-# Use Vi(m) style key bindings.
-bindkey -v
+# MISCELLANEOUS SETTINGS
# Be paranoid, new files are readable/writable by me only.
umask 077
@@ -33,6 +45,23 @@ setopt extendedglob
setopt ignoreeof
+# KEY BINDINGS
+
+# Not all bindings are done here, only those not specific to a given section.
+
+# Use Vi(m) style key bindings.
+bindkey -v
+
+# Use jj and jk to exit insert mode.
+bindkey 'jj' vi-cmd-mode
+bindkey 'jk' vi-cmd-mode
+
+# I don't need the arrow keys, I use ^N and ^P for this (see below).
+bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
+# Also not in Vi mode.
+bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
+
+
# FUNCTION SETTINGS
# Make sure every entry in $fpath is unique.
@@ -48,7 +77,7 @@ fpath=(~/.zsh/functions $fpath)
# Autoload my functions (except completion functions and hidden files). Thanks
# to caphuso from the Zsh example files for this idea.
if [[ -d ~/.zsh/functions ]]; then
- autoload ${fpath[1]}/^_*(^/:t)
+ autoload -Uz ${fpath[1]}/^_*(^/:t)
fi
# Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
@@ -64,17 +93,17 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
# arrays.
function precmd() {
for function in $precmd_functions; do
- $function $@
+ $function "$@"
done
}
function preexec() {
for function in $preexec_functions; do
- $function $@
+ $function "$@"
done
}
function chpwd() {
for function in $chpwd_functions; do
- $function $@
+ $function "$@"
done
}
fi
@@ -82,8 +111,8 @@ fi
# Autoload add-zsh-hook to add/remove zsh hook functions easily.
autoload -Uz add-zsh-hook
-# Load zmv (zsh move) which is powerful to rename files.
-autoload zmv
+# Load zmv (zsh move) which is a powerful file renamer.
+autoload -Uz zmv
# HISTORY SETTINGS
@@ -98,12 +127,14 @@ setopt appendhistory
setopt incappendhistory
# If the same command is run multiple times store it only once in the history.
setopt histignoredups
+# Don't add lines starting with a space to the history.
+setopt histignorespace
# Vim like completions of previous executed commands (also enter Vi-mode). If
# called at the beginning it just recalls old commands (like cursor up), if
-# called after typing something, only lines starting with the typed are
-# returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh
-# on Freenode (2010-01-17 12:47) for the information how to a use function
-# with bindkey.
+# called after typing something, only lines starting with the typed text are
+# returned. Very useful to get old commands quickly - in addition to the
+# history commands (!..). Thanks to Mikachu in #zsh on Freenode (2010-01-17
+# 12:47 CET) for the information how to a use function with bindkey.
zle -N my-vi-history-beginning-search-backward
my-vi-history-beginning-search-backward() {
local not_at_beginning_of_line
@@ -126,29 +157,32 @@ bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode
# after calling ^P.
bindkey -a '^N' history-beginning-search-forward
+# Automatically push cd-ed directories on the directory stack.
+setopt autopushd
+# Don't push duplicates on the directory stack.
+setopt pushdignoredups
+# Exchange the meaning of + and - when specifying a directory on the stack.
+# This way cd - lists the last used directory first, which is more
+# natural because cd - goes to the last directory.
+setopt pushdminus
+
# PROMPT SETTINGS
# Use colorized output, necessary for prompts and completions.
-autoload -U colors && colors
+autoload -Uz colors && colors
+
+# Necessary for $EPOCHSECONDS, the UNIX time.
+zmodload zsh/datetime
-# Some shortcuts for colors.
+# Some shortcuts for colors. The %{...%} tells zsh that the data in between
+# doesn't need any space, necessary for correct prompt drawing.
local red="%{${fg[red]}%}"
local blue="%{${fg[blue]}%}"
local green="%{${fg[green]}%}"
local yellow="%{${fg[yellow]}%}"
local default="%{${fg[default]}%}"
-# Set the default prompt. The current host and working directory is displayed,
-# the exit code of the last command if it wasn't 0, the number of running jobs
-# if not 0.
-#
-# The prompt is in green and blue to make easily detectable, the error exit
-# code in red and bold and the job count in yellow.
-PROMPT="$green%B%m%b$default:$blue%B%~%b$default \
-%(1j.$yellow%j$default.)%# \
-%(?..($red%B%?%b$default%) )"
-
# vcs_info was added in 4.3.9 but it works in earlier versions too. So load it
# if the necessary files are available in ~/.zsh/functions/vcs_info (often a
# symbolic link to current checkout of Zsh's sources).
@@ -161,16 +195,13 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
$fpath)
fi
- # Allow substitutions and expansions in the prompt, necessary for
- # vcs_info.
- setopt promptsubst
# Load vcs_info to display information about version control repositories.
autoload -Uz vcs_info
# Only look for git and mercurial repositories; the only I use.
zstyle ':vcs_info:*' enable git hg
# Check the repository for changes so they can be used in %u/%c (see
# below). This comes with a speed penalty for bigger repositories.
- zstyle ':vcs_info:*' check-for-changes true
+ zstyle ':vcs_info:*' check-for-changes yes
# Set style of vcs_info display. The current branch (green) and VCS (blue)
# is displayed. If there is an special action going on (merge, rebase)
@@ -194,49 +225,133 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
# changes are detected in the repository; check-for-changes must be set to
# true for this to work. Thanks to Bart Trojanowski
# (http://jukie.net/~bart/blog/pimping-out-zsh-prompt) for the idea
- # (2010-03-11 00:20).
+ # (2010-03-11 00:20 CET).
zstyle ':vcs_info:*' unstagedstr '¹'
zstyle ':vcs_info:*' stagedstr '²'
- # Call vcs_info as precmd before every prompt.
- prompt_precmd() {
- vcs_info
+ # Default to run vcs_info. If possible we prevent running it later for
+ # speed reasons. If set to a non empty value vcs_info is run.
+ FORCE_RUN_VCS_INFO=1
+
+ # Cache system inspired by Bart Trojanowski
+ # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt).
+ zstyle ':vcs_info:*+pre-get-data:*' hooks pre-get-data
+ +vi-pre-get-data() {
+ # Only Git and Mercurial support and need caching. Abort if any other
+ # VCS is used.
+ [[ "$vcs" != git && "$vcs" != hg ]] && return
+
+ # If the shell just started up or we changed directories (or for other
+ # custom reasons) we must run vcs_info.
+ if [[ -n $FORCE_RUN_VCS_INFO ]]; then
+ FORCE_RUN_VCS_INFO=
+ return
+ fi
+
+ # Don't run vcs_info by default to speed up the shell.
+ ret=1
+ # If a git/hg command was run then run vcs_info as the status might
+ # need to be updated.
+ case "$(fc -ln $(($HISTCMD-1)))" in
+ git* | g\ *)
+ ret=0
+ ;;
+ hg*)
+ ret=0
+ ;;
+ esac
}
- add-zsh-hook precmd prompt_precmd
-
- # Display the VCS information in the right prompt.
- if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
- RPROMPT='${vcs_info_msg_0_}'
- # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when
- # ${vcs_info_msg_0_} is empty. Provide a workaround for those versions,
- # thanks to Frank Terbeck for it.
+
+ # Must run vcs_info when changing directories.
+ prompt_chpwd() {
+ FORCE_RUN_VCS_INFO=1
+ }
+ add-zsh-hook chpwd prompt_chpwd
+
+ # Used by prompt code below to determine if vcs_info should be run.
+ RUN_VCS_INFO=1
+else
+ RUN_VCS_INFO=
+fi
+
+# Set the prompt. A two line prompt is used. On the top left the current
+# working directory is displayed, on the right vcs_info (if available) and the
+# current time in hex. On the bottom left current user name and host is shown,
+# the exit code of the last command if it wasn't 0, the number of running jobs
+# if not 0.
+#
+# The prompt is in green and blue to make easily detectable, the error exit
+# code in red and bold and the job count in yellow.
+#
+# Thanks to Adam's prompt for the basic idea of this prompt.
+prompt_precmd() {
+ # Regex to remove elements which take no space. Used to calculate the
+ # width of the top prompt. Thanks to Bart's and Adam's prompt code in
+ # Functions/Prompts/prompt_*_setup.
+ local zero='%([BSUbfksu]|([FB]|){*})'
+
+ # Call vcs_info before every prompt.
+ if [[ -n $RUN_VCS_INFO ]]; then
+ vcs_info
else
- RPROMPT='${vcs_info_msg_0_:- }'
+ vcs_info_msg_0_=
fi
-fi
-unset red blue green yellow default
+ local width width_left width_right
+ local top_left top_right
+
+ # Display the current time in HEX in bright blue and vcs_info (if used) on
+ # the right in the top prompt.
+ top_right="$vcs_info_msg_0_($blue%B0x$(([##16] EPOCHSECONDS))%b$default)"
+ width_right=${#${(S%%)top_right//$~zero/}}
+ # Remove it if it would get too long.
+ if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then
+ top_right=
+ width_right=0
+ fi
+
+ # Display current directory on the left in the top prompt. Truncate the
+ # directory if necessary.
+ width=$(( COLUMNS - 4 - 1 - width_right ))
+ top_left=".-$default%b($yellow%$width<..<%~%<<$default)%B$blue"
+
+ # Calculate the width of the top prompt to fill the middle with "-".
+ width_left=${#${(S%%)top_left//$~zero/}}
+ width_right=${#${(S%%)top_right//$~zero/}}
+ width=$(( COLUMNS - width_left - width_right ))
+
+ PROMPT="$blue%B$top_left${(l:$width::-:)}%b$default$top_right
+$blue%B'%b$default\
+$green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \
+%(?..($red%B%?%b$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'.
+# 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.
if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# Is set to a non empty value to reset the window name in the next
# precmd() call.
window_reset=yes
# Is set to a non empty value when the shell is running as root.
- if [[ $(id -u) -eq 0 ]]; then
+ if [[ $UID -eq 0 ]]; then
window_root=yes
fi
@@ -251,13 +366,21 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
program_name=${program_name#sudo }
program_sudo=yes
fi
+
+ # Replace fg with the resumed job name.
+ if [[ $program_name == fg ]]; then
+ program_name=${jobtexts[%+]}
+ elif [[ $program_name == fg* ]]; then
+ program_name=${jobtexts[${program_name#fg }]}
+ fi
+
# Remove all arguments from the program name.
program_name=${program_name%% *}
# Ignore often used commands which are only running for a very short
# time. This prevents a "blinking" name when it's changed to "cd" for
# example and then some milliseconds later back to "zsh".
- [[ $program_name == (cd*|ls|la|ll|clear|c) ]] && return
+ [[ $program_name == (cd*|d|ls|l|la|ll|clear|c) ]] && return
# Change my shortcuts so the real name of the program is displayed.
case $program_name in
@@ -270,7 +393,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
m)
program_name=mutt
;;
- v|vi)
+ v)
program_name=vim
;;
esac
@@ -288,8 +411,11 @@ 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
- program_name="@:${$(hostname)//.*/}"
+ if [[ $program_name == @screen || $program_name == @tmux ]]; then
+ program_name="@:${HOST//.*/}"
+ # Use "@:!hostname" for root screens.
+ elif [[ $program_name == @!screen || $program_name == @!tmux ]]; then
+ program_name="@:!${HOST//.*/}"
fi
fi
@@ -313,84 +439,153 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
fi
# Prepend prefixes like in window_preexec().
+ if [[ -n $window_root ]]; then
+ name="!$name"
+ fi
if [[ -n $SSH_CONNECTION ]]; then
- window_title "@$name"
- elif [[ -n $window_root ]]; then
- window_title "!$name"
- else
- window_title $name
+ name="@$name"
fi
+ window_title $name
# Just reset the name, so no screen reset necessary for the moment.
window_reset=
}
- # Sets the window title. Works with screen, xterm and rxvt.
+ # 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$1\e\\"
+ print -n "\ek${(V)1}\e\\"
}
elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
window_title() {
- print -n "\e]2;$1\e\\"
+ print -n "\e]2;${(V)1}\e\\"
}
+ else
+ # Fallback if another TERM is used.
+ window_title() { }
fi
# Add the preexec() and precmd() hooks.
add-zsh-hook preexec window_preexec
add-zsh-hook precmd window_precmd
+else
+ # Fallback if another TERM is used, necessary to run screen (see below in
+ # "RUN COMMANDS").
+ window_preexec() { }
fi
# COMPLETION SETTINGS
-# Load the complist module which provides additions to completion lists
-# (coloring, scrollable).
+# Load the complist module which provides additional features to completion
+# lists (coloring, scrolling).
zmodload zsh/complist
# Use new completion system, store dumpfile in ~/.zsh/cache to prevent
# cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in
-# #zsh on Freenode (2009-08-07 21:05) for reminding me of the $fpath problem.
-autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
+# #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath
+# problem.
+autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
-# Use cache to speed up completions.
-zstyle ':completion:*' use-cache on
+# Use cache to speed up some slow completions (dpkg, perl modules, etc.).
+zstyle ':completion:*' use-cache yes
zstyle ':completion:*' cache-path ~/.zsh/cache
-# Complete arguments and fix spelling mistakes when possible.
-zstyle ':completion:*' completer _complete _match _correct _approximate
-
-# Make sure the list of possible completions is displayed after pressing
-# the first time.
+# Let the completion system handle all completions, including expanding of
+# shell wildcards (which is handled by other shell mechanisms if the default
+# expand-or-complete is used).
+bindkey '^I' complete-word
+# If there are multiple matches after pressing always display them
+# immediately without requiring another . a completes to aa and
+# lists aaa, aab, aac as possible completions if the directory contains aaa,
+# aab, aac, bbb instead of only completing to aa.
setopt nolistambiguous
-# Allow completions in the middle of a text, i.e. "/usr/bin/whatever"
-# completes like "/usr/bin/". Useful when adding new options to commands.
-bindkey '^I' expand-or-complete-prefix
-# Try uppercase if the currently typed string doesn't match. This allows
-# typing in lowercase most of the time and completion fixes the case.
-zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}'
+# Support completions in the middle of a word, without this option zsh jumps
+# to the end of the word before the completion process begins. Is required for
+# the _prefix completer.
+setopt completeinword
+
+zstyle ':completion:::::' completer \
+ _expand _complete _prefix _ignored _approximate
-# Use ls like colors for completions.
+# 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.
+zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}'
+
+# Allow one mistake per three characters. Thanks to the book "From Bash to Z
+# Shell" page 248.
+zstyle -e ':completion:*:approximate:*' max-errors \
+ 'reply=( $(( ($#PREFIX + $#SUFFIX) / 3 )) )'
+
+# Expand shell wildcards to all matching files after . echo *
+# results in a b c if the directory contains the files a, b, c. Thanks to the
+# book "From Bash to Z Shell" page 246.
+zstyle ':completion:*:expand:*' tag-order all-expansions
+# Keep prefixes unexpanded if possible: $HOME/ doesn't expand $HOME,
+# while $HOME does.
+zstyle ':completion:*:expand:*' keep-prefix yes
+
+# When completing multiple path components display all matching ambiguous
+# components. For example /u/s/d/r/README lists all matching READMEs
+# instead of just the matching paths up to the r/ component. Can be slow if
+# there are many matching files.
+zstyle ':completion:*' list-suffixes yes
+
+# Use ls-like colors for completions.
zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
# Make completion lists scrollable so "do you wish to see all n possibilities"
-# is no longer displayed.
-zstyle ':completion:*' list-prompt '%p'
-# Display group name (like 'external command', 'alias', etc.) when there are
-# multiple matches in bold.
-zstyle ':completion:*' format ' %B%d%b:'
+# 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
+# found.
+zstyle ':completion:*' format ' %B%d%b:'
+zstyle ':completion:*:corrections' format ' %B%d%b (errors: %e)'
+zstyle ':completion:*:warnings' format ' %Bno matches for %d%b'
# Display different types of matches separately.
zstyle ':completion:*' group-name ''
+# Separate man pages by section.
+zstyle ':completion:*' separate-sections yes
+
+# Don't draw trailing / in bold (new in zsh 4.3.11). Thanks to Mikachu in #zsh
+# on Freenode for the fix (2010-12-17 13:46 CET).
+zle_highlight=(suffix:none)
+
# Ignore completion functions.
zstyle ':completion:*:functions' ignored-patterns '_*'
# Ignore parent directory.
zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
-# When unsetting variables make sure every variable name is only suggested
-# once.
-zstyle ':completion:*:unset:*' ignore-line yes
-# When working with Mercurial and Git don't complete the same file multiple
-# times. Very useful when completing file names.
-zstyle ':completion:*:(hg|git)*:*' ignore-line yes
+# Always complete file names only once in the current line. This makes it easy
+# to complete multiple file names because I can just press tab to get all
+# possible values. Otherwise I would have to skip the first value again and
+# again. Thanks to Mikachu in #zsh on Freenode (2011-08-11 14:42 CEST) for the
+# hint to use other. other is necessary so prefix lists both prefix and
+# prefixrest if the directory contains prefix and prefixrest.
+zstyle ':completion:*:all-files' ignore-line other
+# Except for mv and cp, because I often want to use to similar names, so I
+# complete to the same and change it.
+zstyle ':completion:*:(mv|cp):all-files' ignore-line no
+
+# Don't complete ./config.* files, this makes running ./configure much
+# simpler. Thanks to Nomexous in #zsh on Freenode (2010-03-16 01:54 CET)
+zstyle ':completion:*:*:-command-:*' ignored-patterns './config.*'
+# Don't complete unwanted files with Vim. Thanks to Nomexous in #zsh on
+# Freenode (2010-06-06 04:54 CEST). See below for a way to complete them.
+zstyle ':completion:*:*:vim:*:all-files' ignored-patterns \
+ '*.aux' '*.log' '*.pdf' \
+ '*.class'
+
+# Provide a fallback completer which always completes files. Useful when Zsh's
+# completion is too "smart". Thanks to Frank Terbeck
+# (http://www.zsh.org/mla/users/2009/msg01038.html).
+zle -C complete-files complete-word _generic
+zstyle ':completion:complete-files:*' completer _files
+bindkey '^F' complete-files
# CUSTOM ALIASES AND FUNCTIONS
@@ -401,26 +596,17 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
# typing the command.
#
# Thanks to Vadim Zeitlin for a fix (--) so lines
-# starting with - don't cause errors.
+# starting with - don't cause errors; and to Nadav Har'El
+# for a fix (-r) to handle whitespace/quotes
+# correctly, both on the Zsh mailing list.
TRAPINT() {
# Store the current buffer in the history.
- zle && print -s -- $BUFFER
+ zle && print -s -r -- $BUFFER
# Return the default exit code so Zsh aborts the current command.
return $1
}
-# Colorize stderr. Very useful when looking for errors. Thanks to
-# http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
-# Freenode (2010-03-07 04:03) for some improvements (-r, printf). It's not yet
-# perfect and doesn't work with su and git for example, but it can handle most
-# interactive output quite well (even with no trailing new line) and in those
-# cases the E alias can be used as workaround.
-exec 2>>(while read -r -k -u 0 line; do
- printf '\e[91m%s\e[0m' "$line";
- print -n $'\0';
-done &)
-
# Load aliases and similar functions also used by other shells.
if [[ -f ~/.shell/aliases ]]; then
. ~/.shell/aliases
@@ -453,78 +639,110 @@ if [[ -n $window_reset ]]; then
alias clear='clear; window_reset=yes; window_precmd reset'
fi
+
+# CUSTOM COMMANDS
+
# Display all branches (except stash) in gitk but only 200 commits as this is
-# much faster. Also put in the background and disown. Thanks to sitaram in
-# #git on Freenode (2009-04-20 15:51).
+# much faster. Also put in the background and disown. Thanks to drizzd in #git
+# on Freenode (2010-04-03 17:55 CEST).
gitk() {
- command gitk \
- --max-count=200 \
- $(git rev-parse --symbolic-full-name --remotes --branches) \
- $@ &
+ command gitk --max-count=200 --branches --remotes --tags "$@" &
disown %command
}
# Same for tig (except the disown part as it's no GUI program).
tig() {
- command tig \
- --max-count=200 \
- $(git rev-parse --symbolic-full-name --remotes --branches) \
- $@
+ command tig --max-count=200 --branches --remotes --tags "$@"
+}
+
+# Pipe output through less.
+tree() {
+ command tree -C "$@" | less
+}
+
+# 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() {
+ command rlwrap \
+ --always-readline --complete-filenames -t dumb \
+ --histsize 5000 \
+ --file ~/.shell/rlwrap/ghci \
+ ghci "$@" 2>&1
}
# OS SPECIFIC SETTINGS
-if [[ $(uname) == Linux ]]; then
+if [[ $OSTYPE == linux* ]]; then
# Settings when creating Debian packages.
DEBEMAIL=simon@ruderich.org
export DEBEMAIL
DEBFULLNAME='Simon Ruderich'
export DEBFULLNAME
-
-elif [[ $(uname) == Darwin ]]; then # Mac OS X
- # Store the current clipboard in CLIPBOARD before every command so it can
- # be used in commands.
- os_darwin_preexec() {
- export CLIPBOARD="$(pbpaste)"
- }
- # Add the function as preexec hook.
- add-zsh-hook preexec os_darwin_preexec
-
- # Initialize CLIPBOARD so it's available for completion directly after
- # startup.
- CLIPBOARD=""
- export CLIPBOARD
-
- # Fetch current URL in clipboard with wget.
- alias wnc='wget --no-proxy $CLIPBOARD'
fi
# LOAD ADDITIONAL CONFIGURATION FILES
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.zsh host rc ${$(hostname)//.*/}
+source_config ~/.zsh/rc.local
# RUN COMMANDS
# If not already in screen reattach to a running session or create a new one.
-#
-# screen* is necessary as `screen` uses screen.linux for example for a linux
-# console which would otherwise cause an infinite loop.
-if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
+# This also starts screen on a remote server when connecting through ssh.
+if [[ $TERM != dumb && $TERM != linux && -z $STY ]]; then
# Get running detached sessions.
session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+
+ # As we exec later we have to set the title here.
+ window_preexec "screen"
+
# Create a new session if none is running.
if [[ -z $session ]]; then
- screen
+ exec screen
# Reattach to a running session.
else
- screen -r $session
+ exec screen -r $session
fi
fi
+# Colorize stderr in red. Very useful when looking for errors. Thanks to
+# http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
+# Freenode (2010-03-07 04:03 CET) for some improvements (-r, printf). It's not
+# yet perfect and doesn't work with su and git for example, but it can handle
+# most interactive output quite well (even with no trailing new line) and in
+# 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).
+exec 2>>(while read -r -k -u 0 line; do
+ printf '\e[91m%s\e[0m' "$line";
+ print -n $'\0';
+done &)
+
+# Run reminder and redisplay it every four hours (if it's available).
+PERIOD=14400
+periodic() {
+ which rem > /dev/null && [ -f ~/.reminders ] && rem -h
+}
+
-source_debug "finished sourcing ~/.zsh/rc"
+source_debug ". ~/.zsh/rc (done)"
# vim: ft=zsh