4e2fe1ec0997

--- a/bin/sort-scala-imports	Thu Jul 10 11:56:05 2014 -0400
+++ b/bin/sort-scala-imports	Thu Sep 18 11:44:25 2014 -0400
@@ -5,6 +5,7 @@
 
 
 bracket_padding = None
+MAX_LINE_WIDTH = 100
 
 def next_line():
     return sys.stdin.readline().rstrip('\n')
@@ -30,6 +31,7 @@
         """
         prefix = self.prefix
         guts = self.guts
+        guts.sort(key=lambda s: s.lower())
 
         if not prefix:
             # This is just a single-line, single-item import, so we don't need
@@ -40,10 +42,9 @@
                                  bracket_padding,
                                  ', '.join(guts),
                                  bracket_padding)
-        if len(single) > 100:
+        if len(single) > MAX_LINE_WIDTH:
             self.main_line = prefix + '{'
             self.guts = guts
-            self.guts.sort(key=lambda s: s.lower())
         else:
             self.main_line = single
             self.guts = []

--- a/dotjs/500px.com.js	Thu Jul 10 11:56:05 2014 -0400
+++ b/dotjs/500px.com.js	Thu Sep 18 11:44:25 2014 -0400
@@ -1,8 +0,0 @@
-$(function() {
-    var i = $("img#mainphoto.clickable").attr("src");
-
-    $('body').append("<img width=40 height=40 id='fucking-let-me-drag-you-assholes' src='" + i + "'>");
-
-    $('#fucking-let-me-drag-you-assholes').css('position', 'absolute').css('top', '40px').css('left', '40px');
-
-});

--- a/fish/config.fish	Thu Jul 10 11:56:05 2014 -0400
+++ b/fish/config.fish	Thu Sep 18 11:44:25 2014 -0400
@@ -19,6 +19,10 @@
 function ....;  cd ../../..; end
 function .....; cd ../../../..; end
 
+# I give up
+alias :q exit
+alias :qa exit
+
 # }}}
 # Completions {{{
 

--- a/gitconfig	Thu Jul 10 11:56:05 2014 -0400
+++ b/gitconfig	Thu Sep 18 11:44:25 2014 -0400
@@ -105,7 +105,7 @@
 
     ; ksshow will open a single specific commit in kaleidoscope
     ; it includes the commit log info as a separate file
-    ksshow = "!sh -c 'export KSID=`uuidgen`; git log -n1 $1 > .git/LOG_MESSAGE; ksdiff --partial-changeset --UUID $KSID -- /dev/null .git/LOG_MESSAGE; git ksdiffid $1^..$1; ksdiff --mark-changeset-as-closed $KSID' -"
+    ksshow = "!sh -c 'export KSID=`uuidgen`; git log -n1 $1 > .git/LOG_MESSAGE_$KSID; ksdiff --partial-changeset --UUID $KSID -- /dev/null .git/LOG_MESSAGE_$KSID; git ksdiffid $1^..$1; ksdiff --mark-changeset-as-closed $KSID' -"
 
     ; ksreview takes a branch, finds all commits in that branch that aren't
     ; merged into master, and opens them one-by-one with ksshow.  It's good for

--- a/vim/vimrc	Thu Jul 10 11:56:05 2014 -0400
+++ b/vim/vimrc	Thu Sep 18 11:44:25 2014 -0400
@@ -23,8 +23,8 @@
 " specifying files to load and none of them work?
 "
 " Computers are bullshit.
-let $BASH_ENV = "~/.bash_profile"
-set shell=/bin/bash
+" let $BASH_ENV = "~/.bash_profile"
+set shell=/bin/bash\ --login
 
 filetype off
 call pathogen#infect()
@@ -472,7 +472,7 @@
 nnoremap <leader>R :silent !ranger<cr>:redraw!<cr>
 
 " Jump (see the J mini-plugin later on)
-nnoremap <leader>j :J<space>
+nnoremap <leader>J :J<space>
 
 " Insert Mode Completion {{{