X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=779d0dde656e7706bdc68c8d7ef6bda1164ac9ba;hb=b55cf4872f4553ae4a3a28f34123e4b5c786392e;hp=236374b737ade57f984da916567ccf905332398b;hpb=578959cbecd604285356baddd36f4c3178b0a127;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 236374b..779d0dd 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" @@ -78,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 @@ -112,6 +127,8 @@ 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 text are @@ -184,7 +201,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || 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) @@ -311,20 +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'. +# 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. @@ -348,6 +366,14 @@ 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%% *} @@ -385,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 @@ -425,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\\" @@ -463,7 +489,7 @@ zmodload zsh/complist autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump # Use cache to speed up some slow completions (dpkg, perl modules, etc.). -zstyle ':completion:*' use-cache on +zstyle ':completion:*' use-cache yes zstyle ':completion:*' cache-path ~/.zsh/cache # Let the completion system handle all completions, including expanding of @@ -515,7 +541,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)' @@ -613,22 +639,19 @@ 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. @@ -636,10 +659,30 @@ 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() { + command rlwrap \ + --always-readline --complete-filenames -t dumb \ + --histsize 5000 \ + --file ~/.shell/rlwrap/ghci \ + ghci "$@" 2>&1 } @@ -656,26 +699,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 @@ -687,7 +751,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'; @@ -696,7 +760,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 }