From 89f9a545cb9143abfe33a9d3ad634dfd0d1d895b Mon Sep 17 00:00:00 2001
From: Mathieu Maret <mathieu.maret@gmail.com>
Date: Mon, 26 Nov 2012 15:20:00 +0100
Subject: [PATCH] AutoConnect for irssi. Env for zsh

---
 .irssi/config                    |  5 ++---
 .zsh/host:hector/Environment.zsh | 18 ++++++++++--------
 scripts/run_mutt.sh              |  6 ++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.irssi/config b/.irssi/config
index ad18700..746f51d 100644
--- a/.irssi/config
+++ b/.irssi/config
@@ -38,7 +38,7 @@ servers = (
     chatnet = "freenode";
     use_ssl = "no";
     ssl_verify = "no";
-    autoconnect = "no";
+    autoconnect = "yes";
   }
 );
 
@@ -129,8 +129,7 @@ chatnets = {
 };
 
 channels = (
-  { name = "&bitlbee"; chatnet = "bitlbee"; autojoin = "yes"; }
-  { name = "#openwide"; chatnet = "freenode"; autojoin = "no"; },
+  { name = "#openwide"; chatnet = "freenode"; autojoin = "yes"; },
 );
 
 aliases = {
diff --git a/.zsh/host:hector/Environment.zsh b/.zsh/host:hector/Environment.zsh
index 62b3106..54374da 100755
--- a/.zsh/host:hector/Environment.zsh
+++ b/.zsh/host:hector/Environment.zsh
@@ -12,15 +12,17 @@ export EDITOR=/usr/bin/vim
 #export http_proxy="http://grp-horus:3128" 
 #export https_proxy="http://grp-horus:3128"
 #export ftp_proxy="http://grp-horus:3128"
-export ANDROID_DIR=/home/mathieu/android/android-sdk-linux_86
-export ANDROID_HOME=/home/mathieu/android/android-sdk-linux_86
-export ANDROID_SKD=/home/mathieu/android/android-sdk-linux/platforms/android-1.6
-#export PATH=$ANDROID_DIR/tools:$PATH
-export JAVA_HOME=/opt/java
-export CATALINA_HOME=/usr/share/tomcat6
-export PATH=$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_SKD/tools:$ECLIPSE_HOME:$PATH
-
+export ANDROID_HOME=/opt/android-sdk
+export ANDROID_PLATFROM=/opt/android-sdk/platform-tools
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk/jre
+#export CATALINA_HOME=/usr/share/tomcat6
+export RUBY_HOME=/opt/ruby1.8
+export ANT_HOME=/usr/share/java/apache-ant/
+export MAILMAN_HOME=/usr/lib/mailman
+export PATH=$MAILMAN_HOME/bin:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_PLATFROM:$RUBY_HOME/bin:$ANT_HOME/bin:$ECLIPSE_HOME:$PATH
 
+export RYHOME=/home/mathieu/Source/ryzom/code
+export PACMAN=pacman-color
 
 #emacsAndViKeys
 #bindkey -v
diff --git a/scripts/run_mutt.sh b/scripts/run_mutt.sh
index e29cf3d..d4b9d1b 100755
--- a/scripts/run_mutt.sh
+++ b/scripts/run_mutt.sh
@@ -4,6 +4,12 @@ is_running=`ps aux| grep gpg-agent| grep -v grep`
 
 if [ $is_running ] ; then
 	echo "gpg is running";
+	if [ -f "${HOME}/.gpg-agent-info" ]; then
+		. "${HOME}/.gpg-agent-info"
+		export GPG_AGENT_INFO
+		export SSH_AUTH_SOCK
+		export SSH_AGENT_PID
+	fi
 else
 	env=`./run_gpg.sh`
 	source $env