From f384c712c8b06cca14d93d7f15aab780ea0f66aa Mon Sep 17 00:00:00 2001
From: Austen <stonewareslord@gmail.com>
Date: Sat, 28 Jun 2014 02:16:07 -0400
Subject: [PATCH] Added tmux 256 color mode! Alias ls with -F only if not mac
 computer. Swapped cbranch arguements. Added solarized 256 colorscheme to
 tmux.conf. Sent titlestring of tmux to the tmux process running

---
 bashrc    |  7 +++++--
 gitconfig |  2 +-
 tmux.conf | 33 ++++++++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/bashrc b/bashrc
index c41beb2..c203042 100644
--- a/bashrc
+++ b/bashrc
@@ -102,7 +102,7 @@ if ! shopt -oq posix; then
 fi
 PATH=$PATH:~/tmp/ucpp/ucpp/
 function tsh(){
-  ssh $* -t 'tmux a||wemux a||tmux;exit'&&clear
+  ssh $* -t 'tux||tmux a||wemux a||tmux;exit'
 }
 . /usr/share/autojump/autojump.sh
 [[ -s /home/stonewareslord/.autojump/etc/profile.d/autojump.sh ]] && source /home/stonewareslord/.autojump/etc/profile.d/autojump.sh
@@ -116,7 +116,10 @@ complete -cf sudo man
 
 #Alias definitions.
 #Colors!
-alias ls='ls --color=always -F'
+if [ "$(uname)" != "Darwin" ] ; then
+  alias ls='ls --color=always -F'
+fi
+alias tmux='tmux -2'
 alias less='less -r'
 alias tree='tree -C'
 alias grep="grep --color=auto"
diff --git a/gitconfig b/gitconfig
index 0a825e1..77aef47 100644
--- a/gitconfig
+++ b/gitconfig
@@ -14,7 +14,7 @@
   type = cat-file -t
   dump = cat-file -p
   d = difftool
-  cbranch  = !sh -c 'git commit -m \"$1\"&&git branch $2&&git reset --hard HEAD~1&&git co \"$2\"' -
+  cbranch  = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' -
 [push]
   default = matching
 [core]
diff --git a/tmux.conf b/tmux.conf
index 68fb7d1..28caa85 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -10,7 +10,7 @@ bind | split-window -h
 bind - split-window -v
 set -g default-terminal "screen-256color"
 set-option -g history-limit 50000
-
+set -g set-titles-string "tmux.#I.#W"
 set -g prefix C-a
 bind C-a send-prefix
 unbind C-b
@@ -37,3 +37,34 @@ set -g status-interval 5
 set -g status-right-length 60
 set -g status-right "#[fg=white]#S #I:#P #[fg-yellow] %d %b %Y #[fg=green] %l:%M %p  #(date -u | awk '{print $4}')"
 bind-key R source-file ~/.tmux.conf
+#### COLOUR (Solarized 256)
+
+# default statusbar colors
+set-option -g status-bg colour235 #base02
+set-option -g status-fg colour136 #yellow
+set-option -g status-attr default
+
+# default window title colors
+set-window-option -g window-status-fg colour244 #base0
+set-window-option -g window-status-bg default
+#set-window-option -g window-status-attr dim
+
+# active window title colors
+set-window-option -g window-status-current-fg colour166 #orange
+set-window-option -g window-status-current-bg default
+#set-window-option -g window-status-current-attr bright
+
+# pane border
+set-option -g pane-border-fg colour235 #base02
+set-option -g pane-active-border-fg colour240 #base01
+
+# message text
+set-option -g message-bg colour235 #base02
+set-option -g message-fg colour166 #orange
+
+# pane number display
+set-option -g display-panes-active-colour colour33 #blue
+set-option -g display-panes-colour colour166 #orange
+
+# clock
+set-window-option -g clock-mode-colour colour64 #green