X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=b495593882dc6b640f33481d2a9064767319b762;hb=bcdb616f7c3af3d779ad7bf979be7c3a0fe9d404;hp=62390a09565ba4a13fd200cba7b02eb36f3e9319;hpb=bf682372c203aef0e62cecaaf4df9ea3288b53b1;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 62390a0..b495593 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,7 +1,6 @@
 # vim: foldmethod=marker:foldlevel=0
 
 # Basic options {{{
-setopt INTERACTIVE_COMMENTS
 setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
@@ -23,8 +22,8 @@ export KEYTIMEOUT=1
 # }}}
 
 # Home/end {{{
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
+bindkey "^[[1~" beginning-of-line # Home
+bindkey "^[[4~" end-of-line # End
 # }}}
 
 # Command-line editing {{{
@@ -53,7 +52,7 @@ bindkey -M isearch "^[[B" history-incremental-pattern-search-forward
 function zle-line-init zle-keymap-select {
     mode_vi=${${KEYMAP/vicmd/+}/(main|viins)/-}
     [[ $timer ]] && timer_show=$(( $SECONDS - $timer ))
-    prompt="%2~|"
+    prompt="%2~ "
     prompt+="%U${timer_show}%u|"
     prompt+="%B%?%b"
     prompt+="${mode_vi}"
@@ -76,23 +75,21 @@ precmd() {
 # Aliases {{{
 alias l="ls -AF "
 alias ll="ls -AFl "
-alias ssh="TERM=xterm ssh"
 alias vi="vim"
-alias more="less"
 alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l | sed 's/ //g'"
 alias mc="mc --nomouse"
 
 f() {
-    # find . -name "*$1*" -print
-    print -C 1 **$1*
+    find . -name "*$1*" -print
 }
 
+alias ssh="TERM=xterm ssh"
+alias sshnm="ssh -S none"
 ssht() {
     ssh -C -t $1 tmux attach -t0
 }
-alias sshnm="ssh -S none"
 # }}}
 
 # Faster movement {{{
@@ -137,12 +134,11 @@ GREP_ARGS=(
     --exclude-dir=.git
     --exclude-dir=.tags
 )
-LESS_COLOURED=(less --RAW-CONTROL-CHARS)
 g() {
-    grep $GREP_ARGS $@ | $LESS_COLOURED
+    grep $GREP_ARGS $@ | less
 }
 GS() {
-    grep $GREP_ARGS $@ | sort --numeric-sort | $LESS_COLOURED
+    grep $GREP_ARGS $@ | sort --numeric-sort | less
 }
 alias -g G="| grep --colour=always"
 alias gg="git grep "
@@ -152,12 +148,6 @@ alias gg="git grep "
 export GPG_TTY=$(tty)
 # }}}
 
-# Virtualenv {{{
-venv() {
-    . /usr/local/bin/virtualenvwrapper.sh
-}
-# }}}
-
 # Mail {{{
 mailpath=(
     ~/mail/mbox"?Neue Nachrichten in =mbox"
@@ -173,7 +163,7 @@ zstyle ":completion:*:functions" ignored-patterns "_*"
 zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
 _mycomp () {
     [[ ${words[1]} != man ]] || { _man && return 0 }
-    [[ $CURRENT -eq 1 ]] && _command_names ||  _files && return 0
+    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
     # MAGIC_EQUAL_SUBST {{{
     [[ $PREFIX = *\=* ]] || return 1
     compstate[parameter]=${PREFIX%%\=*}
@@ -209,7 +199,6 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # }}}
 
 # fzf {{{
-export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 cf() {
     local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
         fzf --height 40% --reverse --preview="tree -CN {}")
@@ -225,6 +214,11 @@ done < ~/.zhashd
 # }}}
 
 # autoenv {{{
-export AUTOENV_AUTH_FILE=~/.zautoenv-auth
 . ~/work/zsh-autoenv/autoenv.zsh
 # }}}
+
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
+}
+# }}}