--- a/.hgrc Thu Mar 31 09:09:12 2011 -0400
+++ b/.hgrc Wed Apr 06 13:50:33 2011 -0400
@@ -38,7 +38,6 @@
cb = ssh://hg@codebasehq.com/
cbdw = ssh://hg@codebasehq.com/dwaiter/
cbsl = ssh://hg@codebasehq.com/stevelosh/
-stable = ssh://hg@bitbucket.org/stable/
dwd = ssh://hg@bitbucket.org/dwaiter/
nyh = ssh://sjl@gotham.nyhacker.org/
dl = ssh://hg@hg.dwaiter.com:38038/
--- a/mutt/muttrc Thu Mar 31 09:09:12 2011 -0400
+++ b/mutt/muttrc Wed Apr 06 13:50:33 2011 -0400
@@ -117,7 +117,7 @@
macro index \CR "T.<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
macro index B "<limit>~b " "search message bodies"
macro index I "<change-folder>!<enter>" "go to Inbox"
-macro pager \Cu "|urlview<enter>" "call urlview to extract URLs out of a message"
+macro pager ( "|urlview<enter>" "call urlview to extract URLs out of a message"
macro index,pager o "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -<enter>" "open in vim"
# mailbox
--- a/vim/.vimrc Thu Mar 31 09:09:12 2011 -0400
+++ b/vim/.vimrc Wed Apr 06 13:50:33 2011 -0400
@@ -111,6 +111,8 @@
set gdefault
+set virtualedit+=block
+
map <leader><space> :noh<cr>
runtime macros/matchit.vim
@@ -128,6 +130,9 @@
" L is easier to type, and I never use the default behavior.
noremap L $
+" Open a Quickfix window for the last search
+nnoremap <silent> <leader>/ :execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR>
+
" Error navigation {{{
"
" Location List QuickFix Window
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/puppet/ftdetect/puppet.vim Wed Apr 06 13:50:33 2011 -0400
@@ -0,0 +1,1 @@
+au BufRead,BufNewFile *.pp setfiletype puppet
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/puppet/syntax/puppet.vim Wed Apr 06 13:50:33 2011 -0400
@@ -0,0 +1,89 @@
+" puppet syntax file
+" Filename: puppet.vim
+" Language: puppet configuration file
+" Maintainer: Luke Kanies <luke@madstop.com>
+" URL:
+" Last Change:
+" Version:
+"
+
+" Copied from the cfengine, ruby, and perl syntax files
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+syn region puppetDefine start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments
+syn keyword puppetDefType class define site node inherits contained
+syn keyword puppetInherits inherits contained
+syn region puppetDefArguments start="(" end=")" contains=puppetArgument
+syn match puppetArgument "\w\+" contained
+syn match puppetArgument "\$\w\+" contained
+syn match puppetArgument "'[^']+'" contained
+syn match puppetArgument '"[^"]+"' contained
+syn match puppetDefName "\w\+" contained
+
+syn match puppetInstance "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault
+syn match puppetTypeBrace "{" contained
+syn match puppetTypeName "[a-z]\w*" contained
+syn match puppetTypeDefault "[A-Z]\w*" contained
+
+syn match puppetParam "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName
+syn match puppetParamRArrow "=>" contained
+syn match puppetParamName "\w\+" contained
+syn match puppetVariable "$\w\+"
+syn match puppetVariable "${\w\+}"
+syn match puppetParen "("
+syn match puppetParen ")"
+syn match puppetBrace "{"
+syn match puppetBrace "}"
+
+syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable
+
+syn keyword puppetBoolean true false
+syn keyword puppetKeyword import inherits include
+syn keyword puppetControl case default
+
+" comments last overriding everything else
+syn match puppetComment "\s*#.*$" contains=puppetTodo
+syn keyword puppetTodo TODO NOTE FIXME XXX contained
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_puppet_syn_inits")
+ if version < 508
+ let did_puppet_syn_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink puppetVariable Identifier
+ HiLink puppetBoolean Boolean
+ HiLink puppetType Identifier
+ HiLink puppetDefault Identifier
+ HiLink puppetKeyword Define
+ HiLink puppetTypeDefs Define
+ HiLink puppetComment Comment
+ HiLink puppetString String
+ HiLink puppetTodo Todo
+" HiLink puppetBrace Delimiter
+" HiLink puppetTypeBrace Delimiter
+" HiLink puppetParen Delimiter
+ HiLink puppetDelimiter Delimiter
+ HiLink puppetControl Statement
+ HiLink puppetDefType Define
+ HiLink puppetDefName Type
+ HiLink puppetTypeName Statement
+ HiLink puppetTypeDefault Type
+ HiLink puppetParamName Identifier
+ HiLink puppetArgument Identifier
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "puppet"