X-Git-Url: http://www.git.stargrave.org/?p=dotfiles.git;a=blobdiff_plain;f=zsh%2F.zshrc;h=55c0ce110ab829e4724f93f65cd97fdc9f938db9;hp=119bc385041c9ead3307be6f9d2240c8fc2fd1d4;hb=HEAD;hpb=8b9bc47b7f84a96b9182e6614e812abf190f52e8

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 119bc38..55c0ce1 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,188 +1 @@
-# vim: foldmethod=marker:foldlevel=0
-
-# Basic options {{{
-setopt APPEND_HISTORY SHARE_HISTORY INC_APPEND_HISTORY HIST_IGNORE_ALL_DUPS
-setopt HIST_IGNORE_SPACE
-setopt INTERACTIVE_COMMENTS
-setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
-setopt NO_NOMATCH
-setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
-
-setopt RM_STAR_SILENT
-export LISTMAX=9999
-# }}}
-
-# Vi mode {{{
-bindkey -v
-export KEYTIMEOUT=1
-# }}}
-
-# Home/end {{{
-bindkey "^[[1~" beginning-of-line
-bindkey "^[[4~" end-of-line
-# }}}
-
-# Command-line editing {{{
-autoload -U edit-command-line
-zle -N edit-command-line
-bindkey -M vicmd v edit-command-line
-# }}}
-
-# History search {{{
-autoload -U history-search-end
-zle -N history-beginning-search-backward-end history-search-end
-zle -N history-beginning-search-forward-end history-search-end
-bindkey "^[[A" history-beginning-search-backward-end
-bindkey "^[[B" history-beginning-search-forward-end
-bindkey "^R" history-incremental-pattern-search-backward
-# }}}
-
-# Prompt {{{
-function zle-line-init zle-keymap-select {
-    mode_vi="${${KEYMAP/vicmd/+}/(main|viins)/-}"
-    [ $timer ] && timer_show=$(( $SECONDS - $timer ))
-    prompt="%2~|"
-    prompt+="%U${timer_show}%u|"
-    prompt+="%B%?%b"
-    prompt+="${mode_vi}"
-    prompt+="%F{magenta}%#%f "
-    PS1="$prompt"
-    zle reset-prompt
-}
-zle -N zle-line-init
-zle -N zle-keymap-select
-
-preexec() {
-    timer=$SECONDS
-}
-
-precmd() {
-    print -n "\a"
-}
-# }}}
-
-# Tmux pane name {{{
-CTP()
-{
-    printf "\033]2;\033\\"
-}
-CTP
-# }}}
-
-# 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 mc="mc --nomouse ; CTP"
-bindkey -s "OS" " popd\n" # F4
-
-f() {
-    # find . -name "*$1*" -print
-    print -C 1 **$1*
-}
-
-ssht() {
-    ssh -C -t "$1" tmux attach -t0
-}
-alias sshnm='ssh -S none'
-# }}}
-
-# Git {{{
-alias Ga="git add"
-alias Gb="git branch"
-alias Gc="git checkout"
-alias Gd="git diff"
-alias Gs="git show"
-alias Gm="git diff --name-only --diff-filter=M"
-alias Gam="git commit --amend"
-alias -g W="| wc -l"
-
-git_common="--oneline --abbrev-commit"
-alias Gl="git log $git_common --graph --decorate=short"
-alias Gr="git --no-pager log $git_common -n 20 | perl -ne 'print \"@~\$n \$_\"; \$n++'"
-alias Grr="git --no-pager log $git_common --graph -n 1024 | vi -c 'e ++enc=utf8' -"
-alias Grpck="git gc --prune=now ; git repack -a -d --depth=4095 --window=10240"
-
-bindkey -s "OQ" " git status\n" # F2
-bindkey -s "OR" " git status --short\n" # F3
-# }}}
-
-# grep {{{
-GREP=/usr/local/bin/grep
-GREP_ARGS="--color=always --with-filename --line-number --recursive"
-LESS_COLORED="less --RAW-CONTROL-CHARS"
-g() {
-    $GREP ${=GREP_ARGS} $@ | ${=LESS_COLORED}
-}
-GS() {
-    $GREP ${=GREP_ARGS} $@ | sort --numeric-sort | ${=LESS_COLORED}
-}
-alias -g G="| $GREP --color"
-alias gg="git grep "
-# }}}
-
-# GPG agent {{{
-GPG_TTY=$(tty)
-export GPG_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 rss="mutt -f =rss"
-bindkey -s "OP" " inc\n" # F1
-# }}}
-
-# Calculator {{{
-autoload -U zcalc
-alias zc="zcalc"
-# }}}
-
-
-# Completion {{{
-zstyle ":completion:*:functions" ignored-patterns "_*"
-zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
-_mycomp () {
-    [ $CURRENT -eq 1 ] && _command_names || _files && return 0
-    # MAGIC_EQUAL_SUBST {{{
-    [[ "$PREFIX" = *\=* ]] || return 1
-    compstate[parameter]="${PREFIX%%\=*}"
-    compset -P 1 "*="
-    _value
-    # }}}
-}
-zstyle ":completion:*" completer _mycomp _parameters
-autoload -U compinit ; compinit -d /tmp/.zcompdump
-zstyle ":completion:*:default" list-colors ""
-autoload -U complist
-# }}}
-
-# Highlighting {{{
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
-. ~/work/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-typeset -A ZSH_HIGHLIGHT_STYLES
-ZSH_HIGHLIGHT_STYLES[globbing]="fg=magenta"
-ZSH_HIGHLIGHT_STYLES[history-expansion]="fg=magenta"
-ZSH_HIGHLIGHT_STYLES[commandseparator]="fg=red"
-ZSH_HIGHLIGHT_STYLES[redirection]="fg=red"
-ZSH_HIGHLIGHT_STYLES[assign]="fg=cyan"
-# }}}
-
-# Autosuggestion {{{
-. ~/work/zsh-autosuggestions/zsh-autosuggestions.zsh
-ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=6"
-# }}}
-
+for z (~/.zsh/rc/*(on)) . $z