X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=c7a964e131ad074fc8c45788b71f3e63a768d08f;hb=ef5ed5972882ac0101310f22a01f93662248ef7f;hp=96b45e4e6b43b0500a4624916a774452a4a852b9;hpb=8f24a1138ad378038239e8d0cb9619864f7ca026;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 96b45e4..c7a964e 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,6 @@
 # Zsh configuration file.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,12 +35,12 @@ zshrc_resolve_fg_to_resumed_job_name() {
 
     # Replace fg with the resumed job name.
     if [[ $1 == fg ]]; then
-        REPLY="${jobtexts[%+]}"
+        REPLY=${jobtexts[%+]}
     elif [[ $1 == fg\ * ]]; then
-        REPLY="${jobtexts[${1#fg }]}"
+        REPLY=${jobtexts[${1#fg }]}
     # Normal program, return as is.
     else
-        REPLY="$1"
+        REPLY=$1
     fi
 }
 
@@ -142,8 +142,8 @@ autoload -Uz zmv
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
-HISTSIZE=50000
-SAVEHIST=50000
+HISTSIZE=1000000
+SAVEHIST=1000000
 HISTFILE=~/.zsh/history
 # Append to the history file instead of overwriting it and do it immediately
 # when a command is executed.
@@ -276,7 +276,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
     +vi-pre-get-data() {
         # Only Git and Mercurial support and need caching. Abort if any other
         # VCS is used.
-        [[ "$vcs" != git && "$vcs" != hg ]] && return
+        [[ $vcs != git && $vcs != hg ]] && return
 
         # If the shell just started up or we changed directories (or for other
         # custom reasons) we must run vcs_info.
@@ -289,7 +289,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
         ret=1
         # If a git/hg command was run then run vcs_info as the status might
         # need to be updated.
-        case "$(fc -ln $(($HISTCMD-1)))" in
+        case $(fc -ln $(($HISTCMD-1))) in
             git* | g\ *)
                 ret=0
                 ;;
@@ -336,12 +336,12 @@ zshrc_longrun_data=()
 # Display runtime in seconds for long running programs (> 60 seconds) and send
 # a bell to notify me.
 zshrc_longrun_preexec() {
-    local program="$3"
+    local program=$3
 
     # Handle fg.
     local REPLY
-    zshrc_resolve_fg_to_resumed_job_name "$program"
-    program="$REPLY"
+    zshrc_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.
@@ -354,7 +354,7 @@ zshrc_longrun_preexec() {
         esac
     done
 
-    zshrc_longrun_data=("$program" $EPOCHSECONDS)
+    zshrc_longrun_data=($program $EPOCHSECONDS)
 }
 zshrc_longrun_precmd() {
     # No previous timestamp available or disabled for this command, ignore.
@@ -410,10 +410,10 @@ zshrc_prompt_precmd() {
     local directory="${yellow}%WIDTH<..<%~%<<${default}"
     # Minimal information about the VCS, only displayed if there are
     # unstaged/staged changes.
-    local vcs_staged="${vcs_info_msg_1_}"
+    local vcs_staged=${vcs_info_msg_1_}
 
     # Information about the VCS in this directory.
-    local vcs="${vcs_info_msg_0_}"
+    local vcs=${vcs_info_msg_0_}
     # Current time (seconds since epoch) in Hex in bright blue.
     local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}"
 
@@ -439,7 +439,7 @@ zshrc_prompt_precmd() {
 
     # Combine them to create the prompt.
 
-    local top_left="${vcs_staged}"
+    local top_left=${vcs_staged}
     local top_right="${vcs}(${seconds})"
 
     local width_top_prefix=${#${(S%%)top_prefix//$~zero/}}
@@ -508,8 +508,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
 
         # Handle fg.
         local REPLY
-        zshrc_resolve_fg_to_resumed_job_name "$program_name"
-        program_name="$REPLY"
+        zshrc_resolve_fg_to_resumed_job_name $program_name
+        program_name=$REPLY
 
         # Remove all arguments from the program name.
         program_name=${program_name%% *}
@@ -563,7 +563,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         fi
 
         # Set the window name to the currently running program.
-        zshrc_window_title "$program_name"
+        zshrc_window_title $program_name
 
         # Tell precmd() to reset the window name when the program stops.
         zshrc_window_reset=yes
@@ -798,7 +798,7 @@ compdef svalgrind=valgrind
 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
+    if [[ -o histignorespace && ${BUFFER[1]} = ' ' ]]; then
         return $1
     fi
 
@@ -865,16 +865,15 @@ fi
     command tig --max-count=200 --branches --remotes --tags "$@"
 }
 
-# Pipe output through less.
-(( $+commands[tree] )) && tree() {
-    command tree -C "$@" | less
-}
-
-# 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
+# Choose the "best" PDF viewer available. Also setup completion for `pdf`.
+if (( $+commands[katarakt] )); then
+    pdf() {
+        command katarakt "$@" 2>/dev/null &
+        disown %command
+    }
+    # No completion for katarakt yet.
+    compdef pdf=xpdf
+elif (( $+commands[xpdf] )); then
     pdf() {
         command xpdf "$@" 2>/dev/null &
         disown %command
@@ -889,11 +888,6 @@ elif (( $+commands[zathura] )); then
     compdef pdf=xpdf
 fi
 
-# Better viewer for info pages .. just pipe everything into less.
-info() {
-    command info "$@" 2>/dev/null | less
-}
-
 
 # OS SPECIFIC SETTINGS
 
@@ -931,7 +925,8 @@ fi
 # If not already in screen or tmux, reattach to a running session or create a
 # new one. This also starts screen/tmux on a remote server when connecting
 # through ssh.
-if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
+if [[ $TERM != dumb && $TERM != dialup && $TERM != linux
+        && -z $STY && -z $TMUX ]]; then
     # Get running detached sessions.
     if [[ $zshrc_use_multiplexer = screen ]]; then
         session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
@@ -985,7 +980,7 @@ if [[ $LD_PRELOAD != *libcoloredstderr.so* ]]; then
     # process when starting GNU screen/tmux (see above).
     else
         exec 2>>(while read -r -k -u 0 line; do
-            printf '\e[91m%s\e[0m' "$line"
+            printf '\e[91m%s\e[0m' $line
             print -n $'\0'
         done &)
     fi
@@ -1033,7 +1028,7 @@ zshrc_restart_precmd() {
     fi
 
     local startup
-    strftime -s startup '%Y-%m-%d %H:%M:%S' "$zshrc_startup_time"
+    strftime -s startup '%Y-%m-%d %H:%M:%S' $zshrc_startup_time
 
     echo -n "${fg[magenta]}"
     echo -n "~/.zshrc modified since startup ($startup) ... "
@@ -1055,9 +1050,9 @@ zshrc_restart_precmd() {
     # Don't kill our current session by execing it.
     zsh -i -c 'exit 42'
     if [[ $? -ne 42 ]]; then
-        echo -n "${fg_bold[red]}"
+        echo -n ${fg_bold[red]}
         echo 'failed to start new zsh!'
-        echo -n "${fg_bold[default]}"
+        echo -n ${fg_bold[default]}
         return
     fi