Merge branch 'master' of fucktheforce.de:xeno

1 files changed, 11 insertions, 16 deletions

diff --git a/zsh/zshrc b/zsh/zshrc
index d965335..140ae04 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -1,4 +1,4 @@
-PROMPT="%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% "
+PROMPT="%F{red}$(date +%H:%M) %F{white}%~%(1v.%F{green}%1v%f.)%F{red}%2v%f %% "
 
 umask 077
 
@@ -8,6 +8,10 @@ zstyle ':completion:*:kill:*' force-list always
 
 zmodload -a zsh/complist complist
 
+if [ -e /usr/share/zsh/plugins/zsh-syntax-highlight/zsh-syntax-highlighting.zsh ]; then
+	source /usr/share/zsh/plugins/zsh-syntax-highlight/zsh-syntax-highlighting.zsh
+fi
+
 setopt nobeep
 setopt autocd
 setopt listpacked
@@ -36,16 +40,6 @@ HISTFILE=~/.zsh_history
 
 autoload -U compinit; compinit
 autoload zmv
-autoload -Uz vcs_info
-precmd() {
-	psvar=()
-	vcs_info
-	[[ -n $vcs_info_msg_0_ ]] && psvar[1]="$vcs_info_msg_0_"
-
-	if [ "$(quilt applied 2> /dev/null)" ]; then
-		psvar[2]="(quilt)"
-	fi
-}
 
 alias c="clear"
 alias ls="ls --color=auto"
@@ -70,6 +64,7 @@ alias v="vim"
 alias vi="vim"
 alias vbm="VBoxManage"
 alias httpd="python2 -m SimpleHTTPServer"
+alias unp="aunpack"
 
 alias agu="sudo apt-get update"
 alias agdu="sudo apt-get dist-upgrade"
@@ -139,10 +134,10 @@ vpn() {
 	sudo openvpn --config /etc/openvpn/$1
 }
 
-case $TERM in
-	rxvt*)
-    		precmd () {print -Pn "\e]0;%n@%m: %~\a"}
-	;;
-esac
+#case $TERM in
+#	rxvt*)
+#    		precmd () {print -Pn "\e]0;%n@%m: %~\a"}
+#	;;
+#esac
 
 cd ~/