X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=5889186973ea19dde4a1a92375611f976c478526;hb=2253f9ef9bead0494d3fea83581007c7acd5a357;hp=e3434efe911aff888bb52181b9d13a2ea2b27c78;hpb=7e88a2ee8aba91e34b2b1c65aa9631b65e24d375;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index e3434ef..5889186 100644 --- a/zsh/rc +++ b/zsh/rc @@ -18,10 +18,37 @@ source_debug ". ~/.zsh/rc" + +# HELPER FUNCTIONS + +# Return the name of the program which is called in the foreground with `fg`. +# $1 is the name of the program (optional). If it's not 'fg' or 'fg *' it's +# returned unchanged. +resolve_fg_to_resumed_job_name() { + # $REPLY is used by convention for scalars ($reply for arrays) to return + # values from functions. unset it here to prevent problems when REPLY is + # bound to an integer or similar. Thanks to Mikachu in #zsh on Freenode + # (2012-09-27 17:14 CEST) for this hint. + unset REPLY + + # Replace fg with the resumed job name. + if [[ $1 == fg ]]; then + REPLY="${jobtexts[%+]}" + elif [[ $1 == fg\ * ]]; then + REPLY="${jobtexts[${1#fg }]}" + # Normal program, return as is. + else + REPLY="$1" + fi +} + + # MISCELLANEOUS SETTINGS -# Be paranoid, new files are readable/writable by me only. -umask 077 +# Be paranoid, new files are readable/writable by me only, but not as root. +if [[ $UID -ne 0 ]]; then + umask 077 +fi # Disable beeps. setopt nobeep @@ -82,13 +109,7 @@ fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At # the moment only precmd(), preexec() and chpwd() are simulated. -# -# At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook -# so the compatibility version is used there too. -if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then - # Provide add-zsh-hook which was added in 4.3.4. - fpath=(~/.zsh/functions/compatibility $fpath) - +if [[ $ZSH_VERSION != (4.3.<4->*|4.<4->*|<5->*) ]]; then # Run all functions defined in the ${precmd,preexec,chpwd}_functions # arrays. function precmd() { @@ -108,9 +129,6 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then } fi -# Autoload add-zsh-hook to add/remove zsh hook functions easily. -autoload -Uz add-zsh-hook - # Load zmv (zsh move) which is a powerful file renamer. autoload -Uz zmv @@ -186,7 +204,7 @@ local default="%{${fg[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 # symbolic link to current checkout of Zsh's sources). -if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || +if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) || -d ~/.zsh/functions/vcs_info ]]; then # Update fpath to allow loading the vcs_info functions. if [[ -d ~/.zsh/functions/vcs_info ]]; then @@ -207,7 +225,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || # is displayed. If there is an special action going on (merge, rebase) # it's also displayed (red). Also display if there are unstaged or staged # (%u/%c) changes. - if [[ $ZSH_VERSION == (4.3.<11->|4.<4->*|<5->*) || + if [[ $ZSH_VERSION == (4.3.<11->*|4.<4->*|<5->*) || -d ~/.zsh/functions/vcs_info ]]; then zstyle ':vcs_info:*' formats \ "($green%b%u%c$default:$blue%s$default)" @@ -266,7 +284,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || prompt_chpwd() { FORCE_RUN_VCS_INFO=1 } - add-zsh-hook chpwd prompt_chpwd + chpwd_functions+=(prompt_chpwd) # Used by prompt code below to determine if vcs_info should be run. RUN_VCS_INFO=1 @@ -274,6 +292,53 @@ else RUN_VCS_INFO= fi +typeset -a longrun_data +longrun_data=() +# Display runtime in seconds for long running programs (> 60 seconds) and send +# a bell to notify me. +longrun_preexec() { + local program="$3" + + # Handle fg. + local REPLY + resolve_fg_to_resumed_job_name "$program" + program="$REPLY" + + # Don't track the time for certain (possible) long running processes which + # need no automatic notification. + for ignore in elinks man mutt vim; do + case $program in + $ignore | $ignore\ *) + longrun_data=() + return + ;; + esac + done + + longrun_data=("$program" $EPOCHSECONDS) +} +longrun_precmd() { + # No previous timestamp available or disabled for this command, ignore. + if [[ -z $longrun_data ]]; then + return + fi + + local difference=$(( EPOCHSECONDS - longrun_data[2] )) + if [[ $difference -gt 60 ]]; then + echo + echo -n "${fg[yellow]}" + echo -n "~> ${(V)longrun_data[1]} took $difference seconds." + echo -n "${fg[default]}" + echo "\a" # send bell + fi + + # Clear status. Prevents displaying old status information when pressing + # enter with an empty command line. + longrun_data=() +} +preexec_functions+=(longrun_preexec) +precmd_functions+=(longrun_precmd) + # 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) and the # current time in hex. On the bottom left current user name and host is shown, @@ -297,35 +362,62 @@ prompt_precmd() { vcs_info_msg_0_= fi - local width width_left width_right - local top_left top_right - - # 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 it if it would get too long. - if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then - top_right= - width_right=0 + # Setup. Create variables holding the formatted content. + + # Current directory in yellow, truncated if necessary (WIDTH is replaced + # below). + local directory="${yellow}%WIDTH<..<%~%<<${default}" + + # Information about the VCS in this directory. + local vcs="${vcs_info_msg_0_}" + # Current time (seconds since epoch) in Hex in bright blue. + local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}" + + # User name (%n) in bright green. + local user="${green}%B%n%b${default}" + # Host name (%m) in bright green; underlined if running on a remote system + # through SSH. + local host="${green}%B%m%b${default}" + if [[ -n $SSH_CONNECTION ]]; then + host="%U${host}%u" fi - # Display current directory on the left in the top prompt. Truncate the - # directory if necessary. - width=$(( COLUMNS - 4 - 1 - width_right )) - top_left=".-$default%b($yellow%$width<..<%~%<<$default)%B$blue" + # Number of background processes in yellow. + local background="%(1j.${yellow}%j${default}.)" + # Exit code in bright red if not zero. + local exitcode="%(?..(${red}%B%?%b${default}%) )" + + # Prefix characters in first and second line. + local top_prefix="${blue}%B.-%b${default}" + local bottom_prefix="${blue}%B'%b${default}" + + # Combine them to create the prompt. + + local top_right="${vcs}(${seconds})" + + local width_top_prefix=${#${(S%%)top_prefix//$~zero/}} + local width_top_right=${#${(S%%)top_right//$~zero/}} + + # Calculate the maximum width of ${top_left}. -2 are the braces of + # ${top_left}, -1 is one separator from ${top_separator} (we want at least + # one between left and right parts). + local top_left_width_max=$(( + COLUMNS - $width_top_prefix - 2 - 1 - $width_top_right + )) + # Truncate directory if necessary. + local top_left="(${directory/WIDTH/${top_left_width_max}})" + local width_top_left=${#${(S%%)top_left//$~zero/}} # Calculate the width of the top prompt to fill the middle with "-". - width_left=${#${(S%%)top_left//$~zero/}} - width_right=${#${(S%%)top_right//$~zero/}} - width=$(( COLUMNS - width_left - width_right )) - - PROMPT="$blue%B$top_left${(l:$width::-:)}%b$default$top_right -$blue%B'%b$default\ -$green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \ -%(?..($red%B%?%b$default%) )" + local width=$(( + COLUMNS - width_top_prefix - width_top_left - width_top_right + )) + local top_separator="%B${blue}${(l:${width}::-:)}%b${default}" + + PROMPT="${top_prefix}${top_left}${top_separator}${top_right} +${bottom_prefix}${user}@${host} ${background}%# ${exitcode}" } -add-zsh-hook precmd prompt_precmd +precmd_functions+=(prompt_precmd) # When screen, tmux, xterm or rxvt is used set the name of the window to the @@ -367,12 +459,10 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then program_sudo=yes fi - # Replace fg with the resumed job name. - if [[ $program_name == fg ]]; then - program_name=${jobtexts[%+]} - elif [[ $program_name == fg\ * ]]; then - program_name=${jobtexts[${program_name#fg }]} - fi + # Handle fg. + local REPLY + resolve_fg_to_resumed_job_name "$program_name" + program_name="$REPLY" # Remove all arguments from the program name. program_name=${program_name%% *} @@ -468,8 +558,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then fi # Add the preexec() and precmd() hooks. - add-zsh-hook preexec window_preexec - add-zsh-hook precmd window_precmd + preexec_functions+=(window_preexec) + precmd_functions+=(window_precmd) else # Fallback if another TERM is used, necessary to run screen (see below in # "RUN COMMANDS"). @@ -610,6 +700,12 @@ bindkey '^F' complete-files # for a fix (-r) to handle whitespace/quotes # correctly, both on the Zsh mailing list. TRAPINT() { + # Don't store this line in history if histignorespace is enabled and the + # line starts with a space. + if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then + return $1 + fi + # Store the current buffer in the history. zle && print -s -r -- $BUFFER @@ -627,6 +723,8 @@ alias sudo='sudo ' # Global aliases for often used redirections. alias -g E='2>&1' +alias -g N='>/dev/null' +alias -g EN='2>/dev/null' alias -g L='2>&1 | less' alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines alias -g D='2>&1 | colordiff | less' @@ -673,20 +771,22 @@ fi command tree -C "$@" | less } -# Choose the "best" PDF viewer available: zathura, then xpdf. Also setup -# completion for `pdf`. -if (( $+commands[zathura] )); then +# Choose the "best" PDF viewer available: xpdf, then zathura (in the past +# zathura was preferred, but recent versions are completely broken: still no +# working search and no page-wise scrolling anymore). Also setup completion +# for `pdf`. +if (( $+commands[xpdf] )); then pdf() { - command zathura "$@" 2>/dev/null & + command xpdf "$@" 2>/dev/null & disown %command } - # No completion for zathura yet. compdef _xpdf pdf -elif (( $+commands[xpdf] )); then +elif (( $+commands[zathura] )); then pdf() { - command xpdf "$@" 2>/dev/null & + command zathura "$@" 2>/dev/null & disown %command } + # No completion for zathura yet. compdef _xpdf pdf fi @@ -713,8 +813,9 @@ fi # LOAD ADDITIONAL CONFIGURATION FILES -# Configuration option for rc.local to use tmux. By default screen is used. -use_tmux= +# Configuration option for rc.local to use GNU screen/tmux. By default GNU +# screen is used. Possible values: screen, tmux. +use_multiplexer=screen source_config ~/.zsh/rc.local @@ -726,32 +827,32 @@ source_config ~/.zsh/rc.local # through ssh. if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then # Get running detached sessions. - if [[ -z $use_tmux ]]; then + if [[ $use_multiplexer = screen ]]; then session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') - else + elif [[ $use_multiplexer = tmux ]]; then session=$(tmux list-sessions 2>/dev/null \ | sed '/(attached)$/ d; s/^\([0-9]\{1,\}\).*$/\1/; q') fi # As we exec later we have to set the title here. - if [[ -z $use_tmux ]]; then + if [[ $use_multiplexer = screen ]]; then window_preexec "screen" - else + elif [[ $use_multiplexer = tmux ]]; then window_preexec "tmux" fi # Create a new session if none is running. if [[ -z $session ]]; then - if [[ -z $use_tmux ]]; then + if [[ $use_multiplexer = screen ]]; then exec screen - else + elif [[ $use_multiplexer = tmux ]]; then exec tmux fi # Reattach to a running session. else - if [[ -z $use_tmux ]]; then + if [[ $use_multiplexer = screen ]]; then exec screen -r $session - else + elif [[ $use_multiplexer = tmux ]]; then exec tmux attach-session -t $session fi fi @@ -771,9 +872,12 @@ exec 2>>(while read -r -k -u 0 line; do print -n $'\0'; done &) -# Run reminder and redisplay it every four hours (if it's available). +# Run the following programs every 4 hours. PERIOD=14400 periodic() { + # Display fortunes. + (( $+commands[fortune] )) && fortune -ac + # Display reminders. (( $+commands[rem] )) && [ -f ~/.reminders ] && rem -h }