From e53b2e2ca355d59c782cda34964edb0891a38ae0 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Tue, 10 Nov 2015 23:33:07 -0800
Subject: [PATCH] Get emacs to work with solarized, change tmux bottom bar to
 match theme

---
 dotfiles/emacs.d/init.el    | 14 +++++++++++---
 dotfiles/emacs.d/package.el |  2 +-
 dotfiles/tmux.conf          | 11 ++---------
 dotfiles/zshrc              |  8 +-------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 4dfbcb8..4e2bafb 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -38,7 +38,7 @@
 ;; Theme
 ;;-------------------------------------------------------------------------------------
 
-(load-theme 'solarized-dark t)
+(load-theme 'solarized t)
 
 ;; 10 pt font
 (set-frame-font "inconsolata")
@@ -70,6 +70,15 @@
 (ido-mode 1)
 
 ;;-------------------------------------------------------------------------------------
+;; ZSH script detection
+;;------------------------------------------------------------------------------------
+
+(add-hook 'sh-mode-hook
+          (lambda ()
+            (if (string-match "\\.zsh$" buffer-file-name)
+                                (sh-set-shell "zsh"))))
+
+;;-------------------------------------------------------------------------------------
 ;; Alignment
 ;;-------------------------------------------------------------------------------------
 
@@ -125,8 +134,7 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    (quote
-    ("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default)))
- '(inhibit-startup-screen t))
+    ("8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" default))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/dotfiles/emacs.d/package.el b/dotfiles/emacs.d/package.el
index 2139804..de53521 100644
--- a/dotfiles/emacs.d/package.el
+++ b/dotfiles/emacs.d/package.el
@@ -4,7 +4,7 @@
                          flycheck-clojure flycheck-haskell flycheck-rust
                          flycheck-pos-tip flx-ido gitignore-mode haskell-mode js2-mode
                          less-css-mode neotree paredit scss-mode powerline projectile
-                         rust-mode solarized-theme wrap-region)
+                         rust-mode color-theme-solarized wrap-region)
   "Packages to make sure are installed")
  
 (defun my-packages-installed-p ()
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index de6c854..7838094 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -11,6 +11,8 @@ unbind C-b
 set -g prefix C-Space
 bind Space send-prefix
 
+set -g status-bg blue
+
 # Once the prefix is active these binds will matter
 # <prefix><Space> and <prefix><C-Space> take you to copy mode.
 
@@ -53,12 +55,3 @@ bind p paste-buffer
 # Enable vi-like keybindings
 set-window-option -g mode-keys vi
 
-
-
-
-set -g mode-mouse on
-set -g mouse-resize-pane on
-set -g mouse-select-pane on
-set -g mouse-select-window on
-set-window-option -g mode-mouse on
-
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index e19fb6e..053f4cf 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -5,13 +5,7 @@ export LANG=en_US.UTF-8
 export VISUAL=vim
 export EDITOR="$VISUAL"
 export ITERM_24BIT=1
-
-if [[ `uname` == 'Linux' ]]
-then
-  export TERM=xterm
-else
-  export TERM=xterm-256color
-fi
+export TERM=xterm-256color
 
 alias emacs='emacs -nw'
 alias irssi='TERM=screen-256color irssi'