X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=zsh%2F.zshrc;h=de923956273cbd7632114cee6d9951cdb10aa592;hb=5c6ffef790baf56fb28d83e4661c9384980f8e05;hp=ebfebf491a52090fc9d1b41ffb1f21526f80fa2b;hpb=034ee63ce9336b2b5c7a4991538e6a7d51a781a0;p=dotfiles.git

diff --git a/zsh/.zshrc b/zsh/.zshrc
index ebfebf4..de92395 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,6 +5,7 @@ setopt GLOB_STAR_SHORT GLOB_DOTS EXTENDED_GLOB
 setopt NO_NOMATCH
 setopt AUTO_PUSHD PUSHD_IGNORE_DUPS
 setopt PIPE_FAIL
+setopt MULTIBYTE
 
 setopt RM_STAR_SILENT
 export LISTMAX=9999
@@ -74,11 +75,14 @@ precmd() {
 
 # Aliases {{{
 alias l="ls -AF "
-alias ll="ls -AFl "
+alias ll="ls -D \"%Y-%m-%d %H:%M\" -AFl "
 alias vi="vim"
 alias m="less "
 alias -g M="| less"
 alias -g W="| wc -l | sed 's/ //g'"
+alias -g T="| tai64nlocal"
+alias -g DN=">/dev/null"
+alias -g DNA=">&/dev/null"
 alias mc="mc --nomouse"
 
 f() {
@@ -88,8 +92,14 @@ f() {
 alias ssh="TERM=xterm ssh"
 alias sshnm="ssh -S none"
 ssht() {
-    ssh -C -t $1 tmux attach -t0
+    local t="-t 0"
+    TERM=xterm ssh -C -t $1 "tmux has-session $t && tmux attach-session $t || tmux new-session $t"
 }
+
+autoload -U zsh-mime-setup ; zsh-mime-setup
+alias -s html=lynx
+
+autoload -U zmv
 # }}}
 
 # Faster movement {{{
@@ -116,7 +126,7 @@ alias Gc="git checkout"
 alias Gd="git diff"
 alias Gdc="git diff --cached"
 alias Gs="git show --show-signature"
-alias Gm="git diff --name-only --diff-filter=M"
+alias Gm="git diff --name-only --diff-filter=M --relative"
 alias Gam="git commit --amend"
 alias Gl="git log --oneline --graph --decorate=short"
 alias Gld="git log --format=format:'%ai %Cgreen%h%Creset %s'"
@@ -137,9 +147,6 @@ GREP_ARGS=(
 g() {
     grep $GREP_ARGS $@ | less
 }
-GS() {
-    grep $GREP_ARGS $@ | sort --numeric-sort | less
-}
 alias -g G="| grep --colour=always"
 alias gg="git grep "
 # }}}
@@ -159,11 +166,30 @@ bindkey -s "OP" " inc\n" # F1
 # }}}
 
 # Completion {{{
+zstyle ":completion:*" list-colors ""
+
 zstyle ":completion:*:functions" ignored-patterns "_*"
-zstyle ":completion:*" matcher-list "" 'm:{a-z\-}={A-Z\_}' 'r:|?=** m:{a-z\-}={A-Z\_}'
+zstyle ":completion:*:manuals" separate-sections true
+
+zstyle ":completion:*" group-name ""
+zstyle ":completion:*:messages" format "%d"
+zstyle ":completion:*:warnings" format "%F{red}no matches: %d%f"
+zstyle ":completion:*:*:*:*:descriptions" format "%B... %d%b"
+zstyle ":completion:*:files:*:*:descriptions" format ""
+
+zstyle ":completion:*" file-patterns "%p:globbed" "*"
+zstyle ":completion:*" matcher-list "" "m:{a-z-}={A-Z_}" "r:|?=** m:{a-z-}={A-Z_}"
+zstyle ":completion:*:man:*:*:*" matcher-list "" "m:{a-zA-Z}={A-Za-z} l:|=* r:|=*"
+zstyle ":completion:*" completer _mycomp _mycomp_man:man _parameters _ignored
+
 _mycomp () {
-    [[ ${words[1]} != man ]] || { _man && return 0 }
-    [[ $CURRENT -eq 1 ]] && _command_names || _files && return 0
+    [[ $CURRENT -eq 1 ]] && curcontext="${curcontext%:*:*}:-command-:" \
+        _command_names && return
+    [[ $IPREFIX =~ ~.* ]] && _tilde && return
+    local has_files
+    curcontext=:files:${curcontext#:*:} _files && has_files=1
+    [[ $has_files ]] && return
+
     # MAGIC_EQUAL_SUBST {{{
     [[ $PREFIX = *\=* ]] || return 1
     compstate[parameter]=${PREFIX%%\=*}
@@ -171,9 +197,15 @@ _mycomp () {
     _value
     # }}}
 }
-zstyle ":completion:*" completer _mycomp _parameters
+
+_mycomp_man () {
+    [[ ${words[1]} == man ]] && curcontext=:man:${curcontext#:*:} \
+        _dispatch "" man man "" -default- && _value && return
+    [[ ${words[1]} == info ]] && curcontext=:info:${curcontext#:*:} \
+        _dispatch "" info info "" -default- && return
+}
+
 autoload -U compinit ; compinit -d /tmp/.zcompdump
-zstyle ":completion:*:default" list-colors ""
 autoload -U complist
 # }}}
 
@@ -216,12 +248,12 @@ while read w ; do
 done < ~/.zhashd
 # }}}
 
-# autoenv {{{
-. ~/work/zsh-autoenv/autoenv.zsh
-# }}}
-
 # Virtualenv {{{
 venv() {
     . /usr/local/bin/virtualenvwrapper.sh
 }
 # }}}
+
+# autoenv {{{
+. ~/work/zsh-autoenv/autoenv.zsh
+# }}}