From fc3bbb2f131a7781ba741dd84d0c78320a93c4f4 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@originate.com>
Date: Mon, 23 May 2016 15:24:46 -0700
Subject: [PATCH] Revert to old tmux/vim bindings

---
 dotfiles/tmux.conf | 12 ++++++------
 dotfiles/zshrc     | 11 +++++++++--
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 227f9b6..81e1065 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -51,17 +51,17 @@ bind C-Space copy-mode
 
 # Rebinds to be like neotree
 unbind %
-bind | split-window -h
-bind - split-window -v
+bind i split-window -h
+bind s split-window -v
 
 # Smart pane switching with awareness of vim splits
 # This is the tmux side of the vim-tmux-navigator plugin
 # is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'"
 
-bind -n M-Left select-pane -L
-bind -n M-Right select-pane -R
-bind -n M-Up select-pane -U
-bind -n M-Down select-pane -D
+bind k selectp -U # switch to panel Up
+bind j selectp -D # switch to panel Down
+bind h selectp -L # switch to panel Left
+bind l selectp -R # switch to panel Right
 
 # Vim keybinds so copy mode behaves more like vim
 bind-key -t vi-copy 'v' begin-selection
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index fecefe9..a923a5c 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -2,7 +2,15 @@
 export ZSH=~/.oh-my-zsh
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
-export VISUAL="nvim"
+if [[ "$OSTYPE" == "linux-gnu" ]]; then
+  # Linux
+  export VISUAL="nvim"
+  alias vim="$VISUAL"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  # Mac OSX
+  export VISUAL="/usr/local/bin/nvim"
+  alias vim="$VISUAL"
+fi
 export EDITOR="$VISUAL"
 export ITERM_24BIT=1
 export TERM=rxvt-256color
@@ -19,7 +27,6 @@ export TERM=rxvt-256color
 #  export TERM=xterm-256color
 #fi
 
-alias vim='nvim'
 alias emacs='emacs -nw'
 alias irssi='TERM=screen-256color irssi'
 alias scheme='rlwrap mit-scheme'