added 15.04 stuff

14f5cb59 · Murukesh Mohanan · 402fc3f9 · 14f5cb59 · 6c7bcf80 · 14f5cb59
Commit 14f5cb59 authored May 23, 2015 by Murukesh Mohanan
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

.conflocal/vivid-pc/.zshrc .conflocal/vivid-pc/.zshrc +12 -0

.vim .vim +1 -1

.zshrc .zshrc +1 -1

No files found.
--- a/.conflocal/vivid-pc/.zshrc
+++ b/.conflocal/vivid-pc/.zshrc
+[[ -f ~/devel/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]] && source ~/devel/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+[[ -f /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+case $(systemd-detect-virt) in
+	none)
+		;;
+	*)
+		precmd () {print -Pn "\e]0;%m: %2~\a"}
+		export TERM=xterm-256color
+		;;
+esac
+
+HISTFILE=$HOME/.debian_history
--- a/.vim @ 6c7bcf80
+++ b/.vim @ 6c7bcf80
-Subproject commit d30bfc70e5bc840c1d13739523df227238c13d49
+Subproject commit 6c7bcf80c7a1a7f1cd8b593c0b513b08b7e056ad
--- a/.zshrc
+++ b/.zshrc
@@ -106,7 +106,7 @@ fi
 RPROMPT="%{$reset_color%}"

 case $TERM in
-	xterm*)
+	xterm*|screen*)
 		if [[ -n $SSH_TTY ]]
 		then
 			precmd () {print -Pn "\e]0;%m: %2~\a"}