--- a/.gitconfig Wed Feb 15 16:21:53 2012 -0500
+++ b/.gitconfig Mon Feb 27 16:55:47 2012 -0500
@@ -40,6 +40,9 @@
mo = !git merge --no-ff origin/`git currentbranch`
uo = !git merge --ff-only origin/`git currentbranch`
+ addremove = !git add . && git add -u
+ addrem = !git addremove
+
[push]
default = current
--- a/.hgsubstate Wed Feb 15 16:21:53 2012 -0500
+++ b/.hgsubstate Mon Feb 27 16:55:47 2012 -0500
@@ -2,7 +2,7 @@
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-86d478579d882c5bb925dd0b0a3aa5d180c324dd vim/bundle/badwolf
+e91eb9e79711b231e52ca6e4e6caf9ce72e4e827 vim/bundle/badwolf
93cb20dbfbab723e1557801469ae70f4f46499da vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
03e138c3496926b193402f4e1542f0a99924f999 vim/bundle/fugitive
@@ -13,10 +13,10 @@
34e28b3f6f6d702ff2963b8196eccae9344ed4bc vim/bundle/markdown
2dd198c6c412b4ddd361b43586b01981e8383239 vim/bundle/nerdtree
b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
-4df0cdc009e590c1d6ec32a2a3c12ff8deeb6f25 vim/bundle/powerline
+747bb4e33a551b8eb866fd27613d48ea1fd265d1 vim/bundle/powerline
67033ee4b9ee6d4916752da5e360b65ddf2fb525 vim/bundle/python-mode
fa3563dda862c1dc46ddac32d8a9f939e9077379 vim/bundle/rainbow-parentheses
-5dfc238d0bbb93cf5744bf3985ec1a653ef686ca vim/bundle/slimv
+bbcf827907539eaa0fb0c5feac086da2de717399 vim/bundle/slimv
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
ac395b57fec47f034cba151d01669d134ac7041b vim/bundle/supertab
--- a/dotcss/unisubs.sifterapp.com.css Wed Feb 15 16:21:53 2012 -0500
+++ b/dotcss/unisubs.sifterapp.com.css Mon Feb 27 16:55:47 2012 -0500
@@ -1,21 +1,12 @@
-#switcher {
- display: none !important;
-}
-.issue .meta a {
- color: #666 !important;
+tr.group td {
+ padding: 6px 0px 4px 5px !important;
}
-.issue .meta {
- display: none !important;
+tr.issue td {
+ padding: 8px 8px 6px 0px !important;
}
-.issue ul.people {
- margin-top: 13px !important;
-}
-.issue ul.people li:nth-child(2) {
+tr.issue td.subject span.assignee {
display: none;
}
-.issue .new-priority {
- padding-left: 6px !important;
+tr.issue td {
+ border-bottom: 1px solid #eee !important;
}
-.issue h2 {
- margin-top: 2px;
-}
--- a/vim/.vimrc Wed Feb 15 16:21:53 2012 -0500
+++ b/vim/.vimrc Mon Feb 27 16:55:47 2012 -0500
@@ -51,10 +51,10 @@
set dictionary=/usr/share/dict/words
" Make Vim able to edit crontab files again.
-set backupskip=/tmp/*,/private/tmp/*"
+set backupskip=/tmp/*,/private/tmp/*"
" Save when losing focus
-au FocusLost * :wa
+au FocusLost * :silent! wall
" Resize splits when the window is resized
au VimResized * :wincmd =
@@ -179,6 +179,19 @@
iabbrev sl@ steve@stevelosh.com
iabbrev vrcf `~/.vimrc` file
+inoremap <c-l>a <c-k>a*
+inoremap <c-l>b <c-k>b*
+inoremap <c-l>g <c-k>g*
+inoremap <c-l>d <c-k>d*
+inoremap <c-l>e <c-k>e*
+inoremap <c-l>l <c-k>l*
+inoremap <c-l>y <c-k>y*
+inoremap <c-l>h <c-k>h*
+inoremap <c-l>m <c-k>m*
+inoremap <c-l>r <c-k>r*
+inoremap <c-l>p <c-k>p*
+inoremap <c-l>f <c-k>f*
+
" }}}
" Searching and movement -------------------------------------------------- {{{
@@ -657,13 +670,15 @@
au FileType python setlocal define=^\s*\\(def\\\\|class\\)
au FileType python compiler nose
au FileType man nnoremap <buffer> <cr> :q<cr>
-
+
" Jesus tapdancing Christ, built-in Python syntax, you couldn't let me
" override this in a normal way, could you?
au FileType python if exists("python_space_error_highlight") | unlet python_space_error_highlight | endif
" Jesus, Python. Five characters of punctuation for a damn string?
au FileType python inoremap <buffer> <d-'> _(u'')<left><left>
+
+ au FileType python inoremap <buffer> <d-"> """"""<left><left><left>
augroup END
" }}}
@@ -777,9 +792,6 @@
nnoremap <C-u> gUiw
inoremap <C-u> <esc>gUiwea
-" Substitute
-nnoremap <leader>s :%s//<left>
-
" Emacs bindings in command line mode
cnoremap <c-a> <home>
cnoremap <c-e> <end>
@@ -1096,7 +1108,8 @@
" Powerline {{{
let g:Powerline_symbols = 'fancy'
-let g:Powerline_theme = 'sjl'
+" let g:Powerline_theme = 'derp'
+" let g:Powerline_colorscheme = 'badwolf'
" }}}
" Python-Mode {{{
--- a/vim/ftplugin/clojure/clojurefolding.vim Wed Feb 15 16:21:53 2012 -0500
+++ b/vim/ftplugin/clojure/clojurefolding.vim Mon Feb 27 16:55:47 2012 -0500
@@ -20,6 +20,8 @@
\ 'defentity',
\ 'defdb',
\ 'defproject',
+ \ 'defsynth',
+ \ 'definst',
\ 'ns'
\ ]
let s:form_re = '\v^\((' . join(folded_forms, '|') . ')\s'