X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=zsh%2Frc;h=b6c359c8f577c58ec1274013b6c55fc9139a7aa1;hb=7dd54dfed63769d41326e9ef6c092a6d436df6d4;hp=876bfc785470754268c6317cca4fa7c0cd3a5f98;hpb=c7f5fb40c46b8c99ddc93fbc1df2987e178e0124;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 876bfc7..b6c359c 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -153,6 +153,7 @@ setopt incappendhistory
 setopt histignoredups
 # Don't add lines starting with a space to the history.
 setopt histignorespace
+
 # Vim like completions of previous executed commands (also enter Vi-mode). If
 # called at the beginning it just recalls old commands (like cursor up), if
 # called after typing something, only lines starting with the typed text are
@@ -181,6 +182,16 @@ bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode
 # after calling ^P.
 bindkey -a '^N' history-beginning-search-forward
 
+# Enable incremental search which is especially useful when the string is an
+# argument and not the command.
+bindkey '^R' history-incremental-search-backward
+# Also enable my usual use of Ctrl-P/Ctrl-N to get the previous/next matching
+# history entry.
+if [[ $ZSH_VERSION == (4.<4->*|<5->*) ]]; then
+    bindkey -M isearch '^P' history-incremental-search-backward
+    bindkey -M isearch '^N' history-incremental-search-forward
+fi
+
 # Automatically push cd-ed directories on the directory stack.
 setopt autopushd
 # Don't push duplicates on the directory stack.
@@ -517,11 +528,17 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
                 program_name=git
                 ;;
             m)
-                program_name=mutt
+                program_name=make
+                ;;
+            p)
+                program_name=less
                 ;;
             v)
                 program_name=vim
                 ;;
+            mu)
+                program_name=mutt
+                ;;
         esac
 
         # Add an exclamation mark at the beginning if running with sudo or if
@@ -723,6 +740,12 @@ zle -C complete-files complete-word _generic
 zstyle ':completion:complete-files:*' completer _files
 bindkey '^F' complete-files
 
+# Completion for my wrapper scripts
+compdef slocate=locate
+compdef srsync=rsync
+compdef srsync-incremental=rsync
+compdef svalgrind=valgrind
+
 
 # CUSTOM ALIASES AND FUNCTIONS
 
@@ -826,13 +849,9 @@ elif (( $+commands[zathura] )); then
     compdef _xpdf pdf
 fi
 
-# GHCI doesn't use readline, force it if rlwrap is available.
-(( $+commands[rlwrap] )) && ghci() {
-    command rlwrap \
-        --always-readline --complete-filenames -t dumb \
-        --histsize 5000 \
-        --file ~/.shell/rlwrap/ghci \
-        ghci "$@" 2>&1
+# Better viewer for info pages .. just pipe everything into less.
+info() {
+    command info "$@" 2>/dev/null | less
 }