X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_zshrc;h=acd4fb107b18c3bf913151bcbad6c8e2a83162ed;hb=a20932caf06c7aa54a1bbf9fec8d235b67ef9b82;hp=1b28a352233caecf120650d2ee5dc03d2dcf19cb;hpb=4c535268bcef8149721d886a664ed980b9aef017;p=sugar.git

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 1b28a35..acd4fb1 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"
@@ -284,7 +284,23 @@ if [[ $(hostname) = "aria.cielonegro.org" ]]; then
     alias hengband='open ~/Applications/hengband*/Hengband*'
 
 elif [[ $(hostname) = "yukari.cielonegro.org" ]]; then
-    alias safari="ssh kurumi open -a Safari"
+    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
@@ -326,6 +342,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...
 
@@ -348,3 +385,5 @@ fi
 if which ssh-agent-manager >/dev/null 2>&1; then
     eval `ssh-agent-manager -s`
 fi
+
+_start_gpg_agent