7c688e677d72

moar
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Mon, 16 Jul 2012 15:24:53 -0400
parents 6da7d207c132
children b5786e25b18d
branches/tags (none)
files .hgsubstate bin/lein bin/lein2 dotjs/500px.com.js fish/config.fish moom/com.manytricks.Moom.plist vim/custom-dictionary.utf-8.add vim/vimrc

Changes

--- a/.hgsubstate	Thu Jul 12 10:21:07 2012 -0400
+++ b/.hgsubstate	Mon Jul 16 15:24:53 2012 -0400
@@ -23,7 +23,7 @@
 7f53b5c3919bde9a4259d0c725d453ef2337a4ed vim/bundle/powerline
 9f976bb5754fd1252198fd1d8da4508a1a612ef6 vim/bundle/python-mode
 f060c485ee2631430ba19634e4a1c4d593065211 vim/bundle/salt
-5771a3a9860cbaaaa2810b78334b63f8d28f2d6e vim/bundle/slimv
+94c0fd36649d8c3db3e3cd53fad37a3c5ce3f7c5 vim/bundle/slimv
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/lein	Mon Jul 16 15:24:53 2012 -0400
@@ -0,0 +1,232 @@
+#!/usr/bin/env bash
+
+export LEIN_VERSION="2.0.0-preview7"
+
+case $LEIN_VERSION in
+    *SNAPSHOT) SNAPSHOT="YES" ;;
+    *) SNAPSHOT="NO" ;;
+esac
+
+if [ `id -u` -eq 0 ] && [ "$LEIN_ROOT" = "" ]; then
+    echo "WARNING: You're currently running as root; probably by accident."
+    echo "Press control-C to abort or Enter to continue as root."
+    echo "Set LEIN_ROOT to disable this warning."
+    read _
+fi
+
+NOT_FOUND=1
+ORIGINAL_PWD="$PWD"
+while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
+do
+    cd ..
+    if [ "$(dirname "$PWD")" = "/" ]; then
+        NOT_FOUND=0
+        cd "$ORIGINAL_PWD"
+    fi
+done
+
+export LEIN_HOME=${LEIN_HOME:-"$HOME/.lein"}
+
+if [ "$OSTYPE" = "cygwin" ]; then
+    export LEIN_HOME=`cygpath -w $LEIN_HOME`
+fi
+
+LEIN_JAR="$LEIN_HOME/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
+
+# normalize $0 on certain BSDs
+if [ "$(dirname "$0")" = "." ]; then
+    SCRIPT="$(which $(basename "$0"))"
+else
+    SCRIPT="$0"
+fi
+
+# resolve symlinks to the script itself portably
+while [ -h "$SCRIPT" ] ; do
+    ls=`ls -ld "$SCRIPT"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        SCRIPT="$link"
+    else
+        SCRIPT="$(dirname "$SCRIPT"$)/$link"
+    fi
+done
+
+BIN_DIR="$(dirname "$SCRIPT")"
+
+if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+    # Running from source checkout
+    LEIN_DIR="$(dirname "$BIN_DIR")"
+
+    # Need to use lein 1.x to bootstrap the leiningen-core library (for aether)
+    if [ "$(ls $LEIN_DIR/leiningen-core/lib/*)" = "" ]; then
+        echo "Leiningen is missing its dependencies."
+        echo "Please see \"Building\" in the README."
+        exit 1
+    fi
+
+    # If project.clj for lein or leiningen-core changes, we must recalculate
+    LAST_PROJECT_CHECKSUM=$(cat "$LEIN_DIR/.lein-project-checksum" 2> /dev/null)
+    PROJECT_CHECKSUM=$(sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj")
+    if [ "$PROJECT_CHECKSUM" != "$LAST_PROJECT_CHECKSUM" ]; then
+        if [ -r "$LEIN_DIR/.lein-classpath" ]; then
+            rm "$LEIN_DIR/.lein-classpath"
+        fi
+    fi
+
+    # Use bin/lein to calculate its own classpath since src/ and
+    # leiningen-core/lib/*jar suffices to run the classpath task.
+    if [ ! -r "$LEIN_DIR/.lein-classpath" ] && [ "$1" != "classpath" ]; then
+        echo "Recalculating Leiningen's classpath."
+        ORIG_PWD="$PWD"
+        cd "$LEIN_DIR"
+
+        $0 classpath .lein-classpath
+        sum $LEIN_DIR/project.clj $LEIN_DIR/leiningen-core/project.clj > \
+            .lein-project-checksum
+        cd "$ORIG_PWD"
+    fi
+
+    mkdir -p "$LEIN_DIR/target/classes"
+    export LEIN_JVM_OPTS=${LEIN_JVM_OPTS:-"-Dclojure.compile.path=$LEIN_DIR/target/classes"}
+    CLASSPATH="$LEIN_DIR/leiningen-core/src/"
+    CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/resources/"
+    CLASSPATH="$CLASSPATH:$(cat $LEIN_DIR/.lein-classpath 2> /dev/null)"
+    CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/lib/*"
+    CLASSPATH="$CLASSPATH:$LEIN_DIR/test:$LEIN_DIR/target/classes"
+    CLASSPATH="$CLASSPATH:$LEIN_DIR/src:$LEIN_DIR/resources:$LEIN_JAR"
+    if [ -f .lein-classpath ]; then
+        CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
+    fi
+else # Not running from a checkout
+    # apply context specific CLASSPATH entries
+    if [ -f .lein-classpath ]; then
+        CLASSPATH="`cat .lein-classpath`:$LEIN_JAR"
+    else
+        CLASSPATH="$LEIN_JAR"
+    fi
+
+    export LEIN_JVM_OPTS=${LEIN_JVM_OPTS:-"-Xbootclasspath/a:$LEIN_JAR"}
+
+    if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
+        "$0" self-install
+    fi
+fi
+
+if [ "$HTTP_CLIENT" = "" ]; then
+    if type -p curl >/dev/null 2>&1; then
+        if [ "$https_proxy" != "" ]; then
+            CURL_PROXY="-x $https_proxy"
+        fi
+        HTTP_CLIENT="curl $CURL_PROXY -f -L -o"
+    else
+        HTTP_CLIENT="wget -O"
+    fi
+fi
+
+export JAVA_CMD=${JAVA_CMD:-"java"}
+export LEIN_JAVA_CMD=${LEIN_JAVA_CMD:-$JAVA_CMD}
+
+# Support $JAVA_OPTS for backwards-compatibility.
+export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
+
+# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
+# If you're packaging this for a package manager (.deb, homebrew, etc)
+# you need to remove the self-install and upgrade functionality or see lein-pkg.
+if [ "$1" = "self-install" ]; then
+    if [ -r "$LEIN_JAR" ]; then
+      echo "The self-install jar already exists at $LEIN_JAR."
+      echo "If you wish to re-download, delete it and rerun \"$0 self-install\"."
+      exit 1
+    fi
+    echo "Downloading Leiningen now..."
+    LEIN_DIR=`dirname "$LEIN_JAR"`
+    mkdir -p "$LEIN_DIR"
+    LEIN_URL="https://github.com/downloads/technomancy/leiningen/leiningen-$LEIN_VERSION-standalone.jar"
+    $HTTP_CLIENT "$LEIN_JAR" "$LEIN_URL"
+    if [ $? != 0 ]; then
+        echo "Failed to download $LEIN_URL"
+        echo "If you have an old version of libssl you may not have the correct"
+        echo "certificate authority. Either upgrade or set HTTP_CLIENT to insecure:"
+        echo "  export HTTP_CLIENT=\"wget --no-check-certificate -O\" # or"
+        echo "  export HTTP_CLIENT=\"curl --insecure -f -L -o"
+        if [ $SNAPSHOT = "YES" ]; then
+            echo "If you have Maven installed, you can do"
+            echo "mvn dependency:copy-dependencies; mv target/dependency lib"
+            echo "See README.md for further SNAPSHOT build instructions."
+        fi
+        rm $LEIN_JAR 2> /dev/null
+        exit 1
+    fi
+elif [ "$1" = "upgrade" ]; then
+    if [ "$LEIN_DIR" != "" ]; then
+        echo "The upgrade task is not meant to be run from a checkout."
+        exit 1
+    fi
+    if [ $SNAPSHOT = "YES" ]; then
+        echo "The upgrade task is only meant for stable releases."
+        echo "See the \"Hacking\" section of the README."
+        exit 1
+    fi
+    if [ ! -w "$SCRIPT" ]; then
+        echo "You do not have permission to upgrade the installation in $SCRIPT"
+        exit 1
+    else
+        TARGET_VERSION="${2:-"preview"}"
+        echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
+        echo -n "Do you want to continue [Y/n]? "
+        read RESP
+        case "$RESP" in
+            y|Y|"")
+                echo
+                echo "Upgrading..."
+                TARGET="/tmp/lein-$$-upgrade"
+                if [ "$OSTYPE" = "cygwin" ]; then
+                    TARGET=`cygpath -w $TARGET`
+                fi
+                LEIN_SCRIPT_URL="https://github.com/technomancy/leiningen/raw/$TARGET_VERSION/bin/lein"
+                $HTTP_CLIENT "$TARGET" "$LEIN_SCRIPT_URL" \
+                    && mv "$TARGET" "$SCRIPT" \
+                    && chmod +x "$SCRIPT" \
+                    && echo && "$SCRIPT" self-install && echo && echo "Now running" `$SCRIPT version`
+                exit $?;;
+            *)
+                echo "Aborted."
+                exit 1;;
+        esac
+    fi
+else
+    if [ "$OSTYPE" = "cygwin" ]; then
+        # When running on Cygwin, use Windows-style paths for java
+        ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
+        CLASSPATH=`cygpath -wp "$CLASSPATH"`
+    fi
+
+    if [ $DEBUG ]; then
+        echo "Classpath: $CLASSPATH"
+    fi
+
+    TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
+    if [ "$OSTYPE" = "cygwin" ]; then
+        TRAMPOLINE_FILE=`cygpath -w $TRAMPOLINE_FILE`
+    fi
+
+    $LEIN_JAVA_CMD \
+        -client -XX:+TieredCompilation \
+        $LEIN_JVM_OPTS \
+        -Dfile.encoding=UTF-8 \
+        -Dmaven.wagon.http.ssl.easy=false \
+        -Dleiningen.original.pwd="$ORIGINAL_PWD" \
+        -Dleiningen.trampoline-file=$TRAMPOLINE_FILE \
+        -cp "$CLASSPATH" \
+        clojure.main -m leiningen.core.main "$@"
+
+    EXIT_CODE=$?
+
+    if [ -r $TRAMPOLINE_FILE ]; then
+        TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
+        rm $TRAMPOLINE_FILE
+        exec sh -c "exec $TRAMPOLINE"
+    else
+        exit $EXIT_CODE
+    fi
+fi
--- a/bin/lein2	Thu Jul 12 10:21:07 2012 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-#!/usr/bin/env bash
-
-export LEIN_VERSION="2.0.0-preview7"
-
-case $LEIN_VERSION in
-    *SNAPSHOT) SNAPSHOT="YES" ;;
-    *) SNAPSHOT="NO" ;;
-esac
-
-if [ `id -u` -eq 0 ] && [ "$LEIN_ROOT" = "" ]; then
-    echo "WARNING: You're currently running as root; probably by accident."
-    echo "Press control-C to abort or Enter to continue as root."
-    echo "Set LEIN_ROOT to disable this warning."
-    read _
-fi
-
-NOT_FOUND=1
-ORIGINAL_PWD="$PWD"
-while [ ! -r "$PWD/project.clj" ] && [ "$PWD" != "/" ] && [ $NOT_FOUND -ne 0 ]
-do
-    cd ..
-    if [ "$(dirname "$PWD")" = "/" ]; then
-        NOT_FOUND=0
-        cd "$ORIGINAL_PWD"
-    fi
-done
-
-export LEIN_HOME=${LEIN_HOME:-"$HOME/.lein"}
-
-if [ "$OSTYPE" = "cygwin" ]; then
-    export LEIN_HOME=`cygpath -w $LEIN_HOME`
-fi
-
-LEIN_JAR="$LEIN_HOME/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
-
-# normalize $0 on certain BSDs
-if [ "$(dirname "$0")" = "." ]; then
-    SCRIPT="$(which $(basename "$0"))"
-else
-    SCRIPT="$0"
-fi
-
-# resolve symlinks to the script itself portably
-while [ -h "$SCRIPT" ] ; do
-    ls=`ls -ld "$SCRIPT"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        SCRIPT="$link"
-    else
-        SCRIPT="$(dirname "$SCRIPT"$)/$link"
-    fi
-done
-
-BIN_DIR="$(dirname "$SCRIPT")"
-
-if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
-    # Running from source checkout
-    LEIN_DIR="$(dirname "$BIN_DIR")"
-
-    # Need to use lein 1.x to bootstrap the leiningen-core library (for aether)
-    if [ "$(ls $LEIN_DIR/leiningen-core/lib/*)" = "" ]; then
-        echo "Leiningen is missing its dependencies."
-        echo "Please see \"Building\" in the README."
-        exit 1
-    fi
-
-    # If project.clj for lein or leiningen-core changes, we must recalculate
-    LAST_PROJECT_CHECKSUM=$(cat "$LEIN_DIR/.lein-project-checksum" 2> /dev/null)
-    PROJECT_CHECKSUM=$(sum "$LEIN_DIR/project.clj" "$LEIN_DIR/leiningen-core/project.clj")
-    if [ "$PROJECT_CHECKSUM" != "$LAST_PROJECT_CHECKSUM" ]; then
-        if [ -r "$LEIN_DIR/.lein-classpath" ]; then
-            rm "$LEIN_DIR/.lein-classpath"
-        fi
-    fi
-
-    # Use bin/lein to calculate its own classpath since src/ and
-    # leiningen-core/lib/*jar suffices to run the classpath task.
-    if [ ! -r "$LEIN_DIR/.lein-classpath" ] && [ "$1" != "classpath" ]; then
-        echo "Recalculating Leiningen's classpath."
-        ORIG_PWD="$PWD"
-        cd "$LEIN_DIR"
-
-        $0 classpath .lein-classpath
-        sum $LEIN_DIR/project.clj $LEIN_DIR/leiningen-core/project.clj > \
-            .lein-project-checksum
-        cd "$ORIG_PWD"
-    fi
-
-    mkdir -p "$LEIN_DIR/target/classes"
-    export LEIN_JVM_OPTS=${LEIN_JVM_OPTS:-"-Dclojure.compile.path=$LEIN_DIR/target/classes"}
-    CLASSPATH="$LEIN_DIR/leiningen-core/src/"
-    CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/resources/"
-    CLASSPATH="$CLASSPATH:$(cat $LEIN_DIR/.lein-classpath 2> /dev/null)"
-    CLASSPATH="$CLASSPATH:$LEIN_DIR/leiningen-core/lib/*"
-    CLASSPATH="$CLASSPATH:$LEIN_DIR/test:$LEIN_DIR/target/classes"
-    CLASSPATH="$CLASSPATH:$LEIN_DIR/src:$LEIN_DIR/resources:$LEIN_JAR"
-    if [ -f .lein-classpath ]; then
-        CLASSPATH="`cat .lein-classpath`:$CLASSPATH"
-    fi
-else # Not running from a checkout
-    # apply context specific CLASSPATH entries
-    if [ -f .lein-classpath ]; then
-        CLASSPATH="`cat .lein-classpath`:$LEIN_JAR"
-    else
-        CLASSPATH="$LEIN_JAR"
-    fi
-
-    export LEIN_JVM_OPTS=${LEIN_JVM_OPTS:-"-Xbootclasspath/a:$LEIN_JAR"}
-
-    if [ ! -r "$LEIN_JAR" -a "$1" != "self-install" ]; then
-        "$0" self-install
-    fi
-fi
-
-if [ "$HTTP_CLIENT" = "" ]; then
-    if type -p curl >/dev/null 2>&1; then
-        if [ "$https_proxy" != "" ]; then
-            CURL_PROXY="-x $https_proxy"
-        fi
-        HTTP_CLIENT="curl $CURL_PROXY -f -L -o"
-    else
-        HTTP_CLIENT="wget -O"
-    fi
-fi
-
-export JAVA_CMD=${JAVA_CMD:-"java"}
-export LEIN_JAVA_CMD=${LEIN_JAVA_CMD:-$JAVA_CMD}
-
-# Support $JAVA_OPTS for backwards-compatibility.
-export JVM_OPTS="${JVM_OPTS:-"$JAVA_OPTS"}"
-
-# TODO: investigate http://skife.org/java/unix/2011/06/20/really_executable_jars.html
-# If you're packaging this for a package manager (.deb, homebrew, etc)
-# you need to remove the self-install and upgrade functionality or see lein-pkg.
-if [ "$1" = "self-install" ]; then
-    if [ -r "$LEIN_JAR" ]; then
-      echo "The self-install jar already exists at $LEIN_JAR."
-      echo "If you wish to re-download, delete it and rerun \"$0 self-install\"."
-      exit 1
-    fi
-    echo "Downloading Leiningen now..."
-    LEIN_DIR=`dirname "$LEIN_JAR"`
-    mkdir -p "$LEIN_DIR"
-    LEIN_URL="https://github.com/downloads/technomancy/leiningen/leiningen-$LEIN_VERSION-standalone.jar"
-    $HTTP_CLIENT "$LEIN_JAR" "$LEIN_URL"
-    if [ $? != 0 ]; then
-        echo "Failed to download $LEIN_URL"
-        echo "If you have an old version of libssl you may not have the correct"
-        echo "certificate authority. Either upgrade or set HTTP_CLIENT to insecure:"
-        echo "  export HTTP_CLIENT=\"wget --no-check-certificate -O\" # or"
-        echo "  export HTTP_CLIENT=\"curl --insecure -f -L -o"
-        if [ $SNAPSHOT = "YES" ]; then
-            echo "If you have Maven installed, you can do"
-            echo "mvn dependency:copy-dependencies; mv target/dependency lib"
-            echo "See README.md for further SNAPSHOT build instructions."
-        fi
-        rm $LEIN_JAR 2> /dev/null
-        exit 1
-    fi
-elif [ "$1" = "upgrade" ]; then
-    if [ "$LEIN_DIR" != "" ]; then
-        echo "The upgrade task is not meant to be run from a checkout."
-        exit 1
-    fi
-    if [ $SNAPSHOT = "YES" ]; then
-        echo "The upgrade task is only meant for stable releases."
-        echo "See the \"Hacking\" section of the README."
-        exit 1
-    fi
-    if [ ! -w "$SCRIPT" ]; then
-        echo "You do not have permission to upgrade the installation in $SCRIPT"
-        exit 1
-    else
-        TARGET_VERSION="${2:-"preview"}"
-        echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
-        echo -n "Do you want to continue [Y/n]? "
-        read RESP
-        case "$RESP" in
-            y|Y|"")
-                echo
-                echo "Upgrading..."
-                TARGET="/tmp/lein-$$-upgrade"
-                if [ "$OSTYPE" = "cygwin" ]; then
-                    TARGET=`cygpath -w $TARGET`
-                fi
-                LEIN_SCRIPT_URL="https://github.com/technomancy/leiningen/raw/$TARGET_VERSION/bin/lein"
-                $HTTP_CLIENT "$TARGET" "$LEIN_SCRIPT_URL" \
-                    && mv "$TARGET" "$SCRIPT" \
-                    && chmod +x "$SCRIPT" \
-                    && echo && "$SCRIPT" self-install && echo && echo "Now running" `$SCRIPT version`
-                exit $?;;
-            *)
-                echo "Aborted."
-                exit 1;;
-        esac
-    fi
-else
-    if [ "$OSTYPE" = "cygwin" ]; then
-        # When running on Cygwin, use Windows-style paths for java
-        ORIGINAL_PWD=`cygpath -w "$ORIGINAL_PWD"`
-        CLASSPATH=`cygpath -wp "$CLASSPATH"`
-    fi
-
-    if [ $DEBUG ]; then
-        echo "Classpath: $CLASSPATH"
-    fi
-
-    TRAMPOLINE_FILE="/tmp/lein-trampoline-$$"
-    if [ "$OSTYPE" = "cygwin" ]; then
-        TRAMPOLINE_FILE=`cygpath -w $TRAMPOLINE_FILE`
-    fi
-
-    $LEIN_JAVA_CMD \
-        -client -XX:+TieredCompilation \
-        $LEIN_JVM_OPTS \
-        -Dfile.encoding=UTF-8 \
-        -Dmaven.wagon.http.ssl.easy=false \
-        -Dleiningen.original.pwd="$ORIGINAL_PWD" \
-        -Dleiningen.trampoline-file=$TRAMPOLINE_FILE \
-        -cp "$CLASSPATH" \
-        clojure.main -m leiningen.core.main "$@"
-
-    EXIT_CODE=$?
-
-    if [ -r $TRAMPOLINE_FILE ]; then
-        TRAMPOLINE="$(cat $TRAMPOLINE_FILE)"
-        rm $TRAMPOLINE_FILE
-        exec sh -c "exec $TRAMPOLINE"
-    else
-        exit $EXIT_CODE
-    fi
-fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/500px.com.js	Mon Jul 16 15:24:53 2012 -0400
@@ -0,0 +1,8 @@
+$(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 12 10:21:07 2012 -0400
+++ b/fish/config.fish	Mon Jul 16 15:24:53 2012 -0400
@@ -1,7 +1,7 @@
 # Useful aliases {{{
 
 alias serve_this 'python -m SimpleHTTPServer'
-alias fab 'fab -i ~/.ssh/stevelosh'
+# alias fab 'fab -i ~/.ssh/stevelosh'
 alias oldgcc 'set -g CC /usr/bin/gcc-4.0'
 alias tm 'tmux -u2'
 alias c 'clear'
@@ -9,6 +9,8 @@
 alias paththis 'set PATH (pwd) $PATH'
 alias clc './get-last-commit-url.py | pbcopy'
 
+alias swank 'dtach -A /tmp/dtach-swank.sock -r winch lein swank'
+
 alias ef 'vim ~/.config/fish/config.fish'
 alias ev 'vim ~/.vimrc'
 alias ed 'vim ~/.vim/custom-dictionary.utf-8.add'
@@ -58,6 +60,13 @@
 end
 
 # }}}
+# Bind Keys {{{
+
+function fish_user_keybindings
+    bind \cn accept-autosuggestion
+end
+
+# }}}
 # Environment variables {{{
 
 set PATH "/usr/local/bin"          $PATH
@@ -200,10 +209,16 @@
 alias l1 'tree --dirsfirst -ChFL 1'
 alias l2 'tree --dirsfirst -ChFL 2'
 alias l3 'tree --dirsfirst -ChFL 3'
+alias l4 'tree --dirsfirst -ChFL 4'
+alias l5 'tree --dirsfirst -ChFL 5'
+alias l6 'tree --dirsfirst -ChFL 6'
 
 alias ll1 'tree --dirsfirst -ChFupDaL 1'
 alias ll2 'tree --dirsfirst -ChFupDaL 2'
 alias ll3 'tree --dirsfirst -ChFupDaL 3'
+alias ll4 'tree --dirsfirst -ChFupDaL 4'
+alias ll5 'tree --dirsfirst -ChFupDaL 5'
+alias ll6 'tree --dirsfirst -ChFupDaL 6'
 
 alias l  'l1'
 alias ll 'll1'
@@ -218,7 +233,7 @@
     source $HOME/.config/fish/local.fish
 end
 
-#normal }}}
+# }}}
 
 if status --is-interactive
     command fortune -s | cowsay -n | lolcat
Binary file moom/com.manytricks.Moom.plist has changed
--- a/vim/custom-dictionary.utf-8.add	Thu Jul 12 10:21:07 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add	Mon Jul 16 15:24:53 2012 -0400
@@ -51,3 +51,8 @@
 keypresses
 screenshots
 Screenshot
+API
+prerelease
+refactored
+refactorings
+UUID
--- a/vim/vimrc	Thu Jul 12 10:21:07 2012 -0400
+++ b/vim/vimrc	Mon Jul 16 15:24:53 2012 -0400
@@ -93,12 +93,21 @@
 
 " }}}
 " Trailing whitespace {{{
+" Save {{{
+
+" augroup its2012justfuckingsavealready
+"     au!
+"     au InsertLeave * :silent! wa
+"     au CursorHold * :silent! wa
+"     au CursorHoldI * :silent! wa
+" augroup END
+
+" }}}
 " Only shown when not in insert mode so I don't go insane.
 
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:⌴
-    au InsertLeave * :set listchars+=trail:⌴
 augroup END
 
 " }}}
@@ -387,6 +396,7 @@
 " Quick editing ----------------------------------------------------------- {{{
 
 nnoremap <leader>ev :vsplit $MYVIMRC<cr>
+nnoremap <leader>eV :vsplit scp://vagrant//<cr>
 nnoremap <leader>ef :vsplit ~/.config/fish/config.fish<cr>
 nnoremap <leader>ed :vsplit ~/.vim/custom-dictionary.utf-8.add<cr>
 nnoremap <leader>eo :vsplit ~/Dropbox/Org<cr>4j
@@ -562,6 +572,19 @@
 " }}}
 " Clojure {{{
 
+" function! SlimvToggleRepl()
+"     if bufname('%') ==# 'SLIMV.REPL'
+"         let origin = b:pop_back_to
+"         q
+"         execute "" . origin . "wincmd w"
+"     else
+"         let origin = winnr()
+"         vertical botright split
+"         e SLIMV.REPL
+"         let b:pop_back_to = origin
+"     endif
+" endfunction
+
 let g:slimv_leader = '\'
 let g:slimv_keybindings = 2
 
@@ -585,6 +608,9 @@
     " And the inspect mapping.
     au FileType clojure nmap <buffer> \i \di
 
+    " And REPL-toggling mapping.
+    " au FileType clojure nnoremap <buffer> \rr :call SlimvToggleRepl()<cr>
+
     " Indent top-level form.
     au FileType clojure nmap <buffer> <localleader>= v((((((((((((=%
 augroup END
@@ -993,7 +1019,7 @@
     \ "jar|class|swp|swo|log|so|o|pyc|jpe?g|png|gif|mo|po" .
     \ ")$' | " .
     \ "egrep -v '^(\\./)?(" .
-    \ "deploy/|lib/|classes/|libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/" .
+    \ "deploy/|lib/|classes/|libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/|docs/build/" .
     \ ")'"
 
 let my_ctrlp_user_command = "" .
@@ -1187,7 +1213,7 @@
 
 let g:slimv_repl_name = 'SLIMV.REPL'
 let g:slimv_repl_split = 4
-let g:slimv_repl_syntax = 0
+" let g:slimv_repl_syntax = 0
 let g:slimv_repl_wrap = 0
 
 " Use a swank command that works, and doesn't require new app windows.