Mercurial > hg > zsh-env

changeset 123:9068de5302ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with https://localhost/hg/zsh-env
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 23 May 2017 17:28:03 +0200
parents 52a56c121370 (diff) 469f954e86c8 (current diff)
children a8fd9ba4d2bc
files
diffstat 3 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.gitconfig	Tue May 23 17:27:29 2017 +0200
+++ b/.gitconfig	Tue May 23 17:28:03 2017 +0200
@@ -5,8 +5,10 @@
     comit = commit
     lg = log --format=oneline --graph --abbrev-commit --decorate
     rpo = remote prune origin    
+    smu = submodule update --recursive --remote
     st = status
     wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
+    wt = worktree
 
 [color]
     ui = false
--- a/zshrc-cassiopeia	Tue May 23 17:27:29 2017 +0200
+++ b/zshrc-cassiopeia	Tue May 23 17:28:03 2017 +0200
@@ -10,10 +10,9 @@
 . $HOME/.zsh-autoenv/autoenv.zsh
 
 export BUILD_NUMBER=0000
-export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/rpi
 export MULE_TEST_OPTS="-Dmule.verbose=false"
 export MULE_TEST_TIMEOUTSECS=9999
-export PATH="$HOME/bin:${PATH}"
+export PATH="$HOME/bin:${HOME}/.nodejs/bin:${PATH}"
 export PGUSER=postgres
 
 #
@@ -24,11 +23,10 @@
 alias df="df -h"
 alias env="env | sort | $PAGER"
 alias ex-dist="/home/dirk/Projects/Exentra/Source/rpi/utils/ex-dist"
-alias ex-eclipse="/home/dirk/Projects/Exentra/Source/rpi/utils/ex-eclipse"
 alias ex-install="/home/dirk/Projects/Exentra/Source/rpi/utils/ex-install"
 alias mtail=multitail
 alias ne=neditc
-alias ping=noping
+alias ping="noping -4"
 alias top=htop
 
 #
--- a/zshrc-quad64	Tue May 23 17:27:29 2017 +0200
+++ b/zshrc-quad64	Tue May 23 17:28:03 2017 +0200
@@ -2,11 +2,12 @@
 # zshrc for quad64
 #
 
+. $HOME/.zsh-env/zshrc-gentoo
 . $HOME/.zsh-env/zshrc-jdk
 . $HOME/.zsh-env/zshrc-maven
 
 export BUILD_NUMBER=0000
-export MANPAGER=most
+#export MANPAGER=most
 export PATH="$HOME/bin:${PATH}"
 export PGUSER=postgres
 
@@ -23,9 +24,11 @@
 alias cvsupdate='cvs -q -z3 update -dP | egrep -v "^\?.*\.d"'
 alias df="df -h"
 alias env="env | sort | $PAGER"
-alias top=htop
+alias top="htop -C"
 
 #
 # functions to be used directly from the command line
 #
 cvsrm() { rm "$@"; cvs remove "$@" }
+kcs() { source $HOME/.keychain/$(hostname -f)-sh }
+