@@ -1,5 +1,5 @@

 new -s catchnet

-set -g default-terminal "screen-256color"

+set -g default-terminal "screen-noit"

 setw -g mode-keys vi

 # smart pane switching with awareness of vim splits

@@ -129,13 +129,13 @@ au BufWrite /private/etc/pw.* set nowritebackup

-"Diable the anti-python smart indent of #

 set ignorecase

 set smartcase

 set autoindent

 set nu

 set expandtab

 set tabstop=3 softtabstop=2

+set smarttab

 set shiftwidth=2

 set incsearch

 set scrolloff=4

@@ -190,7 +190,8 @@ autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoin

 autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

 " when we reload, tell vim to restore the cursor to the saved position

-"inoremap  X#

+"Diable the anti-python smart indent of #

+inoremap  # X#

 "Turn Syntax Highlighting on by default, and assume the xterm background is black

 imap <C-g> :Unite outline
i

@@ -188,7 +188,7 @@ switchWorkspace target = do

 main = do

    xmproc <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc"

-   xmproc1 <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc1"

+   --xmproc1 <- spawnPipe "/home/edwlan/.cabal/bin/xmobar /home/edwlan/.xmobarrc1"

    xmonad $ defaultConfig

       {

          manageHook = myManageHook <+> manageSpawn <+> manageHook defaultConfig,

@@ -82,7 +82,6 @@ PATH=/home/edwlan/bin:/usr/local/bin:$PATH

 export PATH="/opt/local/bin:/usr/sbin:/sbin/usr/sbin:/sbin:$HOME/.cabal/bin:$HOME/bin:/Developer/usr/bin:$PATH"

 export VIMCLOJURE_SERVER_JAR="$HOME/bin/jars/server-2.3.6.jar"

 export INFOPATH=/usr/local/share/info:/usr/local/texlive/2009/texmf/doc/info

-

 export SAVEHIST=10000000

 export HISTSIZE=10000000

 export HISTFILE=$HOME/.zshistory

@@ -98,6 +97,7 @@ export MANPATH="/opt/local/share/man:$MANPATH"

 export PAGER="less"

 export RGBDEF='/opt/X11/share/X11/rgb.txt'

+export GREP_COLORS='ms=01;31:mc=01;31:sl=:cx=:fn=35:ln=32:bn=32:se=36'

 if [ -x /usr/local/bin/vim ]; then

    export VISUAL="/usr/local/bin/vim"

@@ -201,6 +201,8 @@ alias e=$EDITOR

 alias cvsdiff='cvs diff -wbB | colordiff'

 alias cp.='gcp --target-directory=.'

 alias notep='note post'

+alias bower='noglob bower'

+alias node='nodejs'

 echo "done variables and options"

@@ -404,6 +406,12 @@ ge() {

 }

 messages() {

+   if [[ -d .git ]]; then

+     echo "Git log messages:"

+     git log -n 5 | egrep --color=yes -Io '(TODO|NOTE|FIXME|BUG|DONE):.*$'

+   fi

+

+   echo "Messages from files:"

    egrep --color=yes -IHnro '(TODO|NOTE|FIXME|BUG):.*$' . |

    psc '

 for line in sys.stdin:

@@ -0,0 +1 @@

+print('hello')