From 413ac080e1c3f7912bd1f08c3b6606804f0af480 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Tue, 16 Jul 2013 09:19:46 -0500
Subject: [PATCH 1/3] Stuff. Like, stuff, man.

---
 vimrc | 2 +-
 zshrc | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/vimrc b/vimrc
index a40a27f..f5a197f 100644
--- a/vimrc
+++ b/vimrc
@@ -45,7 +45,7 @@ Bundle 'searchfold.vim'
 Bundle 'godlygeek/tabular'
 Bundle 'kshenoy/vim-signature'
 "Bundle 'SirVer/ultisnips'
-Bundle 'fmoralesc/vim-pad'
+"Bundle 'fmoralesc/vim-pad'
 Bundle 'lukerandall/haskellmode-vim'
 Bundle 'bitc/vim-hdevtools'
 " Bundle 'Shougo/neocomplcache'
diff --git a/zshrc b/zshrc
index 1d1e626..8b4162d 100644
--- a/zshrc
+++ b/zshrc
@@ -5,7 +5,9 @@
 [[ -s /usr/share/zsh/site-contrib/powerline.zsh ]] && . /usr/share/zsh/site-contrib/powerline.zsh
 
 alias vi=vim
+alias l="ls -l"
 alias tmux="tmux -2"
+alias dustinswan="ssh dustinswan@dustinswan.org"
 export EDITOR=vim
 
 export BROWSER=open
@@ -42,3 +44,6 @@ if [[ -e /usr/share/chruby ]]; then
     source /usr/share/chruby/auto.sh
 fi
 chruby $(cat ~/.ruby-version)
+
+# GPG
+~/dotfiles/bin/gpg-agent.sh

From 1f1330a6882e6ff5b9d22d8db4c1fab49222346f Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Tue, 16 Jul 2013 14:21:02 +0000
Subject: [PATCH 2/3] Powerline stuff, tmux status stuff, etc.

---
 tmux.conf | 3 +++
 vimrc     | 2 +-
 zshrc     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 80db77f..1f36074 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -29,6 +29,9 @@ set-option -g status-keys vi
 
 set -g default-terminal "screen-256color"
 
+set -g status on
+set -g status-utf8 on
+
 # Powerline
 # Mac
 source '/usr/local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf'
diff --git a/vimrc b/vimrc
index a40a27f..f5a197f 100644
--- a/vimrc
+++ b/vimrc
@@ -45,7 +45,7 @@ Bundle 'searchfold.vim'
 Bundle 'godlygeek/tabular'
 Bundle 'kshenoy/vim-signature'
 "Bundle 'SirVer/ultisnips'
-Bundle 'fmoralesc/vim-pad'
+"Bundle 'fmoralesc/vim-pad'
 Bundle 'lukerandall/haskellmode-vim'
 Bundle 'bitc/vim-hdevtools'
 " Bundle 'Shougo/neocomplcache'
diff --git a/zshrc b/zshrc
index 1d1e626..59e4e4d 100644
--- a/zshrc
+++ b/zshrc
@@ -2,7 +2,7 @@
 # Mac
 [[ -s /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/local/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
 # Linux
-[[ -s /usr/share/zsh/site-contrib/powerline.zsh ]] && . /usr/share/zsh/site-contrib/powerline.zsh
+[[ -s /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh ]] && . /usr/lib/python2.7/site-packages/powerline/bindings/zsh/powerline.zsh
 
 alias vi=vim
 alias tmux="tmux -2"

From 7b47e3fd55f604e7bf784158878bf051f021df80 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Wed, 17 Jul 2013 10:26:52 -0500
Subject: [PATCH 3/3] Adding a bottom-half slate key trigger

---
 slate.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/slate.js b/slate.js
index 2461360..2dec1a5 100644
--- a/slate.js
+++ b/slate.js
@@ -23,6 +23,11 @@ var pushUpHalf = slate.operation("push", {
   "style" : "bar-resize:screenSizeY/2"
 });
 
+var pushDownHalf = slate.operation("push", {
+  "direction" : "down",
+  "style" : "bar-resize:screenSizeY/2"
+});
+
 var pushFull = slate.operation("push", {
   "direction" : "up",
   "style" : "bar-resize:screenSizeX"
@@ -34,4 +39,5 @@ slate.bind("right:ctrl,alt,cmd", pushRightHalf);
 slate.bind("right:ctrl,alt,cmd,shift", pushRightThird);
 
 slate.bind("up:ctrl,alt,cmd", pushUpHalf);
+slate.bind("down:ctrl,alt,cmd", pushDownHalf);
 slate.bind("up:shift,ctrl,alt,cmd", pushFull);