# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1392135743 18000
# Node ID 3426f20c0a7e3401aab2de5310b7c619b931bbdd
# Parent  e835f9dfe1dde43575d1bddbbd8d53513b144267
Random shit

diff -r e835f9dfe1dd -r 3426f20c0a7e bin/maven
--- a/bin/maven	Fri Jan 31 11:29:42 2014 -0500
+++ b/bin/maven	Tue Feb 11 11:22:23 2014 -0500
@@ -2,4 +2,4 @@
 
 set -e
 
-mvn "$@" | grcat ~/.grc/conf.maven
+mvn "$@" | grep --line-buffered -Ev 'Including.*in the shaded jar' | grcat ~/.grc/conf.maven
diff -r e835f9dfe1dd -r 3426f20c0a7e bin/sort-scala-imports
--- a/bin/sort-scala-imports	Fri Jan 31 11:29:42 2014 -0500
+++ b/bin/sort-scala-imports	Tue Feb 11 11:22:23 2014 -0500
@@ -62,8 +62,7 @@
 
             prefix, rest = line.split('{', 1)
 
-            guts = [item.strip() for item in
-                    re.split(", +| +|,", rest.strip('{}, '))]
+            guts = re.findall(r"\w+ *=> *\w+|\w+", rest)
 
             self.prefix = prefix
             self.guts = guts
diff -r e835f9dfe1dd -r 3426f20c0a7e fish/functions/tm.fish
--- a/fish/functions/tm.fish	Fri Jan 31 11:29:42 2014 -0500
+++ b/fish/functions/tm.fish	Tue Feb 11 11:22:23 2014 -0500
@@ -1,3 +1,3 @@
-function tm "tmux"
+function tm -d "tmux"
     tmux -u2 $argv
 end
diff -r e835f9dfe1dd -r 3426f20c0a7e hgrc
--- a/hgrc	Fri Jan 31 11:29:42 2014 -0500
+++ b/hgrc	Tue Feb 11 11:22:23 2014 -0500
@@ -128,9 +128,7 @@
 # Commit message shortcuts.
 cm = commit -m
 cus = commit -m 'Update subrepository state.'
-cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
 cmm = commit -m 'Merge.'
-cws = commit -m 'Whitespace.'
 
 # Merge shortcuts.
 mergelocal = !$HG --config ui.merge=internal:local merge $@
@@ -145,7 +143,7 @@
 d = diff -p --color=auto
 
 # Run a colored diff and pipe it to less.
-dl = !"$HG" diff -p --color=always $@ | less -R
+dl = !"$HG" diff -p --color=never $@ | vim -R -c 'set ft=diff' -
 
 # Kaleidoscope
 # Mnemonics: "kaleidoscope diff" and "kaleidoscope show"
diff -r e835f9dfe1dd -r 3426f20c0a7e vim/custom-dictionary.utf-8.add
--- a/vim/custom-dictionary.utf-8.add	Fri Jan 31 11:29:42 2014 -0500
+++ b/vim/custom-dictionary.utf-8.add	Tue Feb 11 11:22:23 2014 -0500
@@ -149,3 +149,12 @@
 onboard
 onboarding
 spellchecking
+RabbitMQ
+SQS
+WebSphere
+iPhones
+bcrypt
+Google's
+Postgres
+GPG
+TLS
diff -r e835f9dfe1dd -r 3426f20c0a7e vim/vimrc
--- a/vim/vimrc	Fri Jan 31 11:29:42 2014 -0500
+++ b/vim/vimrc	Tue Feb 11 11:22:23 2014 -0500
@@ -360,6 +360,11 @@
 " Panic Button
 nnoremap <f9> mzggg?G`z
 
+" zt is okay for putting something at the top of the screen, but when I'm
+" writing prose I often want to put something at not-quite-the-top of the
+" screen.  zh is "zoom to head level"
+nnoremap zh mzzt10<c-u>`z
+
 " Diffoff
 nnoremap <leader>D :diffoff!<cr>
 
diff -r e835f9dfe1dd -r 3426f20c0a7e weechat/weechat.conf
--- a/weechat/weechat.conf	Fri Jan 31 11:29:42 2014 -0500
+++ b/weechat/weechat.conf	Tue Feb 11 11:22:23 2014 -0500
@@ -34,8 +34,8 @@
 day_change = on
 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
-highlight = "sjl,slosh,slj,clojerks,c2c,arroway,ingester"
-highlight_regex = "(^all[,:]|backend(ia)?[^s/]|red[- ]tape|[mM]oney ?[dD]rop|steve ?losh|rob ford)"
+highlight = "sjl,slosh,slj,clojerks"
+highlight_regex = "(^all[,:]|backend(ia)?[^s/]|red[- ]tape|steve ?losh|rob ford|(jesus )?fucking christ)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "
@@ -83,7 +83,7 @@
 read_marker = line
 read_marker_always_show = on
 read_marker_string = "◡◡◠"
-save_config_on_exit = on
+save_config_on_exit = off
 save_layout_on_exit = none
 scroll_amount = 3
 scroll_bottom_after_switch = off