X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=bab6a06f7c0db052817aa769a0e8c2955847dcbf;hb=b7ff27cb60530eeebcfb9bdef1b68f548e1d88ed;hp=bda2c6e347fb38ecec97af7e38cc67b3e805d4b6;hpb=642dc80b30610a45455d5954fb31cf5a65f071d8;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index bda2c6e..bab6a06 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 @@ -115,7 +115,7 @@ setopt histignoredups # 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 +# 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() { @@ -195,7 +195,7 @@ 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 '²' @@ -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. @@ -442,7 +444,8 @@ fi 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. +# #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath +# problem. autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump # Use cache to speed up completions. @@ -486,6 +489,14 @@ 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 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 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 @@ -514,12 +525,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. +# 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. exec 2>>(while read -r -k -u 0 line; do printf '\e[91m%s\e[0m' "$line"; print -n $'\0'; @@ -575,48 +586,39 @@ tig() { $@ } +# Pipe output through less. +tree() { + command tree -C "$@" | less +} + +# Automatically disown. +xpdf() { + command xpdf "$@" & + disown %command +} -# OS SPECIFIC SETTINGS -local uname=$(uname) +# 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. -# This also starts screen one a remote server when connecting through ssh. -if [[ $TERM != dumb && -z $STY ]]; 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 }') @@ -632,7 +634,13 @@ if [[ $TERM != dumb && -z $STY ]]; then fi fi +# Run reminder and redisplay it every four hours (if it's available). +PERIOD=14400 +periodic() { + which rem > /dev/null && rem +} + -source_debug "finished sourcing ~/.zsh/rc" +source_debug ". ~/.zsh/rc (done)" # vim: ft=zsh