X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=6367ff4c8f218bd1a37748cc7e415e35f8853047;hb=99f0fdfaed7c9f03c703cecb2bcd62b43b945e9c;hp=5e97beaab4604277f660124c9c5499c3e5e50689;hpb=ab61f4e2ef413cec09f17ece30741af4526c4fdb;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 5e97bea..6367ff4 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,7 +1,7 @@ # Zsh configuration file. -source_debug "sourcing ~/.zsh/rc" +source_debug ". ~/.zsh/rc" # MISCELLANEOUS SETTINGS @@ -246,7 +246,7 @@ 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). On the -# bottom left current username and host is shown, the exit code of the last +# 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 @@ -319,7 +319,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # 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 @@ -340,7 +340,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; 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|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 @@ -372,10 +372,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 - program_name="@:${$(hostname)//.*/}" + program_name="@:${HOST//.*/}" # Use "@:!hostname" for root screens. elif [[ $program_name == @!screen ]]; then - program_name="@:!${$(hostname)//.*/}" + program_name="@:!${HOST//.*/}" fi fi @@ -411,14 +411,16 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then window_reset= } - # Sets the window title. Works with screen, xterm and rxvt. + # 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). 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. @@ -486,6 +488,21 @@ zstyle ':completion:*' ignore-line yes # 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):*' 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) +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 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 @@ -507,12 +524,12 @@ TRAPINT() { return $1 } -# Colorize stderr. Very useful when looking for errors. Thanks to +# 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) 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. +# 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. exec 2>>(while read -r -k -u 0 line; do printf '\e[91m%s\e[0m' "$line"; print -n $'\0'; @@ -568,41 +585,32 @@ tig() { $@ } +# Pipe output through less. +tree() { + command tree -C "$@" | less +} -# OS SPECIFIC SETTINGS +# Automatically disown. +xpdf() { + command xpdf "$@" & + disown %command +} -local uname=$(uname) -if [[ $uname == Linux ]]; then +# OS SPECIFIC SETTINGS + +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 @@ -626,6 +634,6 @@ if [[ $TERM != dumb && -z $STY ]]; then fi -source_debug "finished sourcing ~/.zsh/rc" +source_debug ". ~/.zsh/rc (done)" # vim: ft=zsh