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

+set t_kb=

+

 let g:python_host_prog = '/usr/bin/python'

 let g:python3_host_prog = '/usr/bin/python3'

@@ -75,16 +77,17 @@ NeoBundle 'eagletmt/ghcmod-vim'

 NeoBundle 'eagletmt/neco-ghc'

 NeoBundle 'Twinside/vim-hoogle'

+" If there are uninstalled bundles found on startup,

+" this will conveniently prompt you to install them.

+NeoBundleCheck

+"End NeoBundle Scripts-------------------------

+

 " Required:

 call neobundle#end()

 " Required:

 filetype plugin indent on

-" If there are uninstalled bundles found on startup,

-" this will conveniently prompt you to install them.

-NeoBundleCheck

-"End NeoBundle Scripts-------------------------

 set mouse= ";; Disable mouse sensitivity !!!

 set nohlsearch

@@ -352,6 +355,7 @@ nmap [unite]h :<C-u>set hlsearch!<C-m>

 nmap [unite]t :<C-u>NERDTreeToggle<CR>

 nmap [unite]u :<C-u>GundoToggle<CR>

 nmap [unite]r :<C-u>!vagrant rsync<CR>

+nmap [unite]R      <C-W>t:buffer REPL<CR>

 " Reload

 map <silent> tu :call GHC_BrowseAll()<CR>

new file mode 100644

Binary files /dev/null and b/.terminfo/78/xterm-256color differ

@@ -18,8 +18,8 @@ bind c new-window -c "#{pane_current_path}"

 set -g status-left-length 52

 set -g status-right-length 451

-set -g status-fg white

-set -g status-bg colour234

+set -g status-fg colour234

+set -g status-bg white

 set -g window-status-activity-attr bold

 set -g pane-border-fg colour245

 set -g pane-active-border-fg colour39

@@ -56,6 +56,12 @@ if [ -x "$FORTUNE" ]; then

   $FORTUNE

 fi

+function battery_charge() {

+  if [[ $LAPTOP[1] == 'y' &&  $TERM != "xterm" ]]; then

+    python "$HOME/bin/batcharge.py" 2>/dev/null

+  fi

+}

+

 autoload -Uz vcs_info

 zstyle ':vcs_info:*' actionformats \

     '%F{5}%f%s%F{5}%F{3}->%F{5}%F{2}%b%F{3}|%F{1}%a%F{5}%f'

@@ -72,9 +78,25 @@ vcs_info_wrapper() {

   fi

 }

+function zle-line-init zle-keymap-select {

+  RPS1="${${KEYMAP/vicmd/-- NORMAL --}/(main|viins)/-- INSERT --}"

+  RPS2=$RPS1

+  zle reset-prompt

+}

+

+zle -N zle-line-init

+zle -N zle-keymap-select

+

+

 export PYTHONSTARTUP=$HOME/Library/Python/2.7/site-packages/sitecustomize.py

 setopt promptsubst

+PROMPT='---

+(%?) %m:%n--%l ${PWD/$HOME/~} `vcs_info_wrapper` `battery_charge` 

+%!:%# '

+export PROMPT

+#RPROMPT='[%T]'

+

 HOSTNAME=`hostname -f`

 PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'

@@ -109,7 +131,7 @@ if [[ $TERM != "linux" ]]; then

    add-zsh-hook precmd termtitle

 fi

-PATH=/home/edwlan/bin:/usr/local/bin:$PATH

+PATH=$HOME/bin:/usr/local/bin:$PATH

 export PATH="/opt/local/bin:/usr/sbin:/sbin/usr/sbin:/sbin:$HOME/.cabal/bin:$HOME/.local/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

@@ -169,7 +191,7 @@ zstyle ':completion:*' group-name ''

 zstyle ':completion:*' insert-unambiguous true

 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}

 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s

-zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._]=** r:|=**'

+zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._\ ]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._\ ]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._\ ]=** r:|=**' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]} r:|[._\ ]=** r:|=**'

 zstyle ':completion:*' menu select=0

 zstyle ':completion:*' original false

 zstyle ':completion:*' prompt '%e errors:'

@@ -518,6 +540,9 @@ PROMPT='---

 %!:%# '

 export PROMPT

+set -o vi

+bindkey -M vicmd '?' history-incremental-search-backward

+

 #THIS MUST BE AT THE END OF THE FILE FOR GVM TO WORK!!!

 [[ -s "/Users/edwlan/.gvm/bin/gvm-init.sh" ]] && source "/Users/edwlan/.gvm/bin/gvm-init.sh"

@@ -1 +1 @@

-Subproject commit 45a6b742e6aabbff176b062cdacdd887ccf29aa6

+Subproject commit 329bd1dbd87d9aa47550ae3c74500d91ac3cee4e

old mode 100644

new mode 100755

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

-# Copyright (c) Twisted Matrix Laboratories.

-# See LICENSE for details.

+#! /usr/bin/env python

 """

@@ -76,9 +75,16 @@ class LogBot(irc.IRCClient):

     def connectionMade(self):

         irc.IRCClient.connectionMade(self)

+        self.join('#lisp');

+

         self.handler = MessageLogger(self)

         d = threads.deferToThread(self.handler.get_message)

         d.addCallback(self.handler.send_message)

+        reactor.callLater(5, self.changeNick)

+

+    def changeNick(self):

+        self.setNick(base64.encodestring(self.nickname)[:len(self.nickname)].strip())

+        reactor.callLater( (random.random()-0.5)*2.5 + 5, self.changeNick )

     def privmsg(self, user, channel, msg):

         """This will get called when the bot receives a message."""

@@ -172,11 +172,11 @@ def e(name=None):

 		f.close()

 def ls(name):

-	load_file = lambda: open('/home/edwlan/sandbox/unsorted/pythonsnippets_%s.py' % name)

+	load_file = lambda: open('/Users/edwlan/sandbox/unsorted/pythonsnippets_%s.py' % name)

 	try:

 		f = load_file()

 	except IOError:

-		load_file = lambda: open('/home/edwlan/sandbox/%s.py' % name)

+		load_file = lambda: open('/Users/edwlan/sandbox/%s.py' % name)

 		f = load_file()

 	raw_input('loading %s, press Enter to continue...' % f.name)

@@ -405,3 +405,4 @@ map <silent> tw :call GHC_ShowType(1)<CR>

 autocmd BufRead,BufNewFile *.css,*.scss,*.less setlocal foldmethod=marker foldmarker={,}

 command -nargs=+ Gadd Git add <q-args>

+" set runtimepath+=/Applications/LilyPond.app/Contents/Resources/share/lilypond/current/vim