# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1340806565 14400
# Node ID 135ed5be08f28feaf6cb8ab3556e32295a986768
# Parent  6142ff0299650119edfea12f997d9ca141a679fb
moar

diff -r 6142ff029965 -r 135ed5be08f2 dotjs/github.com.js
--- a/dotjs/github.com.js	Thu Jun 21 09:59:48 2012 -0400
+++ b/dotjs/github.com.js	Wed Jun 27 10:16:05 2012 -0400
@@ -26,7 +26,7 @@
                     return;
                 }
                 t = $(this).find('a.message').text().substring(0, 65);
-                if (t === 'Updated transiflex translations -- through update_translations.sh') {
+                if (t === 'Updated transifex translations -- through update_translations.sh') {
                     $(this).hide();
                     return;
                 }
diff -r 6142ff029965 -r 135ed5be08f2 fish/config.fish
--- a/fish/config.fish	Thu Jun 21 09:59:48 2012 -0400
+++ b/fish/config.fish	Wed Jun 27 10:16:05 2012 -0400
@@ -10,12 +10,34 @@
 alias clc './get-last-commit-url.py | pbcopy'
 
 alias ef 'vim ~/.config/fish/config.fish'
+alias ev 'vim ~/.vimrc'
+alias ed 'vim ~/.vim/custom-dictionary.utf-8.add'
+alias eo 'vim ~/Dropbox/Org'
+alias eh 'vim ~/.hgrc'
+alias ep 'vim ~/.pentadactylrc'
+alias em 'vim ~/.mutt/muttrc'
+alias ez 'vim ~/lib/dotfiles/zsh'
+alias ek 'vim ~/lib/dotfiles/keymando/keymandorc.rb'
+alias et 'vim ~/.tmux.conf'
+
+alias spotlight-off 'sudo mdutil -a -i off ; and sudo mv /System/Library/CoreServices/Search.bundle/ /System/Library/CoreServices/SearchOff.bundle/ ; and killall SystemUIServer'
+alias spotlight-on 'sudo mdutil -a -i on ; and sudo mv /System/Library/CoreServices/SearchOff.bundle/ /System/Library/CoreServices/Search.bundle/ ; and killall SystemUIServer'
+alias spotlight-wat 'sudo fs_usage -w -f filesys mdworker | grep "open"'
+
+set MUTT_BIN (which mutt)
+alias mutt "cd ~/Desktop; $MUTT_BIN"
 
 alias h 'hg'
 alias g 'git'
 
+alias pbc 'pbcopy'
+alias pbp 'pbpaste'
+
 alias weechat 'weechat-curses'
 
+alias collapse="sed -e 's/  */ /g'"
+alias cuts "cut -d' '"
+
 alias pbc 'pbcopy'
 alias pbp 'pbpaste'
 
@@ -31,6 +53,10 @@
 alias wo 'workon'
 alias deact 'deactivate'
 
+function psg -d "Grep for a running process, returning its PID and full string"
+    ps auxww | grep --color=always $argv | grep -v grep | collapse | cuts -f 2,11-
+end
+
 # }}}
 # Environment variables {{{
 
@@ -183,9 +209,6 @@
 # }}}
 # Misc {{{
 
-set MUTT_BIN (which mutt)
-alias mutt "cd ~/Desktop; $MUTT_BIN"
-
 # }}}
 # Local Settings {{{
 
diff -r 6142ff029965 -r 135ed5be08f2 keymando/keymandorc.rb
--- a/keymando/keymandorc.rb	Thu Jun 21 09:59:48 2012 -0400
+++ b/keymando/keymandorc.rb	Wed Jun 27 10:16:05 2012 -0400
@@ -8,13 +8,13 @@
 # map "<Ctrl-Shift-R>", lambda { reload() }
 
 # Application Switching -------------------------------------------------------
-map "<Ctrl-Shift-J>", lambda { activate('Firefox') }
+map "<Ctrl-Shift-K>", lambda { activate('Firefox') }
 map "<Ctrl-Shift-P>", lambda { activate('Pixelmator') }
 map "<Ctrl-Shift-H>", lambda { activate('Pixen') }
 map "<Ctrl-Shift-O>", lambda { activate('Rdio') }
 map "<Ctrl-Shift-Y>", lambda { activate('Twitter') }
 
-map "<Ctrl-Shift-K>" do
+map "<Ctrl-Shift-J>" do
     activate('iTerm')
     send('<Cmd-Option-2>')
 end
diff -r 6142ff029965 -r 135ed5be08f2 moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r 6142ff029965 -r 135ed5be08f2 vim/vimrc
--- a/vim/vimrc	Thu Jun 21 09:59:48 2012 -0400
+++ b/vim/vimrc	Wed Jun 27 10:16:05 2012 -0400
@@ -377,11 +377,12 @@
 inoremap <c-]> <c-x><c-]>
 
 " }}}
+
+" }}}
 " Quick editing {{{
 
 nnoremap <leader>ev :vsplit $MYVIMRC<cr>
 nnoremap <leader>ef :vsplit ~/.config/fish/config.fish<cr>
-nnoremap <leader>es :vsplit ~/.vim/snippets/<cr>
 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>
@@ -392,8 +393,6 @@
 nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
 
 " }}}
-
-" }}}
 " Searching and movement -------------------------------------------------- {{{
 
 " Use sane regexes.
diff -r 6142ff029965 -r 135ed5be08f2 zshrc
--- a/zshrc	Thu Jun 21 09:59:48 2012 -0400
+++ b/zshrc	Wed Jun 27 10:16:05 2012 -0400
@@ -8,7 +8,6 @@
 
 source $ZSH/oh-my-zsh.sh
 
-
 # Custom options -------------------------------------------------------------
 unsetopt promptcr