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

diff -r e4ed204c90fa -r b41590f0a587 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Wed Jun 17 06:14:53 2015 +0200
+++ b/zshrc-cassiopeia	Sun Aug 16 11:49:41 2015 +0200
@@ -30,5 +30,5 @@
 #
 # functions to be used directly from the command line
 #
-ed() { kate -u "$@" > /dev/null 2>&1 & }
+ed() { subl2 "$@" > /dev/null 2>&1 & }
 wt() { qdbus $KONSOLE_DBUS_SERVICE $KONSOLE_DBUS_SESSION setTitle 1 "$*" }
diff -r e4ed204c90fa -r b41590f0a587 zshrc-gentoo
--- a/zshrc-gentoo	Wed Jun 17 06:14:53 2015 +0200
+++ b/zshrc-gentoo	Sun Aug 16 11:49:41 2015 +0200
@@ -5,8 +5,11 @@
 # keychain setup: authenticate to remote hosts only once
 local keychain_init_file=$HOME/.keychain/${HOST}-sh
 if [ -r ${keychain_init_file} ]; then
+	. ${keychain_init_file}
+fi
+keychain_init_file=$HOME/.keychain/${HOST}-sh-gpg
+if [ -r ${keychain_init_file} ]; then
     . ${keychain_init_file}
-	. ${keychain_init_file}-gpg
 fi
 
 # custom environment variables
@@ -21,6 +24,13 @@
 alias xm="xmodmap ~/.Xmodmap"
 
 # custom functions for gentoo
+ipa() {
+	CMD="ip addr show"
+	if [ $# -gt 0 ]; then
+		CMD="$CMD dev $1"
+	fi
+	eval $CMD
+}
 kcs() { source $HOME/.keychain/${HOST}-sh }
 ll() { /usr/bin/env -u LC_ALL LANG=C ls -laFh "$@" | more }
 lr() { /usr/bin/env -u LC_ALL LANG=C ls -rtlh "$@" }