# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1434514493 -7200
# Node ID e4ed204c90fa811a07827734260248b91b3f37d1
# Parent  78beae5a0f7f96121a58756906fa25f2a45c6f91# Parent  9222611c7a2e2d2ac467d5325a9a14c88a4ba624
Automated merge with https://localhost/hg/zsh-env

diff -r 9222611c7a2e -r e4ed204c90fa zshrc
--- a/zshrc	Wed Jun 17 06:13:58 2015 +0200
+++ b/zshrc	Wed Jun 17 06:14:53 2015 +0200
@@ -34,6 +34,7 @@
 alias pd=pushd
 alias history="history 1"
 alias ta="tmux attach -t"
+alias tl="tmux list-sessions"
 alias tn="tmux new -s"
 
 # no history handling for now ... or find a better way to save history per shell not across all shells
@@ -50,7 +51,7 @@
 # get rid of the silly "zsh: sure you want to delete all the files in ..." message
 unsetopt normstarsilent
 
-# turn of the "helpful" zsh feature of pushing each directory to the dir stack on cd
+# turn off the "helpful" zsh feature of pushing each directory to the dir stack on cd
 unsetopt autopushd
 
 # turn off "helpful" auto correction
diff -r 9222611c7a2e -r e4ed204c90fa zshrc-cassiopeia
--- a/zshrc-cassiopeia	Wed Jun 17 06:13:58 2015 +0200
+++ b/zshrc-cassiopeia	Wed Jun 17 06:14:53 2015 +0200
@@ -5,9 +5,9 @@
 . $HOME/.zsh-env/zshrc-jdk
 . $HOME/.zsh-env/zshrc-maven
 . $HOME/.zsh-env/zshrc-bindkey
-. $HOME/.autoenv/activate.sh
+. $HOME/.zsh-autoenv/autoenv.zsh
 
-export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/trunk
+export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/rpi-git
 export MULE_TEST_OPTS="-Dmule.verbose=false"
 export MULE_TEST_TIMEOUTSECS=9999
 export PATH="$HOME/bin:${PATH}"
@@ -20,9 +20,9 @@
 alias bzip=lbzip2
 alias df="df -h"
 alias env="env | sort | $PAGER"
-alias ex-dist="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-dist"
-alias ex-eclipse="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-eclipse"
-alias ex-install="/home/dirk/Projects/Exentra/RPI/trunk/utils/ex-install"
+alias ex-dist="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-dist"
+alias ex-eclipse="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-eclipse"
+alias ex-install="/home/dirk/Projects/Exentra/RPI/rpi-git/utils/ex-install"
 alias ne=neditc
 alias ping=noping
 alias top=htop
@@ -31,3 +31,4 @@
 # functions to be used directly from the command line
 #
 ed() { kate -u "$@" > /dev/null 2>&1 & }
+wt() { qdbus $KONSOLE_DBUS_SERVICE $KONSOLE_DBUS_SESSION setTitle 1 "$*" }
diff -r 9222611c7a2e -r e4ed204c90fa zshrc-gentoo
--- a/zshrc-gentoo	Wed Jun 17 06:13:58 2015 +0200
+++ b/zshrc-gentoo	Wed Jun 17 06:14:53 2015 +0200
@@ -6,6 +6,7 @@
 local keychain_init_file=$HOME/.keychain/${HOST}-sh
 if [ -r ${keychain_init_file} ]; then
     . ${keychain_init_file}
+	. ${keychain_init_file}-gpg
 fi
 
 # custom environment variables