X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=34dc4ed83b8fe63b836143715974ddb051fc64e0;hb=3230001683e746f0bfe3337d627c69c6a66f0df5;hp=2fe5530f4ca2e6f188a418cfb0b40c13a0bfbc71;hpb=9a26f25110f8f0de8ab1f7b787ccd80420c4ddef;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 2fe5530..34dc4ed 100644 --- a/zsh/rc +++ b/zsh/rc @@ -47,7 +47,9 @@ fi fpath=(~/.zsh/functions $fpath) # Autoload my functions (except completion functions and hidden files). Thanks # to caphuso from the Zsh example files for this idea. -autoload ${fpath[1]}/^_*(^/:t) +if [[ -d ~/.zsh/functions ]]; then + autoload ${fpath[1]}/^_*(^/:t) +fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At # the moment only precmd() and preexec() are simulated. @@ -74,12 +76,14 @@ fi # Autoload add-zsh-hook to add/remove zsh hook functions easily. autoload -Uz add-zsh-hook +# Load zmv (zsh move) which is powerful to rename files. +autoload zmv # HISTORY SETTINGS # Use history and store it in ~/.zsh/history. -HISTSIZE=5000 -SAVEHIST=5000 +HISTSIZE=50000 +SAVEHIST=50000 HISTFILE=~/.zsh/history # Append to the history file instead of overwriting it and do it immediately # when a command is executed. @@ -87,9 +91,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 @@ -240,12 +268,20 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. + local name="zsh" + # If the function was called with an argument then reset the window + # name to '.zsh' (used by clear alias). + if [[ -n $1 ]]; then + name=".zsh" + fi + + # Prepend prefixes like in window_preexec(). if [[ -n $SSH_CONNECTION ]]; then - window_title "@zsh" + window_title "@$name" elif [[ -n $window_root ]]; then - window_title "!zsh" + window_title "!$name" else - window_title "zsh" + window_title $name fi # Just reset the name, so no screen reset necessary for the moment. @@ -355,6 +391,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 ...='../..' @@ -401,7 +438,7 @@ function ll() { # important. This helps me to remember which windows are empty (I run clear # after I finished my work in a window). if [[ -n $window_reset ]]; then - alias clear='clear; window_title .zsh' + alias clear='clear; window_reset=yes; window_precmd reset' fi # I sometimes confuse editor and shell, print a warning to prevent I exit the @@ -460,8 +497,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)//.*/}