X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=2f04f405d7c11c5f137d809fe317200896c54a45;hb=84459e7933fc0295bd414dc21ad5d6bccd669a64;hp=0e348e9f5795c3e7926b48a4bacf2045e223cfe3;hpb=bd7d1f8649fdde5bf42d7fdea3aff3afb76067a7;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 0e348e9..2f04f40 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
@@ -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,7 +75,6 @@ precmd() {
 # Aliases {{{
 alias l="ls -AF "
 alias ll="ls -AFl "
-alias ssh="TERM=xterm ssh"
 alias vi="vim"
 alias m="less "
 alias -g M="| less"
@@ -84,14 +82,14 @@ 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 {{{
@@ -136,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 "
@@ -151,18 +148,12 @@ alias gg="git grep "
 export GPG_TTY=$(tty)
 # }}}
 
-# Virtualenv {{{
-venv() {
-    . /usr/local/bin/virtualenvwrapper.sh
-}
-# }}}
-
 # Mail {{{
 mailpath=(
     ~/mail/mbox"?Neue Nachrichten in =mbox"
     ~/mail/arbeit"?Neue Nachrichten in =arbeit"
 )
-alias arr="mutt -f \=arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
+alias arr="mutt -f =arbeit -e 'source ~/.mutt/accounts/stcnet.ru'"
 alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 bindkey -s "OP" " inc\n" # F1
 # }}}
@@ -225,3 +216,9 @@ done < ~/.zhashd
 # autoenv {{{
 . ~/work/zsh-autoenv/autoenv.zsh
 # }}}
+
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
+}
+# }}}