# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1339510558 14400
# Node ID e31e36a40bf2279c23801982707068cb96b26163
# Parent  7840156f5d9249d32163375a14625c892b2b187f
moar

diff -r 7840156f5d92 -r e31e36a40bf2 bin/bootstrap.sh
--- a/bin/bootstrap.sh	Mon Jun 11 11:35:16 2012 -0400
+++ b/bin/bootstrap.sh	Tue Jun 12 10:15:58 2012 -0400
@@ -10,26 +10,26 @@
     test -L "$HOME/$2" || ln -s "$HOME/$1" "$HOME/$2"
 }
 
+mkdir -p ~/.config/fish
 mkdir -p ~/lib/hg
 mkdir -p ~/lib/virtualenvs
 mkdir -p ~/bin
 mkdir -p ~/src
 
+ensure_link "lib/dotfiles/hgrc" ".hgrc"
+
 test -d ~/.hg-git/    || hg clone "bb://durin42/hg-git/" "$HOME/.hg-git"
 test -d ~/lib/dulwich || git clone "git://github.com/jelmer/dulwich.git" "$HOME/lib/dulwich"
-ensure_link "lib/dulwich" "lib/hg/hg-stable/dulwich"
+
+ensure_link "lib/dulwich/dulwich" "lib/hg/hg/dulwich"
 
 test -d ~/lib/dotfiles || hg clone http://bitbucket.org/sjl/dotfiles ~/lib/dotfiles
-test -d ~/lib/oh-my-zsh || git clone git://github.com/sjl/oh-my-zsh ~/lib/oh-my-zsh
 
 ensure_link "lib/dotfiles/tmux/tmux.conf" ".tmux.conf"
 ensure_link "lib/dotfiles/vim"            ".vim"
 ensure_link "lib/dotfiles/vim/vimrc"      ".vimrc"
-ensure_link "lib/dotfiles/hgrc"           ".hgrc"
 ensure_link "lib/dotfiles/gitconfig"      ".gitconfig"
 ensure_link "lib/dotfiles/ackrc"          ".ackrc"
-ensure_link "lib/dotfiles/zsh"            "lib/oh-my-zsh/custom"
-ensure_link "lib/dotfiles/zshrc"          ".zshrc"
 ensure_link "lib/dotfiles/weechat"        ".weechat"
 ensure_link "lib/dotfiles/urlview"        ".urlview"
 ensure_link "lib/dotfiles/pentadactylrc"  ".pentadactylrc"
@@ -40,5 +40,6 @@
 ensure_link "lib/dotfiles/hgignore"       ".hgignore"
 ensure_link "lib/dotfiles/ctags"          ".ctags"
 ensure_link "lib/dotfiles/grc"            ".grc"
+ensure_link "lib/dotfiles/fish/config.fish" ".config/fish/config.fish"
 
 echo completed
diff -r 7840156f5d92 -r e31e36a40bf2 fish/config.fish
--- a/fish/config.fish	Mon Jun 11 11:35:16 2012 -0400
+++ b/fish/config.fish	Tue Jun 12 10:15:58 2012 -0400
@@ -1,28 +1,40 @@
 # Useful aliases {{{
 
-alias fab     'fab -i ~/.ssh/stevelosh'
-alias oldgcc  'set -g CC /usr/bin/gcc-4.0'
-alias tm      'tmux -u2'
-alias c       'clear'
-alias ef      'vim ~/.config/fish/config.fish'
+alias fab 'fab -i ~/.ssh/stevelosh'
+alias oldgcc 'set -g CC /usr/bin/gcc-4.0'
+alias tm 'tmux -u2'
+alias c 'clear'
+alias hl 'less -R'
+
+alias ef 'vim ~/.config/fish/config.fish'
 
 alias h 'hg'
 alias g 'git'
 
-alias v 'vagrant'
+alias pbc 'pbcopy'
+alias pbp 'pbpaste'
+
+alias v 'vim'
+
 alias vu 'vagrant up'
 alias vs 'vagrant suspend'
 
+alias o 'open'
+alias oo 'open .'
+
 # }}}
 # Environment variables {{{
 
-set PATH "/usr/local/bin"         $PATH
-set PATH "/usr/local/sbin"        $PATH
-set PATH "$HOME/bin"              $PATH
-set PATH "$HOME/lib/dotfiles/bin" $PATH
-set PATH "/opt/local/bin"         $PATH
-set PATH "/opt/subversion/bin"    $PATH
-set PATH "$HOME/lib/hg/hg-stable" $PATH
+set PATH "/usr/local/bin"          $PATH
+set PATH "/usr/local/share/python" $PATH
+set PATH "/usr/local/sbin"         $PATH
+set PATH "$HOME/bin"               $PATH
+set PATH "$HOME/lib/dotfiles/bin"  $PATH
+set PATH "/opt/local/bin"          $PATH
+set PATH "/opt/subversion/bin"     $PATH
+set PATH "$HOME/lib/hg/hg"         $PATH
+
+set PATH "/usr/local/Cellar/ruby/1.9.3-p194/bin" $PATH
 
 set BROWSER open
 
