From 44d544602a67fe0dfdf2fa39298b103acf7bea26 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Wed, 11 Nov 2015 21:29:21 -0800
Subject: [PATCH] Major changes to tmux to accomodate emacs better, and also
 rebind caps lock to escape and change status bar colors to solarized

---
 dotfiles/emacs.d/init.el |  6 ++++--
 dotfiles/tmux.conf       | 41 ++++++++++++++++++++++++++++++++++++-----
 dotfiles/xinitrc         |  1 +
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 4e2bafb..72aa6ed 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -106,6 +106,7 @@
 ;; Unbind C-t from transpose
 (global-set-key (kbd "C-t") nil)
 
+(global-set-key (kbd "C-d") nil)
 
 ;; Neotree binds are prefixed by C-t
 
@@ -122,9 +123,10 @@
 (global-set-key (kbd "M-k") 'windmove-up)
 (global-set-key (kbd "M-l") 'windmove-right)
 
+;; Delete surrounding
+(global-set-key (kbd "C-d s") 'delete-pair)
+
 
-;;-------------------------------------------------------------------------------------
-;; Custom
 ;;-------------------------------------------------------------------------------------
 
 (custom-set-variables
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 01206a4..e699420 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -7,12 +7,43 @@
 
 # Rebind tmux prefix to <c-space> to match vim
 
-unbind C-b
-set -g prefix C-Space
-bind Space send-prefix
+unbind-key C-b
+set -g prefix Escape
+bind Escape send-prefix
+
+set -s escape-time 0
+
+
+###################################
+#                                 #
+#            Colors               #
+#                                 #
+###################################
+
+set-option -g status-bg black                                    #base02
+set-option -g status-fg yellow                                   #yellow
+set-option -g status-attr default
+
+set-window-option -g window-status-fg brightblue                 #base0
+set-window-option -g window-status-bg default
+
+set-window-option -g window-status-current-fg brightred          #orange
+set-window-option -g window-status-current-bg default
+
+set-option -g pane-border-fg black                               #base02
+set-option -g pane-active-border-fg brightgreen                  #base01
+
+set-option -g message-bg black                                   #base02
+set-option -g message-fg brightred                               #orange
+
+set-option -g display-panes-active-colour blue                   #blue
+set-option -g display-panes-colour brightred                     #orange
+
+set-window-option -g clock-mode-colour green                     #green
+
+set-window-option -g window-status-bell-style fg=black,bg=red    #base02, red
+
 
-set -g status-bg blue
-set -g status-fg black
 
 # Once the prefix is active these binds will matter
 # <prefix><Space> and <prefix><C-Space> take you to copy mode.
diff --git a/dotfiles/xinitrc b/dotfiles/xinitrc
index 4e98570..63c2e51 100644
--- a/dotfiles/xinitrc
+++ b/dotfiles/xinitrc
@@ -5,4 +5,5 @@ xrdb ~/.Xresources
 # exec ~/essentials/scripts/sysinit/xmonad_start.sh
 # exec awesome
 feh --bg-scale ~/essentials/backgrounds/glass-blue-bg.jpg
+setkbmap -option caps:escape
 exec i3