--- a/.ackrc Mon May 23 10:06:35 2011 -0400
+++ b/.ackrc Fri May 27 09:17:02 2011 -0400
@@ -6,4 +6,6 @@
--type-set
less=.less
--type-set
+vim=.vim
+--type-set
front=.html,.js,.less,.css
--- a/.hgrc Mon May 23 10:06:35 2011 -0400
+++ b/.hgrc Fri May 27 09:17:02 2011 -0400
@@ -97,7 +97,7 @@
[alias]
nudge = push --branch .
-st = status -C
+st = status -SC
? = summary
cm = commit -m
--- a/.hgsub Mon May 23 10:06:35 2011 -0400
+++ b/.hgsub Fri May 27 09:17:02 2011 -0400
@@ -14,3 +14,4 @@
vim/bundle/easymotion = [git]git://github.com/Lokaltog/vim-easymotion.git
vim/bundle/pydoc = [git]git://github.com/fs111/pydoc.vim.git
vim/bundle/tasklist = [git]git://github.com/vim-scripts/TaskList.vim.git
+vim/bundle/command-t = [git]git://github.com/vim-scripts/Command-T.git
--- a/.hgsubstate Mon May 23 10:06:35 2011 -0400
+++ b/.hgsubstate Fri May 27 09:17:02 2011 -0400
@@ -1,5 +1,6 @@
b9bd86b9f476afd164237dce029a46d2607bd931 mercurial/templates
b6be751b4b4391e7e25ba51e36300a8e04820846 vim/bundle/ack
+bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t
24c9f6c5974d1838a2e1db8c58bf4160298433a2 vim/bundle/easymotion
321c5d51ee50a41952f00ab976c59553221c089e vim/bundle/gundo
1535425d6987812aa87e2123d0e509b847b893d5 vim/bundle/html5
--- a/vim/.vimrc Mon May 23 10:06:35 2011 -0400
+++ b/vim/.vimrc Fri May 27 09:17:02 2011 -0400
@@ -380,7 +380,6 @@
au BufNewFile,BufRead urls.py setlocal nowrap
au BufNewFile,BufRead urls.py normal! zR
-au BufNewFile,BufRead settings.py normal! zR
au BufNewFile,BufRead dashboard.py normal! zR
au BufNewFile,BufRead admin.py setlocal filetype=python.django
@@ -388,6 +387,7 @@
au BufNewFile,BufRead models.py setlocal filetype=python.django
au BufNewFile,BufRead views.py setlocal filetype=python.django
au BufNewFile,BufRead settings.py setlocal filetype=python.django
+au BufNewFile,BufRead settings.py setlocal foldmethod=marker
au BufNewFile,BufRead forms.py setlocal filetype=python.django
" }}}
@@ -481,7 +481,7 @@
set pastetoggle=<F8>
" Replaste
-nnoremap <D-p> "_ddP
+nnoremap <D-p> "_ddPV`]
" }}}
" Plugin settings ------------------------------------------------------------- {{{
--- a/zsh/tasks.zsh Mon May 23 10:06:35 2011 -0400
+++ b/zsh/tasks.zsh Fri May 27 09:17:02 2011 -0400
@@ -1,11 +1,8 @@
#!/usr/bin/env zsh
alias t='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt'
-alias s='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=music.txt'
-alias g='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=groceries.txt'
-alias k='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=books.txt'
+alias w='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=work.txt'
alias p='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack.txt'
-alias d='~/lib/t/t.py --task-dir="~/Desktop" --list=todo.txt --delete-if-empty'
alias b='~/lib/t/t.py --list=bugs'
alias pa='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack-archive'