From 2e04bc24337351c061b6424078485aa664f4d8a2 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Thu, 24 Jan 2013 16:30:53 -0800
Subject: [PATCH] Unstash work-local changes and merge

- Fix gitconfig to use Kaleidoscope
- Toggle solarized background with <F10>
---
 env       | 2 +-
 gitconfig | 2 ++
 vimrc     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/env b/env
index c575a21..1d189dd 100644
--- a/env
+++ b/env
@@ -12,7 +12,7 @@
 
 export SYS=`uname -s | tr A-Z a-z`
 # Set this to a non-zero integer to see startup messages
-export NOISY=0
+export NOISY=20
 
 print_heading -l 1 'Initializing environment'
 
diff --git a/gitconfig b/gitconfig
index fa5c2f0..ca8c981 100644
--- a/gitconfig
+++ b/gitconfig
@@ -51,6 +51,8 @@
     f = fetch
 [ui]
     color = true
+[difftool "Kaleidoscope"]
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [diff]
 	tool = Kaleidoscope
 [mergetool]
diff --git a/vimrc b/vimrc
index 985662b..75eb161 100644
--- a/vimrc
+++ b/vimrc
@@ -126,6 +126,8 @@ endif
 
 set bg=dark
 
+call togglebg#map("<F10>")
+
 " use solarized colorscheme if the terminal can support it (or we're in a GUI)
 let g:solarized_termtrans = 1
 let g:solarized_visibility = 'low'