X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=f38761f5f107c7d97a2ebbf47b51c61f05b55c30;hb=74e9edd1063220be05ea1d9d430cdf430dac09f9;hp=bde815db99c367266538a60094a49c6abd10a6e8;hpb=fa6a9b930cdf246057bc6bcfae5471a40a6bea82;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index bde815d..f38761f 100644 --- a/zsh/rc +++ b/zsh/rc @@ -61,7 +61,7 @@ fpath=(~/.zsh/functions $fpath) # Autoload my functions (except completion functions and hidden files). Thanks # to caphuso from the Zsh example files for this idea. if [[ -d ~/.zsh/functions ]]; then - autoload ${fpath[1]}/^_*(^/:t) + autoload -Uz ${fpath[1]}/^_*(^/:t) fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At @@ -96,7 +96,7 @@ fi autoload -Uz add-zsh-hook # Load zmv (zsh move) which is powerful to rename files. -autoload zmv +autoload -Uz zmv # HISTORY SETTINGS @@ -143,7 +143,10 @@ bindkey -a '^N' history-beginning-search-forward # PROMPT SETTINGS # Use colorized output, necessary for prompts and completions. -autoload -U colors && colors +autoload -Uz 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. @@ -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 @@ -446,7 +451,7 @@ zmodload zsh/complist # cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in # #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath # problem. -autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump +autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump # Use cache to speed up completions. zstyle ':completion:*' use-cache on @@ -477,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. @@ -525,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 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'; -done &) - # Load aliases and similar functions also used by other shells. if [[ -f ~/.shell/aliases ]]; then . ~/.shell/aliases @@ -617,7 +615,7 @@ 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. +# 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 }') @@ -634,6 +632,26 @@ if [[ $TERM != dumb && $TERM != linux && -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 && [ -f ~/.reminders ] && rem -h +} + source_debug ". ~/.zsh/rc (done)"