--- a/.hgrc Mon Jul 19 22:00:25 2010 -0400
+++ b/.hgrc Tue Jul 20 16:30:03 2010 -0400
@@ -16,6 +16,7 @@
parentrevspec =
schemes =
progress =
+fetch =
attic = ~/lib/hg/hgattic/attic.py
paste = ~/lib/hg/hg-paste/paste.py
prompt = ~/lib/hg/hg-prompt/prompt.py
@@ -122,3 +123,5 @@
nlog = log --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.nlog
n = nlog -vr
show = nlog --color=always -vpr
+
+fet = fetch --message 'Automated merge.'
--- a/vim/.vimrc Mon Jul 19 22:00:25 2010 -0400
+++ b/vim/.vimrc Tue Jul 20 16:30:03 2010 -0400
@@ -82,6 +82,10 @@
map <left> <nop>
map <right> <nop>
+" And make them fucking work, too.
+nnoremap j gj
+nnoremap k gk
+
" Easy buffer navigation
map <C-h> <C-w>h
map <C-j> <C-w>j
@@ -119,7 +123,10 @@
" Various syntax stuff
au BufNewFile,BufRead *.less set filetype=less
-au BufNewFile,BufRead *.markdown set filetype=markdown
+
+au BufNewFile,BufRead *.m*down set filetype=markdown
+au BufNewFile,BufRead *.m*down map <leader>h1 yypVr=
+au BufNewFile,BufRead *.m*down map <leader>h2 yypVr-
" Sort CSS
map <leader>S ?{<cr>jV/^\s*\}\=$<CR>k:sort<CR>:let @/=''<CR>
@@ -174,13 +181,12 @@
au BufNewFile,BufRead *.less set foldmethod=marker
au BufNewFile,BufRead *.less set foldmarker={,}
au BufNewFile,BufRead *.less set nocursorline
-au BufNewFile,BufRead *.less map <leader>p o<ESC>pV`]>
" Easier linewise reselection
map <leader>v V`]
" HTML tag closing
-imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
+inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
" Arpeggio
call arpeggio#load()
@@ -188,4 +194,5 @@
Arpeggio inoremap fh <Esc>
Arpeggio inoremap hj <Esc>
Arpeggio inoremap fj <Esc>
+Arpeggio inoremap asdf <Esc>
inoremap <Esc> <nop>
--- a/zsh/misc.zsh Mon Jul 19 22:00:25 2010 -0400
+++ b/zsh/misc.zsh Tue Jul 20 16:30:03 2010 -0400
@@ -1,2 +1,29 @@
alias pbc='pbcopy'
alias pbp='pbpaste'
+
+function mdown () {
+ (echo '
+ <head>
+ <style>
+ body {
+ font-family: Georgia;
+ font-size: 17px;
+ line-height: 1.4;
+ color: #222;
+ text-rendering: optimizeLegibility;
+ width: 700px;
+ margin: 20px auto;
+ }
+ h1, h2, h3, h4, h5, h6 {
+ font-family: Garamond;
+ font-weight: normal;
+ }
+ pre {
+ background-color: #f5f5f5;
+ font: normal 16px Menlo;
+ padding: 8px 10px;
+ }
+ </style>
+ </head>
+ '; markdown $@) | bcat
+}