X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=5276361bf8f371dd0f814c1b2b07ae61427933d9;hb=bba57cf2b29e813e061cefd755abbe2021bb7c07;hp=d101a3c22723da62d890215d1a61d86677873141;hpb=39116c478c7b7801ba287dfcb975ccfc7b360005;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index d101a3c..5276361 100644 --- a/zsh/rc +++ b/zsh/rc @@ -11,6 +11,9 @@ bindkey -v # Be paranoid, new files are readable/writable by me only. umask 077 +# Disable beeps. +setopt nobeep + # Prevent overwriting existing files with '> filename', use '>| filename' # (or >!) instead. setopt noclobber @@ -44,7 +47,9 @@ fi fpath=(~/.zsh/functions $fpath) # Autoload my functions (except completion functions and hidden files). Thanks # to caphuso from the Zsh example files for this idea. -autoload ${fpath[1]}/^_*(^/:t) +if [[ -d ~/.zsh/functions ]]; then + autoload ${fpath[1]}/^_*(^/:t) +fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At # the moment only precmd() and preexec() are simulated. @@ -71,12 +76,14 @@ 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 # HISTORY SETTINGS # Use history and store it in ~/.zsh/history. -HISTSIZE=5000 -SAVEHIST=5000 +HISTSIZE=50000 +SAVEHIST=50000 HISTFILE=~/.zsh/history # Append to the history file instead of overwriting it and do it immediately # when a command is executed. @@ -84,9 +91,33 @@ setopt appendhistory setopt incappendhistory # If the same command is run multiple times store it only once in the history. setopt histignoredups -# Vim like completions of previous executed commands. -bindkey "^P" history-beginning-search-backward -bindkey "^N" history-beginning-search-forward +# 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. +zle -N my-vi-history-beginning-search-backward +my-vi-history-beginning-search-backward() { + local not_at_beginning_of_line + if [[ $CURSOR -ne 0 ]]; then + not_at_beginning_of_line=yes + fi + + zle history-beginning-search-backward + + # Start Vi-mode and stay at the same position (Vi-mode moves one left, + # this counters it). + zle vi-cmd-mode + if [[ -n $not_at_beginning_of_line ]]; then + zle vi-forward-char + fi +} +bindkey "^P" my-vi-history-beginning-search-backward +bindkey -a "^P" history-beginning-search-backward # binding for Vi-mode +# Here only Vi-mode is necessary as ^P enters Vi-mode and ^N only makes sense +# after calling ^P. +bindkey -a "^N" history-beginning-search-forward # PROMPT SETTINGS @@ -94,15 +125,21 @@ bindkey "^N" history-beginning-search-forward # Use colorized output, necessary for prompts and completions. autoload -U colors && colors +# Some shortcuts for colors. +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 and a + if this shell is running inside another shell. # 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="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\ -%{${fg[blue]}%}%B%~%b%{${fg[default]}%} \ -%(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \ -%(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )" +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 @@ -117,29 +154,26 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || fi # Allow substitutions and expansions in the prompt, necessary for - # vcs_info. + # VCS_info. setopt promptsubst - # Load vcs_info to display information about version control repositories. + # 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 - # Set style of vcs_info display. The current branch (green) and vcs (blue) + # 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) # it's also displayed (red). zstyle ':vcs_info:*' formats \ - "(%{${fg[green]}%}%b%{${fg[default]}%}:\ -%{${fg[blue]}%}%s%{${fg[default]}%})" + "($green%b$default:$blue%s$default)" zstyle ':vcs_info:*' actionformats \ - "(%{${fg[green]}%}%b%{${fg[default]}%}/\ -%{${fg[red]}%}%a%{${fg[default]}%}:\ -%{${fg[blue]}%}%s%{${fg[default]}%})" - # Call vcs_info as precmd before every prompt. + "($green%b$default/$red%a$default:$blue%s$default)" + # Call VCS_info as precmd before every prompt. prompt_precmd() { vcs_info } add-zsh-hook precmd prompt_precmd - # Display the vcs information in the right prompt. + # 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 @@ -150,29 +184,24 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || fi fi -# When screen or xterm is used set the name of the window to the currently -# running program. +unset red blue green yellow default + +# When screen, 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'. # -# It works with screen and xterm. If screen is running in X11 (DISPLAY is set) -# and stumpwm is running then the window title is also set in stumpwm using -# stumpish. +# It works with screen, 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. This # only works if the .zshrc on the server also uses this command. -if [[ $TERM == screen* || $TERM == xterm* ]]; then +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 stump window manager is running. - ps aux | grep -q stumpwm | grep -v grep - if [[ $? -eq 0 ]]; then - window_stumpwm=yes - fi # Is set to a non empty value when the shell is running as root. if [[ $(id -u) -eq 0 ]]; then window_root=yes @@ -183,7 +212,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then local program_name=$1 # When sudo is used use real program name instead, but with an - # exclamation mark at the beginning. + # exclamation mark at the beginning (handled below). local program_sudo= if [[ $program_name == sudo* ]]; then program_name=${program_name#sudo } @@ -195,7 +224,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then # 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) ]] && return + [[ $program_name == (cd*|ls|la|ll|clear|c) ]] && return # Change my shortcuts so the real name of the program is displayed. case $program_name in @@ -237,30 +266,32 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. + local name="zsh" + # If the function was called with an argument then reset the window + # name to '.zsh' (used by clear alias). + if [[ -n $1 ]]; then + name=".zsh" + fi + + # Prepend prefixes like in window_preexec(). if [[ -n $SSH_CONNECTION ]]; then - window_title "@zsh" + window_title "@$name" elif [[ -n $window_root ]]; then - window_title "!zsh" + window_title "!$name" else - window_title "zsh" + window_title $name fi # Just reset the name, so no screen reset necessary for the moment. window_reset= } - # Sets the window title. Works with screen and xterm. + # Sets the window title. Works with screen, xterm and rxvt. window_title() { if [[ $TERM == screen* ]]; then print -n "\ek$1\e\\" - # Update window name in stumpwm if running screen in X11 and when - # stumpwm is used. - if [[ -n $DISPLAY && -n $window_stumpwm ]]; then - echo "$1" | stumpish -e "title" > /dev/null - fi - - elif [[ $TERM == xterm* ]]; then + elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then print -n "\e]2;$1\e\\" fi } @@ -277,7 +308,8 @@ fi # (coloring, scrollable). zmodload zsh/complist # Use new completion system, store dumpfile in ~/.zsh/cache to prevent -# cluttering of ~/. +# 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 # Use cache to speed up completions. @@ -327,84 +359,56 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # easily retrieved later and then abort like ^C normally does. This is useful # when I want to abort an command to do something in between and then finish # typing the command. +# +# Thanks to Vadim Zeitlin for a fix (--) so lines +# starting with - don't cause errors. TRAPINT() { # Store the current buffer in the history. - zle && print -s $BUFFER + zle && print -s -- $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 -exec 2>>(while read line; do - print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &) +# 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 some interactive stderr output, but in those +# cases the E alias can be used as workaround. +exec 2>>(while read -r line; do + printf '\e[91m%s\e[0m\n' "$line" + print -n $'\0'; +done &) + +# Load aliases and similar functions also used by other shells. +if [[ -f ~/.shell/aliases ]]; then + . ~/.shell/aliases +fi # Make sure aliases are expanded when using sudo. alias sudo='sudo ' -# Global aliases for often used commands used in the command line. +# Global aliases for often used commands in the command line. alias -g E='2>&1' alias -g L='E | less' alias -g D='E | colordiff L' alias -g G='| grep' alias -g S='| sort' +alias -g U='| uniq' # Make going up directories simple. alias -g ...='../..' alias -g ....='../../..' alias -g .....='../../../..' -# Shortcuts for often used programs. -alias e='elinks' -alias g='git' -alias m='mutt' -alias v='vim' -alias vi='vim' - -# Improved ls which displays the files in columns (-C), visualizes -# directories, links and other special files (-F) and pages everything through -# less (L). -# -# If available use GNU ls with colorized output. If it isn't available use -# normal ls which needs CLICOLOR_FORCE so it displays colors when used with a -# pager. -ls --color &> /dev/null -if [[ $? -eq 0 ]]; then - alias ls='ls --color' -else - alias ls='CLICOLOR_FORCE=1 ls -G' +# If the window naming feature is used (see above) then use ".zsh" (leading +# dot) as title name after running clear so it's clear to me that the window +# is empty. I open so much windows that I don't know in which I have something +# important. This helps me to remember which windows are empty (I run clear +# after I finished my work in a window). +if [[ -n $window_reset ]]; then + alias clear='clear; window_reset=yes; window_precmd reset' fi -# Main ls function. -function ls() { - command ls -C -F $* L -} -# Helper function to list all files. -function la() { - ls -a $* -} -# Helper function to list all files in list format with access rights, etc. -function ll() { - la -l $* -} - -# I sometimes confuse editor and shell, print a warning to prevent I exit the -# shell. -alias :q='echo "This is not Vim!" >&2' - -# Automatically use unified diffs. -alias diff='diff -u' - -# Display all files and use human readable sizes. -alias du='du -sh' - -# Use human readable sizes. -alias df='df -h' - -# Edit the mercurial patch queue series file for the current mercurial -# repository in Vim. Also change Vim's pwd to the patches directory so other -# patches can easily be opened. -alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"' # 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 @@ -444,8 +448,34 @@ if [[ $TERM != screen* && $TERM != 'dumb' ]]; then fi -# Load rc file for current OS. -source_config ~/.zsh os rc $(uname) nolocal +# OS SPECIFIC SETTINGS + +if [[ $(uname) == 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 rc file for current hostname (first part before a dot) or rc.local. source_config ~/.zsh host rc ${$(hostname)//.*/}