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

diff --git a/zsh/rc b/zsh/rc
index 7c5ab05..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
@@ -629,7 +629,7 @@ 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
@@ -665,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
@@ -813,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'
@@ -863,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.
@@ -1052,7 +1068,4 @@ zshrc_restart_precmd() {
 }
 precmd_functions+=(zshrc_restart_precmd)
 
-
-source_debug '. ~/.zsh/rc (done)'
-
 # vim: ft=zsh