merged laptop and lab laptop

.bashrc

@@ -5,5 +5,20 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+export PATH=$PATH:~/bin
 alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Start X on one of the first three VTs
+#alias startx='startx &> ~/.xlog'
+#[[ -z $DISPLAY && -n $XDG_VTNR && $XDG_VTNR -lt 3 ]] && exec startx ~/.xinitrc gnome-shell
+
+export DEBEMAIL="murukesh@cse.iitb.ac.in"
+export DEBFULLNAME="Murukesh Mohanan"
+
+#. ~/devel/cs715/paths.sh
+
+[[ -n $DISPLAY ]] && synclient TapButton1=1 TapButton2=2 TapButton3=3 CircularScrolling=1

.conflocal/laptop/.zshrc

+alias pac='pacaur -S'
+alias pacs='pacaur -Ss'
+alias pacu='pacaur -Syu'
+alias pacr='pacaur -Rs'
+alias pacl='pacaur -Ql'
+
+[[ -f ~/devel/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]] && source ~/devel/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+[[ -f /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
+[[ -n $DISPLAY ]] && synclient TapButton1=1 TapButton2=3 TapButton3=2 CircularScrolling=1

.pam_environment

-CONFLOCAL=lab-laptop
+PAPERSIZE=a4
+CONFLOCAL=laptop

.zshrc

@@ -158,7 +158,18 @@ function _pip_completion {
 compctl -K _pip_completion pip
 # pip zsh completion end
 
-[[ $COLORTERM = gnome-terminal && ! $TERM = screen* ]] && TERM=xterm-256color
+if [[ $COLORTERM = gnome-terminal ]]   
+then                                   
+	case $TERM in                      
+		xterm*)                        
+			TERM=xterm-256color        
+			;;                         
+		screen*)                       
+			TERM=screen-256color       
+			;;                         
+	esac 
+fi  
+export TERM
 export CDPATH="$CDPATH:$HOME"
 
 [[ -f $HOME/.conflocal/$CONFLOCAL/.zshrc ]] && . "$HOME/.conflocal/$CONFLOCAL/.zshrc"