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

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 13cdff3..de92395 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -75,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() {
@@ -89,7 +92,8 @@ 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
@@ -175,17 +179,15 @@ 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:*" completer _mycomp _parameters _ignored
+zstyle ":completion:*:man:*:*:*" matcher-list "" "m:{a-zA-Z}={A-Za-z} l:|=* r:|=*"
+zstyle ":completion:*" completer _mycomp _mycomp_man:man _parameters _ignored
 
 _mycomp () {
     [[ $CURRENT -eq 1 ]] && curcontext="${curcontext%:*:*}:-command-:" \
         _command_names && return
+    [[ $IPREFIX =~ ~.* ]] && _tilde && return
     local has_files
     curcontext=:files:${curcontext#:*:} _files && has_files=1
-    [[ ${words[1]} == man ]] && curcontext=:man:${curcontext#:*:} \
-        _dispatch "" man man "" -default- && _value && return
-    [[ ${words[1]} == info ]] && curcontext=:info:${curcontext#:*:} \
-        _dispatch "" info info "" -default- && return
     [[ $has_files ]] && return
 
     # MAGIC_EQUAL_SUBST {{{
@@ -196,6 +198,13 @@ _mycomp () {
     # }}}
 }
 
+_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
 autoload -U complist
 # }}}
@@ -239,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
+# }}}