# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1395074346 14400
# Node ID 7d8ecc02426d91036e57a3b217fa6bb94281bcc4
# Parent  236cef172ce323a6dd779b991677e93aa638858a
More

diff -r 236cef172ce3 -r 7d8ecc02426d gitignore
--- a/gitignore	Wed Mar 12 11:33:27 2014 -0400
+++ b/gitignore	Mon Mar 17 12:39:06 2014 -0400
@@ -6,3 +6,4 @@
 *-SCRATCH.*
 .idea
 *.iml
+.DS_Store
diff -r 236cef172ce3 -r 7d8ecc02426d tmux/tmux.conf
--- a/tmux/tmux.conf	Wed Mar 12 11:33:27 2014 -0400
+++ b/tmux/tmux.conf	Mon Mar 17 12:39:06 2014 -0400
@@ -88,7 +88,7 @@
 
 set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour238,nobold]⮀#[fg=colour15,bg=colour238,bold] #(ls ~/.mail/steve-stevelosh.com/INBOX/cur  ~/.mail/steve-stevelosh.com/INBOX/new | wc -l | tr -d " ") #[fg=colour238,bg=colour234,nobold]⮀'
 
-set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(rdio-current-track-tmux)⮂#[fg=colour16,bg=colour254,bold] #h '
+set -g status-right "#[fg=colour245]⮃ #(date -u +%%H:%%M) UTC ⮃ %d %b #[fg=colour254,bg=colour234,nobold]#(rdio-current-track-tmux)⮂#[fg=colour16,bg=colour254,bold] #h "
 
 set -g window-status-format "#[fg=white,bg=colour234] #I #W "
 set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
diff -r 236cef172ce3 -r 7d8ecc02426d vim/vimrc
--- a/vim/vimrc	Wed Mar 12 11:33:27 2014 -0400
+++ b/vim/vimrc	Mon Mar 17 12:39:06 2014 -0400
@@ -265,7 +265,6 @@
 iabbrev vrcf `~/.vimrc` file
 
 iabbrev pcf Participatory Culture Foundation
-inoremap <c-l> <c-k>l*
 
 " }}}
 " Convenience mappings ---------------------------------------------------- {{{
@@ -467,6 +466,7 @@
 
 inoremap <c-f> <c-x><c-f>
 inoremap <c-]> <c-x><c-]>
+inoremap <c-l> <c-x><c-l>
 
 " }}}
 
@@ -479,6 +479,7 @@
 nnoremap <leader>ed :vsplit ~/.vim/custom-dictionary.utf-8.add<cr>
 nnoremap <leader>eo :vsplit ~/Dropbox/Org<cr>4j
 nnoremap <leader>eh :vsplit ~/.hgrc<cr>
+nnoremap <leader>eg :vsplit ~/.gitconfig<cr>
 nnoremap <leader>ep :vsplit ~/.pentadactylrc<cr>
 nnoremap <leader>em :vsplit ~/.mutt/muttrc<cr>
 nnoremap <leader>ez :vsplit ~/lib/dotfiles/zsh<cr>4j