X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshrc;h=4d0f974c6902286747ca70818279e713e6a078e7;hb=HEAD;hp=2bcc8af75879aeceea15c7179508884b11836e33;hpb=0cc3f71ce5d98f500c5603eb933dced5857540d4;p=sugar.git

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 2bcc8af..4d0f974 100644
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -2,7 +2,7 @@
 bindkey -e
 
 stty -ixon ixany
-stty erase '^H'
+#stty erase '^H'
 
 # The following lines were added by compinstall
 zstyle :compinstall filename "$HOME/.zshrc"
@@ -17,6 +17,7 @@ zstyle ':completion:*' use-cache true
 if [[ -d "$HOME/.zfunc" ]]; then
     fpath=($HOME/.zfunc $fpath)
     autoload -U ~/.zfunc/*(:t)
+    compinit
     function r() {
         local f
         f=(~/.zfunc/*(.))
@@ -217,7 +218,7 @@ if [[ -r "$HOME/sandbox/_misc/z/z.sh" ]]; then
         selected=$(_z -r 2>&1 | \
             "${tac_cmd[@]}" | \
             percol --query "$LBUFFER" | \
-            sed -E 's/[^[:space:]]+[[:space:]]+//')
+            sed -r 's/[^[:space:]]+[[:space:]]+//')
 
         if [[ $? -eq 0 ]]; then
             cd "${selected}"
@@ -226,6 +227,7 @@ if [[ -r "$HOME/sandbox/_misc/z/z.sh" ]]; then
         fi
 
         zle reset-prompt
+        return 0
     }
 
     if which percol >&/dev/null; then
@@ -245,6 +247,7 @@ function lv() {
         lv_cmd=("more")
     else
         echo >&2 "$0: no pager commands are found"
+        return 1
     fi
 
     command "${lv_cmd[@]}" "$@"
@@ -275,29 +278,49 @@ alias w3mb="w3m -O UTF-8 -B"
 alias aria-emacs="ssh -f -X admin@aria.cielonegro.org emacsclient -c"
 alias pho-dev-boinc="ssh -f -X pho@pho.dev.office.ymir.co.jp env LANG=C /home/pho/var/BOINC/run_manager"
 
-if [ $(hostname) = "aria.cielonegro.org" ]; then
-    alias safari="open -a Safari"
+if [[ $(hostname) = "aria.cielonegro.org" ]]; then
     alias unstuff='open -a StuffIt\ Expander.app'
     alias pa='open -a NiseRingo.app'
     alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app'
     alias hengband='open ~/Applications/hengband*/Hengband*'
-    alias syssleep='sudo shutdown -s now'
+
+elif [[ $(hostname) = "yukari.cielonegro.org" ]]; then
+    function safari () {
+        local -a args
+        for arg in $@; do
+            args=(${args[@]} $(printf %q "$arg"))
+        done
+        ssh kurumi open -a Safari ${args[@]}
+    }
+    function mfirefox () {
+        local -a args
+        for arg in $@; do
+            args=(${args[@]} $(printf %q "$arg"))
+        done
+        ssh kurumi open -a Firefox ${args[@]}
+    }
+    function mdock () {
+        ssh kurumi open -a Dock
+    }
 fi
 
 if [[ $(uname) = "Darwin" ]]; then
+    alias safari="open -a Safari"
+
     alias ldd="otool -L"
 
     alias ls='ls -Fw'
     alias la='ls -aw'
-    alias l='ls -lw'
-    alias lls='ls -law'
+    alias l='ls -lhw'
+    alias lls='ls -lahw'
 
-    alias top='/usr/bin/top -X -o cpu'
+    #alias top='/usr/bin/top -X -o cpu'
+    alias top='/usr/bin/top -o cpu'
 else
     alias ls='ls -F'
     alias la='ls -a'
-    alias l='ls -l'
-    alias lls='ls -la'
+    alias l='ls -lh'
+    alias lls='ls -lah'
 fi
 
 function osname () {
@@ -320,6 +343,27 @@ function osname () {
     esac
 }
 
+function _start_gpg_agent () {
+    if ! which gpg-agent >&/dev/null; then
+        # gpg-agent is not present.
+        return
+    fi
+
+    if gpg-connect-agent /bye >&/dev/null; then
+        # gpg-agent is already running.
+        if [[ -f "${HOME}/.gpg-agent-info" ]]; then
+            . "${HOME}/.gpg-agent-info"
+            export GPG_AGENT_INFO
+        fi
+    else
+        # gpg-agent is not running yet.
+        eval $(gpg-agent --daemon --write-env-file "${HOME}/.gpg-agent-info")
+    fi
+
+    GPG_TTY=$(tty)
+    export GPG_TTY
+}
+
 if _we_are_in_gnu_screen; then
     # When we are in a GNU Screen session...
 
@@ -342,3 +386,5 @@ fi
 if which ssh-agent-manager >/dev/null 2>&1; then
     eval `ssh-agent-manager -s`
 fi
+
+_start_gpg_agent