# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1387898259 18000
# Node ID d5b61fd8e30a2e9f0cf052aea1f9ccc76f650a71
# Parent  f12b9fb52d7575d36ee335f5df3f2271e252522a
more shit

diff -r f12b9fb52d75 -r d5b61fd8e30a .hgsub
--- a/.hgsub	Fri Dec 20 13:04:38 2013 -0500
+++ b/.hgsub	Tue Dec 24 10:17:39 2013 -0500
@@ -4,8 +4,8 @@
 vim/bundle/AnsiEsc.vim           = [git]git://github.com/sjl/AnsiEsc.vim.git
 vim/bundle/YouCompleteMe         = [git]git://github.com/Valloric/YouCompleteMe.git
 vim/bundle/abolish               = [git]git://github.com/tpope/vim-abolish.git
+vim/bundle/ack                   = [git]git://github.com/mileszs/ack.vim.git
 vim/bundle/argumentative         = [git]git://github.com/PeterRincker/vim-argumentative.git
-vim/bundle/ack                   = [git]git://github.com/mileszs/ack.vim.git
 vim/bundle/badwolf               = [hg]https://bitbucket.org/sjl/badwolf/
 vim/bundle/clam                  = [hg]https://bitbucket.org/sjl/clam.vim/
 vim/bundle/clojure-static        = [git]git://github.com/sjl/vim-clojure-static.git
@@ -14,6 +14,7 @@
 vim/bundle/dispatch              = [git]git://github.com/tpope/vim-dispatch.git
 vim/bundle/fireplace             = [git]git://github.com/tpope/vim-fireplace.git
 vim/bundle/fugitive              = [git]git://github.com/tpope/vim-fugitive.git
+vim/bundle/gnupg                 = [git]git://github.com/jamessan/vim-gnupg.git
 vim/bundle/gundo                 = [hg]https://bitbucket.org/sjl/gundo.vim/
 vim/bundle/html5                 = [git]git://github.com/othree/html5.vim.git
 vim/bundle/indent-object         = [git]git://github.com/michaeljsmith/vim-indent-object.git
diff -r f12b9fb52d75 -r d5b61fd8e30a .hgsubstate
--- a/.hgsubstate	Fri Dec 20 13:04:38 2013 -0500
+++ b/.hgsubstate	Tue Dec 24 10:17:39 2013 -0500
@@ -14,6 +14,7 @@
 ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
 b96ccf7441ada22d764af8223b61f18896d82dc9 vim/bundle/fireplace
 34e2d2538a634a0a820a56994333ffa1fec1bc58 vim/bundle/fugitive
+6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
diff -r f12b9fb52d75 -r d5b61fd8e30a bash_profile
--- a/bash_profile	Fri Dec 20 13:04:38 2013 -0500
+++ b/bash_profile	Tue Dec 24 10:17:39 2013 -0500
@@ -31,3 +31,6 @@
 function psg() {
     ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11-
 }
+
+GPG_TTY=`tty`
+export GPG_TTY
diff -r f12b9fb52d75 -r d5b61fd8e30a bin/sort-scala-imports
--- a/bin/sort-scala-imports	Fri Dec 20 13:04:38 2013 -0500
+++ b/bin/sort-scala-imports	Tue Dec 24 10:17:39 2013 -0500
@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 
-import sys
+import re, sys
 from operator import attrgetter
 
 
+bracket_padding = None
+
 def next_line():
     return sys.stdin.readline().rstrip('\n')
 
@@ -19,14 +21,26 @@
         self.guts = []
 
     def slurp(self):
-        global l
+        global l, bracket_padding
+
         if self.main_line.endswith('}'):
             # This is a line like: import foo.{ a, b, c }
+            if bracket_padding is None:
+                if self.main_line[self.main_line.index("{") + 1] == " ":
+                    bracket_padding = " "
+                else:
+                    bracket_padding = ""
+
             prefix, rest = self.main_line.split('{', 1)
+
             guts = [item.strip() for item in
-                    rest.rstrip('}, ').split(',')]
+                    re.split(", +| +|,", rest.strip('{}, '))]
             guts.sort(key=lambda s: s.lower())
-            self.main_line = '%s{ %s }' % (prefix, ', '.join(guts))
+
+            self.main_line = '%s{%s%s%s}' % (prefix,
+                                             bracket_padding,
+                                             ', '.join(guts),
+                                             bracket_padding)
             l = next_line()
         elif self.main_line.endswith('{'):
             while True:
diff -r f12b9fb52d75 -r d5b61fd8e30a fish/config.fish
--- a/fish/config.fish	Fri Dec 20 13:04:38 2013 -0500
+++ b/fish/config.fish	Tue Dec 24 10:17:39 2013 -0500
@@ -235,6 +235,8 @@
 set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M"
 set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true"
 
+set -g -x GPG_TTY (tty)
+
 # }}}
 # Python variables {{{
 
diff -r f12b9fb52d75 -r d5b61fd8e30a vim/vimrc
--- a/vim/vimrc	Fri Dec 20 13:04:38 2013 -0500
+++ b/vim/vimrc	Tue Dec 24 10:17:39 2013 -0500
@@ -1262,6 +1262,11 @@
 vnoremap <leader>H :Gbrowse<cr>
 
 " }}}
+" GnuPG {{{
+
+let g:GPGPreferArmor = 1
+
+" }}}
 " Gundo {{{
 
 nnoremap <F5> :GundoToggle<CR>
diff -r f12b9fb52d75 -r d5b61fd8e30a weechat/weechat.conf
--- a/weechat/weechat.conf	Fri Dec 20 13:04:38 2013 -0500
+++ b/weechat/weechat.conf	Tue Dec 24 10:17:39 2013 -0500
@@ -34,7 +34,7 @@
 day_change = on
 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
-highlight = "sjl,slosh,slj,clojerks,c2c,arroway"
+highlight = "sjl,slosh,slj,clojerks,c2c,arroway,ingester"
 highlight_regex = "(^all[,:]|backend(ia)?[^/]|red[- ]tape|[mM]oney ?[dD]rop)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on