--- a/.hgsub Mon Apr 30 08:48:50 2012 -0400
+++ b/.hgsub Mon Apr 30 08:49:48 2012 -0400
@@ -19,7 +19,7 @@
vim/bundle/vim-orgmode = [git]git://github.com/jceb/vim-orgmode.git
vim/bundle/python-mode = [git]git://github.com/klen/python-mode.git
vim/bundle/slimv = [hg]https://bitbucket.org/sjl/slimv
-vim/bundle/threesome = [hg]https://bitbucket.org/sjl/threesome.vim
+vim/bundle/splice = [hg]https://bitbucket.org/sjl/splice.vim
vim/bundle/vitality = [hg]https://bitbucket.org/sjl/vitality.vim
vim/bundle/vim-makegreen = [git]git://github.com/sjl/vim-makegreen.git
vim/bundle/supertab = [git]git://github.com/ervandew/supertab.git
--- a/.hgsubstate Mon Apr 30 08:48:50 2012 -0400
+++ b/.hgsubstate Mon Apr 30 08:49:48 2012 -0400
@@ -3,12 +3,12 @@
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-fe251fc8ef2919fc1daf52dd733851630498adc1 vim/bundle/badwolf
+17443dcd6ceed84184d4e92dccc5d8f1f29e67b6 vim/bundle/badwolf
b528cf3de72884dd6cf5fdbeda375d7437ea811f vim/bundle/clam
c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive
-ab9d330375e42d05b63fc87b30797b84828dbe24 vim/bundle/gundo
+43ea418b11f7f78aae0e60229548f68400fc89b8 vim/bundle/gundo
9b71f09cb0665560ef23b0c5a7d158b572fb8118 vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
9543eec44e5cb75b67f0e5eaf1377ca82ced7b90 vim/bundle/linediff
@@ -20,11 +20,11 @@
17bd7f6cefeec93af6c852b3c146c8e75805cc4b vim/bundle/slimv
c01d81a697de5e28452f32762a9c8fbe3eac0496 vim/bundle/smartinput
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
+3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
5a38ce8b600e11941f695523363fe04e6478549a vim/bundle/supertab
489a1e8c676ad47dd358dbf883bfaf492148d38b vim/bundle/surround
b4e85a87629c3db9900fed82f507c43d634fe7c0 vim/bundle/syntastic
-c3f318a26db29fcbb65da43dc31d214be3b3b242 vim/bundle/threesome
2dee007ddae8156735cbae7f0cd4e0a24ba7287b vim/bundle/tslime
50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/vim-commentary
a8ce721701fdd015695406f7df315f48bb447ebb vim/bundle/vim-javascript
--- a/bin/bootstrap.sh Mon Apr 30 08:48:50 2012 -0400
+++ b/bin/bootstrap.sh Mon Apr 30 08:49:48 2012 -0400
@@ -39,5 +39,6 @@
ensure_link "lib/dotfiles/dotcss" ".css"
ensure_link "lib/dotfiles/hgignore" ".hgignore"
ensure_link "lib/dotfiles/ctags" ".ctags"
+ensure_link "lib/dotfiles/grc" ".grc"
echo completed
--- a/gitconfig Mon Apr 30 08:48:50 2012 -0400
+++ b/gitconfig Mon Apr 30 08:49:48 2012 -0400
@@ -62,10 +62,10 @@
tool = Kaleidoscope
[merge]
- tool = threesome
+ tool = splice
-[mergetool "threesome"]
- cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+[mergetool "splice"]
+ cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[web]
browser = open
--- a/hgrc Mon Apr 30 08:48:50 2012 -0400
+++ b/hgrc Mon Apr 30 08:49:48 2012 -0400
@@ -58,10 +58,10 @@
opts.dd =
[merge-tools]
-threesome.executable = mvim
-threesome.args = -f $base $local $other $output -c 'ThreesomeInit'
-threesome.premerge = keep
-threesome.priority = 1
+splice.executable = vim
+splice.args = -f $base $local $other $output -c 'SpliceInit'
+splice.premerge = keep
+splice.priority = 1
keepthat.executable = sh
keepthat.args = -c 'cp "$local" "$output.original" && cp "$other" "$output"'
--- a/mutt/mailcap Mon Apr 30 08:48:50 2012 -0400
+++ b/mutt/mailcap Mon Apr 30 08:49:48 2012 -0400
@@ -24,7 +24,7 @@
image/gif; ~/.mutt/view_attachment.sh %s gif
# PDF
-application/pdf; ~/.mutt/view_attachment.sh %s pdf
+# application/pdf; ~/.mutt/view_attachment.sh %s pdf
# HTML
text/html; ~/.mutt/view_attachment.sh %s html
--- a/mutt/muttrc Mon Apr 30 08:48:50 2012 -0400
+++ b/mutt/muttrc Mon Apr 30 08:49:48 2012 -0400
@@ -116,6 +116,7 @@
bind index <space> collapse-thread
# macros
+macro index \Co "!offlineimap -q<enter>" "run offlineimap to sync mail"
macro index \Cr "<tag-prefix><clear-flag>N" "mark tagged messages as read"
macro index \CR "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
macro index B "<limit>~b " "search message bodies"
--- a/mutt/offlineimapsync.sh Mon Apr 30 08:48:50 2012 -0400
+++ b/mutt/offlineimapsync.sh Mon Apr 30 08:49:48 2012 -0400
@@ -5,11 +5,11 @@
function sync_normal {
echo "NORMAL Sync"
- /usr/local/bin/offlineimap -o -u quiet
+ /usr/local/share/python/offlineimap -o -u quiet
}
function sync_quick {
echo "QUICK Sync"
- /usr/local/bin/offlineimap -o -q -u quiet
+ /usr/local/share/python/offlineimap -o -q -u quiet
}
# This is silly.
--- a/offlineimaprc Mon Apr 30 08:48:50 2012 -0400
+++ b/offlineimaprc Mon Apr 30 08:49:48 2012 -0400
@@ -37,5 +37,4 @@
'Flask',
'[Gmail]/Important',
'[Gmail]/Spam',
- '[Gmail]/All Mail',
]
--- a/tmux/tmux.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/tmux/tmux.conf Mon Apr 30 08:49:48 2012 -0400
@@ -90,8 +90,7 @@
setw -g automatic-rename on
# Better name management
-bind c new-window \; command-prompt "rename-window '%%'"
-bind C new-window
+bind c new-window
bind , command-prompt "rename-window '%%'"
# Copy mode
--- a/vim/custom-dictionary.utf-8.add Mon Apr 30 08:48:50 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add Mon Apr 30 08:49:48 2012 -0400
@@ -8,3 +8,23 @@
Solr
Losh
autogenerated
+Clojure
+offlineimap
+weechat
+tmux
+ack
+Firefox
+zsh
+foo
+etc
+Dropbox
+changelog
+tradeoff
+checkbox
+PAETEC
+Windstream
+GitHub
+changeset
+IRC
+diffs
+codebase
--- a/vim/vimrc Mon Apr 30 08:48:50 2012 -0400
+++ b/vim/vimrc Mon Apr 30 08:49:48 2012 -0400
@@ -171,6 +171,12 @@
let g:badwolf_html_link_underline = 0
colorscheme badwolf
+" Reload the colorscheme whenever we write the file.
+augroup color_badwolf_dev
+ au!
+ au BufWritePost badwolf.vim color badwolf
+augroup END
+
" Highlight VCS conflict markers
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -266,6 +272,9 @@
" Make backspace work sanely in visual mode
vnoremap <bs> x
+" Insert the directory of the current buffer in command line mode
+cnoremap <expr> %% getcmdtype() == ':' ? expand('%:h').'/' : '%%'
+
" Select entire buffer
nnoremap vaa ggvGg_
nnoremap Vaa ggVG
@@ -295,14 +304,11 @@
" Split line (sister to [J]oin lines)
" The normal use of S is covered by cc, so don't worry about shadowing it.
-nnoremap S i<cr><esc><right>mwgk:silent! s/\v +$//<cr>:noh<cr>`w
+nnoremap S i<cr><esc>^mwgk:silent! s/\v +$//<cr>:noh<cr>`w
" HTML tag closing
inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
-" Less chording
-nnoremap ; :
-
" Cmdheight switching
nnoremap <leader>1 :set cmdheight=1<cr>
nnoremap <leader>2 :set cmdheight=2<cr>
@@ -311,6 +317,10 @@
vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
+" Back find-repeat
+" TODO: Why does this not work?
+nnoremap … dd
+
" Marks and Quotes
noremap ' `
noremap æ '
@@ -344,6 +354,9 @@
" Toggle [i]nvisible characters
nnoremap <leader>i :set list!<cr>
+" Has to be an autocommand because repeat.vim eats the mapping otherwise :(
+au VimEnter * :nnoremap U <c-r>
+
" Drag Lines {{{
" <m-j> and <m-k> to drag lines in any mode
@@ -408,7 +421,7 @@
set virtualedit+=block
-noremap <leader><space> :noh<cr>:call clearmatches()<cr>
+noremap <silent> <leader><space> :noh<cr>:call clearmatches()<cr>
runtime macros/matchit.vim
map <tab> %
@@ -1174,28 +1187,28 @@
let g:syntastic_jsl_conf = '$HOME/.vim/jsl.conf'
" }}}
-" Threesome {{{
+" Splice {{{
-let g:threesome_leader = "-"
+" let g:splice_leader = "-"
-let g:threesome_initial_mode = "grid"
+let g:splice_initial_mode = "grid"
-let g:threesome_initial_layout_grid = 1
-let g:threesome_initial_layout_loupe = 0
-let g:threesome_initial_layout_compare = 0
-let g:threesome_initial_layout_path = 0
+let g:splice_initial_layout_grid = 0
+let g:splice_initial_layout_loupe = 0
+let g:splice_initial_layout_compare = 0
+let g:splice_initial_layout_path = 0
-let g:threesome_initial_diff_grid = 1
-let g:threesome_initial_diff_loupe = 0
-let g:threesome_initial_diff_compare = 0
-let g:threesome_initial_diff_path = 0
+let g:splice_initial_diff_grid = 1
+let g:splice_initial_diff_loupe = 0
+let g:splice_initial_diff_compare = 1
+let g:splice_initial_diff_path = 0
-let g:threesome_initial_scrollbind_grid = 0
-let g:threesome_initial_scrollbind_loupe = 0
-let g:threesome_initial_scrollbind_compare = 0
-let g:threesome_initial_scrollbind_path = 0
+let g:splice_initial_scrollbind_grid = 0
+let g:splice_initial_scrollbind_loupe = 0
+let g:splice_initial_scrollbind_compare = 0
+let g:splice_initial_scrollbind_path = 0
-let g:threesome_wrap = "nowrap"
+let g:splice_wrap = "nowrap"
" }}}
" tslime {{{
--- a/weechat/alias.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/alias.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# alias.conf -- weechat v0.3.6
+# alias.conf -- weechat v0.3.7
#
[cmd]
--- a/weechat/aspell.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/aspell.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# aspell.conf -- weechat v0.3.6
+# aspell.conf -- weechat v0.3.7
#
[look]
--- a/weechat/buffers.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/buffers.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# buffers.conf -- weechat v0.3.6
+# buffers.conf -- weechat v0.3.7
#
[color]
--- a/weechat/logger.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/logger.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# logger.conf -- weechat v0.3.6
+# logger.conf -- weechat v0.3.7
#
[look]
--- a/weechat/plugins.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/plugins.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# plugins.conf -- weechat v0.3.6
+# plugins.conf -- weechat v0.3.7
#
[var]
@@ -55,6 +55,7 @@
python.growl.show_upgrade_ended = "on"
python.growl.sticky = "off"
python.growl.sticky_away = "on"
+ruby.check_license = "on"
tcl.check_license = "on"
[desc]
--- a/weechat/python/autoload/growl.py Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/python/autoload/growl.py Mon Apr 30 08:49:48 2012 -0400
@@ -24,12 +24,13 @@
SCRIPT_NAME = 'growl'
SCRIPT_AUTHOR = 'Sorin Ionescu <sorin.ionescu@gmail.com>'
-SCRIPT_VERSION = '1.0.4'
+SCRIPT_VERSION = '1.0.5'
SCRIPT_LICENSE = 'MIT'
SCRIPT_DESC = 'Sends Growl notifications upon events.'
# Changelog
+# 2011-12-30: v1.0.5 Fixed a NoneType error.
# 2011-10-11: v1.0.4 Handle import errors better.
# 2011-10-10: v1.0.3 Handle Growl exceptions.
# 2011-10-04: v1.0.2 Growl 1.3 requires GNTP.
@@ -461,9 +462,9 @@
'WeeChat'
]
if len(hostname) == 0:
- hostname = None
+ hostname = ''
if len(password) == 0:
- password = None
+ password = ''
growl = GrowlNotifier(
applicationName=name,
hostname=hostname,
--- a/weechat/relay.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/relay.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# relay.conf -- weechat v0.3.6
+# relay.conf -- weechat v0.3.7
#
[look]
@@ -17,7 +17,9 @@
text_selected = white
[network]
+allowed_ips = ""
bind_address = ""
+compression_level = 6
max_clients = 5
password = ""
--- a/weechat/rmodifier.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/rmodifier.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# rmodifier.conf -- weechat v0.3.6
+# rmodifier.conf -- weechat v0.3.7
#
[look]
--- a/weechat/urlgrab.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/urlgrab.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# urlgrab.conf -- weechat v0.3.6
+# urlgrab.conf -- weechat v0.3.7
#
[color]
--- a/weechat/weechat.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/weechat.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# weechat.conf -- weechat v0.3.6
+# weechat.conf -- weechat v0.3.7
#
[debug]
@@ -78,6 +78,7 @@
save_config_on_exit = on
save_layout_on_exit = none
scroll_amount = 3
+scroll_bottom_after_switch = off
scroll_page_percent = 100
search_text_not_found_alert = on
separator_horizontal = "-"
@@ -143,6 +144,7 @@
status_time = *16
[completion]
+base_word_until_cursor = on
default_template = "%(nicks)|%(irc_channels)"
nick_add_space = on
nick_completer = ":"
@@ -156,8 +158,9 @@
[history]
display_default = 5
+max_buffer_lines_minutes = 0
+max_buffer_lines_number = 4096
max_commands = 100
-max_lines = 4096
max_visited_buffers = 50
[proxy]
--- a/weechat/xfer.conf Mon Apr 30 08:48:50 2012 -0400
+++ b/weechat/xfer.conf Mon Apr 30 08:49:48 2012 -0400
@@ -1,5 +1,5 @@
#
-# xfer.conf -- weechat v0.3.6
+# xfer.conf -- weechat v0.3.7
#
[look]
--- a/zshrc Mon Apr 30 08:48:50 2012 -0400
+++ b/zshrc Mon Apr 30 08:49:48 2012 -0400
@@ -19,6 +19,7 @@
alias tm='tmux -u2'
alias c='clear'
alias bp='bpython'
+alias oi='offlineimap'
export DISABLE_AUTO_TITLE="true"
@@ -51,6 +52,7 @@
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
export VEW_PATH="$HOME/lib/python/virtualenvwrapper/virtualenvwrapper.sh"
+export VEW_PATH="/usr/local/share/python/virtualenvwrapper.sh"
export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH"
export NODE_PATH="$NODE_PATH:/usr/local/lib/node:/usr/local/lib/node_modules"
@@ -71,3 +73,6 @@
# Emacs... -------------------------------------------------------------------
alias e='emacsclient -nc .'
+
+# GRC
+source "`brew --prefix grc`/etc/grc.bashrc"