X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=d7106f4e0145d90795a1603df4795b311b4ac622;hb=0038a84db7d35d7fa5a9ebafb762bf5dfc7baf27;hp=da5edc4a98197024afc0b77a4d3df831e75166f1;hpb=de8ff5bfd82dc08d229790edc326d05bb9888d6e;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index da5edc4..d7106f4 100644 --- a/zsh/rc +++ b/zsh/rc @@ -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() { @@ -145,6 +145,9 @@ bindkey -a '^N' history-beginning-search-forward # Use colorized output, necessary for prompts and completions. autoload -U colors && colors +# Necessary for $EPOCHSECONDS, the UNIX time. +zmodload zsh/datetime + # Some shortcuts for colors. The %{...%} tells zsh that the data in between # doesn't need any space, necessary for correct prompt draw. local red="%{${fg[red]}%}" @@ -195,7 +198,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 '²' @@ -253,6 +256,8 @@ fi # code in red and bold and the job count in yellow. # # Thanks to Adam's prompt for the basic idea of this prompt. +# +# The current time is display in hex in the right 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 @@ -269,10 +274,11 @@ prompt_precmd() { local width width_left width_right local top_left top_right - # Display vcs_info (if used) on the right in the top prompt. - top_right="${vcs_info_msg_0_}" + # 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 vcs_info if it would get too long. + # Remove it if it would get too long. if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then top_right= width_right=0 @@ -292,7 +298,6 @@ prompt_precmd() { $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 @@ -319,7 +324,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 @@ -372,10 +377,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 @@ -444,7 +449,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. @@ -476,6 +482,10 @@ zstyle ':completion:*' format ' %B%d%b:' # Display different types of matches separately. zstyle ':completion:*' group-name '' +# 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. @@ -489,9 +499,14 @@ zstyle ':completion:*' ignore-line yes # 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) +# 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 # (http://www.zsh.org/mla/users/2009/msg01038.html). @@ -519,17 +534,6 @@ TRAPINT() { return $1 } -# 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 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'; -done &) - # Load aliases and similar functions also used by other shells. if [[ -f ~/.shell/aliases ]]; then . ~/.shell/aliases @@ -580,12 +584,21 @@ 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 @@ -602,8 +615,8 @@ 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 }') @@ -619,6 +632,26 @@ if [[ $TERM != dumb && -z $STY ]]; then 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 && rem -h +} + source_debug ". ~/.zsh/rc (done)"