diff --git a/git/gitconfig b/git/gitconfig index 8680f92..76cff40 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -36,3 +36,5 @@ keepBackup = false [credential] helper = cache +[color] + ui = auto diff --git a/shells/zshrc b/shells/zshrc index c0855b0..0175e16 100644 --- a/shells/zshrc +++ b/shells/zshrc @@ -23,6 +23,7 @@ function asroot(){ xauth extract $TEMPFILE $DISPLAY sudo zsh -c "xauth merge $TEMPFILE;(srm $TEMPFILE||rm $TEMPFILE)&'$@';" } +alias ocp="ocp -vs0 -dcurses" alias dumpx="xauth extract /tmp/xauthstuff $DISPLAY" alias impx="xauth merge /tmp/xauthstuff;rm /tmp/xauthstuff" alias sudo='sudo ' @@ -67,7 +68,7 @@ if test -f /etc/gentoo-release; then # If this is a server computer if [ "$(hostname|cut -b1)" = "S" ] ; then echo "You're a server. Exiting" - exit + return fi cd /usr/portage >/dev/null sudo zsh -c "git up&&echo Done pulling&&eix-update&&echo Done with eix"