# HG changeset patch
# User Dirk Olmes <dirk.olmes@exentra.de>
# Date 1485263798 -3600
# Node ID eaffab53cf43077a035e107718c4227f52b149ae
# Parent  68edc97253facd919877685dcbd08979ba3fe95d# Parent  9223e71009e492b92deec295199377858a276cf0
Automated merge with https://xanthippe.duckdns.org/hg/zsh-env

diff -r 9223e71009e4 -r eaffab53cf43 zshrc-gentoo
--- a/zshrc-gentoo	Tue Jan 24 14:16:32 2017 +0100
+++ b/zshrc-gentoo	Tue Jan 24 14:16:38 2017 +0100
@@ -19,7 +19,7 @@
 # custom aliases for gentoo
 alias cd..="cd .."
 alias es="ionice -c3 emerge --sync"
-alias gmkc="grub-mkconfig -o /boot/boot/grub/grub.cfg"
+alias gmkc="grub-mkconfig -o /boot/grub/grub.cfg"
 alias les="less"
 alias wu="emerge -uvDa world"
 alias xm="xmodmap ~/.Xmodmap"
diff -r 9223e71009e4 -r eaffab53cf43 zshrc-xanthippe
--- a/zshrc-xanthippe	Tue Jan 24 14:16:32 2017 +0100
+++ b/zshrc-xanthippe	Tue Jan 24 14:16:38 2017 +0100
@@ -5,6 +5,7 @@
 . ${HOME}/.zsh-env/zshrc-jdk
 . ${HOME}/.zsh-env/zshrc-maven
 . ${HOME}/.zsh-env/zshrc-bindkey
+. ${HOME}/.zsh-env/zshrc-docker
 
 GPG_AGENT_FILE="${HOME}/.gnupg/.gpg-agent-info"
 if [ -f "${GPG_AGENT_FILE}" ]; then
@@ -15,4 +16,4 @@
 export GPG_TTY=`tty`
 export PATH="$HOME/bin:${PATH}"
 
-alias top=htop
+alias top="htop -C"