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

diff --git a/zsh/rc b/zsh/rc
index ece0a2d..96b45e4 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -16,9 +16,6 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-source_debug '. ~/.zsh/rc'
-
-
 # Warn when creating global variables from inside a function. Needs to be set
 # before declaring a function.
 setopt warn_create_global
@@ -78,6 +75,9 @@ setopt extendedglob
 # pressing <C-D> twice).
 setopt ignoreeof
 
+# Also display PID when suspending a process.
+setopt longlistjobs
+
 
 # KEY BINDINGS
 
@@ -205,7 +205,7 @@ setopt pushdminus
 # PROMPT SETTINGS
 
 # Use colorized output, necessary for prompts and completions.
-autoload -Uz colors && colors
+autoload -Uz colors; colors
 
 # Necessary for $EPOCHSECONDS, the UNIX time.
 zmodload zsh/datetime
@@ -528,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
@@ -623,16 +629,32 @@ 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 -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
+autoload -Uz compinit; compinit -d ~/.zsh/cache/zcompdump
 
 # Use cache to speed up some slow completions (dpkg, perl modules, etc.).
 zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' cache-path ~/.zsh/cache
 
+# List all files in the current directory when pressing tab on an empty input,
+# behave like complete-word otherwise. Thanks to John Eikenberry [1] for the
+# code, read on 2014-03-15.
+#
+# [1]: http://unix.stackexchange.com/a/32426
+complete-word-or-complete-list-of-files() {
+    if [[ $#BUFFER == 0 ]]; then
+        BUFFER='ls '
+        CURSOR=3
+        zle list-choices
+        zle backward-kill-word
+    else
+        zle complete-word
+    fi
+}
+zle -N complete-word-or-complete-list-of-files
 # Let the completion system handle all completions, including expanding of
 # shell wildcards (which is handled by other shell mechanisms if the default
 # expand-or-complete is used).
-bindkey '^I' complete-word
+bindkey '^I' complete-word-or-complete-list-of-files
 # If there are multiple matches after pressing <Tab> always display them
 # immediately without requiring another <Tab>. a<Tab> completes to aa and
 # lists aaa, aab, aac as possible completions if the directory contains aaa,
@@ -643,8 +665,21 @@ setopt nolistambiguous
 # the _prefix completer.
 setopt completeinword
 
+# Force a reload of the completion system if nothing matched; this fixes
+# installing a program and then trying to tab-complete its name. Thanks to
+# Alex Munroe [1] for the code, read on 2014-03-03.
+#
+# [1]: https://github.com/eevee/rc/blob/master/.zshrc
+_force_rehash() {
+    if (( CURRENT == 1 )); then
+        rehash
+    fi
+    # We didn't really complete anything.
+    return 1
+}
+
 zstyle ':completion:::::' completer \
-    _expand _complete _prefix _ignored _approximate
+    _force_rehash _expand _complete _prefix _ignored _approximate
 
 # Match specification to be tried when completing items. Each group ('...') is
 # tried after another if no matches were found, once matches are found no
@@ -705,6 +740,14 @@ zle_highlight=(suffix:none)
 
 # Ignore completion functions.
 zstyle ':completion:*:functions' ignored-patterns '_*'
+
+# When offering typo corrections, do not propose anything which starts with an
+# underscore (such as many of Zsh's shell functions). Thanks to paradigm [1]
+# for the idea (read on 2013-04-07).
+#
+# [1]: https://github.com/paradigm/dotfiles/blob/master/.zshrc
+CORRECT_IGNORE='_*'
+
 # Ignore parent directory.
 zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
 # Always complete file names only once in the current line. This makes it easy
@@ -783,6 +826,9 @@ alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines
 alias -g D='2>&1 | colordiff | less'
 # Global aliases for often used commands.
 alias -g A='| awk'
+alias -g A1="| awk '{ print \$1 }'"
+alias -g A2="| awk '{ print \$2 }'"
+alias -g A3="| awk '{ print \$3 }'"
 alias -g G='| grep'
 alias -g H='| head'
 alias -g P='| perl'
@@ -833,14 +879,14 @@ if (( $+commands[xpdf] )); then
         command xpdf "$@" 2>/dev/null &
         disown %command
     }
-    compdef _xpdf pdf
+    compdef pdf=xpdf
 elif (( $+commands[zathura] )); then
     pdf() {
         command zathura "$@" 2>/dev/null &
         disown %command
     }
     # No completion for zathura yet.
-    compdef _xpdf pdf
+    compdef pdf=xpdf
 fi
 
 # Better viewer for info pages .. just pipe everything into less.
@@ -1022,7 +1068,4 @@ zshrc_restart_precmd() {
 }
 precmd_functions+=(zshrc_restart_precmd)
 
-
-source_debug '. ~/.zsh/rc (done)'
-
 # vim: ft=zsh