Mercurial > hg > zsh-env
changeset 114:eaffab53cf43
Automated merge with https://xanthippe.duckdns.org/hg/zsh-env
| author | Dirk Olmes <dirk.olmes@exentra.de> |
|---|---|
| date | Tue, 24 Jan 2017 14:16:38 +0100 |
| parents | 68edc97253fa (diff) 9223e71009e4 (current diff) |
| children | 87a831b2afc8 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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"