ls date format

[dotfiles.git] / zsh / .zshrc

diff --git a/zsh/.zshrc b/zsh/.zshrc
index a211a2671f38fee15fe6feee9eda301c01ba275c..7e8cc22ec3218606c277d494fff631cce7ac0aec 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -75,7 +75,7 @@ precmd() {
 
 # Aliases {{{
 alias l="ls -AF "
-alias ll="ls -AFl "
+alias ll="ls -D %Y-%m-%d -AFl "
 alias vi="vim"
 alias m="less "
 alias -g M="| less"
@@ -90,7 +90,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
@@ -176,7 +177,8 @@ 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-:" \
@@ -184,10 +186,6 @@ _mycomp () {
     [[ $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 {{{
@@ -198,6 +196,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
 # }}}