X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=4795ab0798c77c78266b0418d72cbe5270fab220;hb=550ad254d2999033615dfd261a7b9e6592e83f89;hp=5336a6deffadbf31b281f91fa66ffa6a6615be70;hpb=37b4c318c94cecf19d21869474c42917e9b5fb8e;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 5336a6d..4795ab0 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -89,9 +89,33 @@ setopt appendhistory
 setopt incappendhistory
 # If the same command is run multiple times store it only once in the history.
 setopt histignoredups
-# Vim like completions of previous executed commands.
-bindkey "^P" history-beginning-search-backward
-bindkey "^N" history-beginning-search-forward
+# 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 likes starting with the typed are
+# returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh
+# on Freenode (2010-01-17 12:47) for the information how to a function with
+# bindkey.
+zle -N my-vi-history-beginning-search-backward
+my-vi-history-beginning-search-backward() {
+    local not_at_beginning_of_line
+    if [[ $CURSOR -ne 0 ]]; then
+        not_at_beginning_of_line=yes
+    fi
+
+    zle history-beginning-search-backward
+
+    # Start Vi-mode and stay at the same position (Vi-mode modes one left,
+    # this counters it).
+    zle vi-cmd-mode
+    if [[ -n $not_at_beginning_of_line ]]; then
+        zle vi-forward-char
+    fi
+}
+bindkey "^P" my-vi-history-beginning-search-backward
+bindkey -a "^P" history-beginning-search-backward # binding for Vi-mode
+# Here only Vi-mode is necessary as ^P enters Vi-mode and ^N only makes sense
+# after calling ^P.
+bindkey -a "^N" history-beginning-search-forward
 
 
 # PROMPT SETTINGS
@@ -365,6 +389,7 @@ alias -g L='E | less'
 alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
+alias -g U='| uniq'
 
 # Make going up directories simple.
 alias -g ...='../..'
@@ -470,8 +495,34 @@ if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
 fi
 
 
-# Load rc file for current OS.
-source_config ~/.zsh os rc $(uname) nolocal
+# OS SPECIFIC SETTINGS
+
+if [[ $(uname) == Linux ]]; then
+    # Settings to create Debian packages.
+    DEBEMAIL=simon@ruderich.org
+    export DEBEMAIL
+    DEBFULLNAME="Simon Ruderich"
+    export DEBFULLNAME
+
+elif [[ $(uname) == Darwin ]]; then # Mac OS X
+    # Store the current clipboard in CLIPBOARD before every command so it can
+    # be used in commands.
+    os_darwin_preexec() {
+        export CLIPBOARD="$(pbpaste)"
+    }
+    # Add the function as preexec hook.
+    add-zsh-hook preexec os_darwin_preexec
+
+    # Initialize CLIPBOARD so it's available for completion directly after
+    # startup.
+    CLIPBOARD=""
+    export CLIPBOARD
+
+    # Fetch current URL in clipboard with wget.
+    alias wnc='wget --no-proxy $CLIPBOARD'
+fi
+
+
 # Load rc file for current hostname (first part before a dot) or rc.local.
 source_config ~/.zsh host rc ${$(hostname)//.*/}