@@ -49,7 +61,7 @@
 set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
 set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
 set PYTHONPATH "$HOME/lib/python/see:$PYTHONPATH"
-set PYTHONPATH "$HOME/lib/hg/hg-stable:$PYTHONPATH"
+set PYTHONPATH "$HOME/lib/hg/hg:$PYTHONPATH"
 
 # }}}
 # Z {{{
diff -r 7840156f5d92 -r e31e36a40bf2 keyremap4macbook/private.xml
--- a/keyremap4macbook/private.xml	Mon Jun 11 11:35:16 2012 -0400
+++ b/keyremap4macbook/private.xml	Tue Jun 12 10:15:58 2012 -0400
@@ -2,7 +2,7 @@
 <root>
     <list>
         <item>
-            <name>Swap parens and brackets</name>
+            <name>sjl Swap parens and brackets</name>
             <identifier>private.swap_parens_and_brackets</identifier>
             <autogen>--KeyToKey-- KeyCode::BRACKET_LEFT,  ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
             <autogen>--KeyToKey-- KeyCode::BRACKET_RIGHT, ModifierFlag::NONE, KeyCode::KEY_0, ModifierFlag::SHIFT_R</autogen>
@@ -13,7 +13,7 @@
 
     <list>
         <item>
-            <name>Shifts to Parentheses</name>
+            <name>sjl Shifts to Parentheses</name>
             <appendix>Shifts, when pressed alone, type parentheses.  When used with other keys they're normal shifts.</appendix>
 
             <identifier>private.shifts_to_parens</identifier>
@@ -40,7 +40,7 @@
 
     <list>
         <item>
-            <name>Use the correct goddamed shift keys.</name>
+            <name>sjl Use the correct goddamed shift keys.</name>
             <identifier>private.fucking_shift_keys_how_do_they_work</identifier>
 
             <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
diff -r 7840156f5d92 -r e31e36a40bf2 moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r 7840156f5d92 -r e31e36a40bf2 osx.sh
--- a/osx.sh	Mon Jun 11 11:35:16 2012 -0400
+++ b/osx.sh	Tue Jun 12 10:15:58 2012 -0400
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # Disable menu bar transparency
 defaults write NSGlobalDomain AppleEnableMenuBarTransparency -bool false
 
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/alias.conf
--- a/weechat/alias.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/alias.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.3.7
+# alias.conf -- WeeChat v0.3.8
 #
 
 [cmd]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/buffers.conf
--- a/weechat/buffers.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/buffers.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.3.7
+# buffers.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/logger.conf
--- a/weechat/logger.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/logger.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,10 +1,14 @@
 #
-# logger.conf -- weechat v0.3.7
+# logger.conf -- WeeChat v0.3.8
 #
 
 [look]
 backlog = 20
 
+[color]
+backlog_end = darkgray
+backlog_line = darkgray
+
 [file]
 auto_log = on
 flush_delay = 120
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/plugins.conf
--- a/weechat/plugins.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/plugins.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v0.3.7
+# plugins.conf -- WeeChat v0.3.8
 #
 
 [var]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/relay.conf
--- a/weechat/relay.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/relay.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.3.7
+# relay.conf -- WeeChat v0.3.8
 #
 
 [look]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/rmodifier.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.3.7
+# rmodifier.conf -- WeeChat v0.3.8
 #
 
 [look]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/urlgrab.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.3.7
+# urlgrab.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/weechat.conf
--- a/weechat/weechat.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/weechat.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.3.7
+# weechat.conf -- WeeChat v0.3.8
 #
 
 [debug]
@@ -58,19 +58,22 @@
 mouse_timer_delay = 100
 nickmode = on
 nickmode_empty = off
+paste_bracketed = off
+paste_bracketed_timer_delay = 10
 paste_max_lines = 3
 prefix_action = " *"
 prefix_align = right
 prefix_align_max = 15
 prefix_align_min = 0
-prefix_align_more = on
+prefix_align_more = "+"
 prefix_buffer_align = right
 prefix_buffer_align_max = 0
-prefix_buffer_align_more = on
+prefix_buffer_align_more = "+"
 prefix_error = "=!="
 prefix_join = "✔"
 prefix_network = "--"
 prefix_quit = "✘"
+prefix_same_nick = ""
 prefix_suffix = "|"
 read_marker = line
 read_marker_always_show = on
@@ -166,6 +169,7 @@
 [proxy]
 
 [network]
+connection_timeout = 60
 gnutls_ca_file = "%h/ssl/CAs.pem"
 gnutls_handshake_timeout = 30
 
diff -r 7840156f5d92 -r e31e36a40bf2 weechat/xfer.conf
--- a/weechat/xfer.conf	Mon Jun 11 11:35:16 2012 -0400
+++ b/weechat/xfer.conf	Tue Jun 12 10:15:58 2012 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.3.7
+# xfer.conf -- WeeChat v0.3.8
 #
 
 [look]