Merging

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);

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'

zshrc

@@ -2,10 +2,12 @@
 # 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 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