X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=bb11dd714444ca001058e8a02cdb05867ddc3d4a;hb=92c767c45adb0801913b72675d4afa7bfa0b2e57;hp=7e817ac9b904fd00a568ec2bf8c347b1444f5feb;hpb=b11cfa198df10f9f764f592d08c884a37df8af2c;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 7e817ac..bb11dd7 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 @@ -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, @@ -325,7 +390,7 @@ $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 +precmd_functions+=(prompt_precmd) # When screen, tmux, xterm or rxvt is used set the name of the window to the @@ -367,12 +432,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 +531,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 +673,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 +696,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 +744,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 +786,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 +800,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 +845,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 }