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

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 25972b6..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
@@ -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,24 +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"
-alias sent="mutt -f =sent-\`date '+%y-%m'\`"
 
 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 {{{
@@ -105,12 +101,12 @@ cddotdot() {
 zle -N cddotdot
 bindkey "OQ" cddotdot # F2
 
-pushdquiet() {
+popdquiet() {
     popd
     zle reset-prompt
 }
-zle -N pushdquiet
-bindkey "OS" pushdquiet # F4
+zle -N popdquiet
+bindkey "OS" popdquiet # F4
 # }}}
 
 # Git {{{
@@ -122,7 +118,6 @@ alias Gdc="git diff --cached"
 alias Gs="git show --show-signature"
 alias Gm="git diff --name-only --diff-filter=M"
 alias Gam="git commit --amend"
-
 alias Gl="git log --oneline --graph --decorate=short"
 alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
 
@@ -139,26 +134,18 @@ 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 "
 # }}}
 
 # GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_TTY
-# }}}
-
-# Virtualenv {{{
-venv() {
-    . /usr/local/bin/virtualenvwrapper.sh
-}
+export GPG_TTY=$(tty)
 # }}}
 
 # Mail {{{
@@ -166,7 +153,8 @@ 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
 # }}}
 
@@ -175,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%%\=*}
@@ -211,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 {}")
@@ -227,6 +214,11 @@ done < ~/.zhashd
 # }}}
 
 # autoenv {{{
-export AUTOENV_AUTH_FILE=~/.zautoenv-auth
 . ~/work/zsh-autoenv/autoenv.zsh
 # }}}
+
+# Virtualenv {{{
+venv() {
+    . /usr/local/bin/virtualenvwrapper.sh
+}
+# }}}