From d96f0e2de386868a35f0505d74e7064c09a45f0d Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Thu, 11 Jun 2015 10:52:40 +0200
Subject: [PATCH] Tmux colors.

---
 dircolors           |  2 +-
 tmux.conf           | 68 +++++++++++++++++++++------------------------
 vim/bundle/nerdtree |  2 +-
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/dircolors b/dircolors
index a6dfbac..a21f472 160000
--- a/dircolors
+++ b/dircolors
@@ -1 +1 @@
-Subproject commit a6dfbac61855960b73091d4b1a9f0cd84aee6230
+Subproject commit a21f4726bd214a96c76259b235c9a83854876e2f
diff --git a/tmux.conf b/tmux.conf
index 314e30b..b9bdbf5 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -32,39 +32,35 @@ bind - split-window -v
 ### UNDBIND
 unbind-key S
 
-### COLORS
-
-## Solarized dark
-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-attr dim
-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
-
-
-## Solarized light
-#set-option -g status-bg white #base2
-#set-option -g status-fg yellow #yellow
-#set-option -g status-attr default
-#set-window-option -g window-status-fg brightyellow #base00
-#set-window-option -g window-status-bg default
-##set-window-option -g window-status-attr dim
-#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 white #base2
-#set-option -g pane-active-border-fg brightcyan #base1
-#set-option -g message-bg white #base2
-#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
+# --- colors (solarized dark)                                      
+# default statusbar colors                                         
+set -g status-bg black                                             
+set -g status-fg yellow                                            
+set -g status-attr default                                         
+                                                                   
+# default window title colors                                      
+setw -g window-status-fg brightblue                                
+setw -g window-status-bg default                                   
+                                                                   
+# active window title colors                                       
+setw -g window-status-current-fg yellow                            
+setw -g window-status-current-bg default                           
+setw -g window-status-current-attr dim                             
+                                                                   
+# pane border                                                      
+set -g pane-border-fg black                                        
+set -g pane-border-bg default                                      
+set -g pane-active-border-fg yellow                                
+set -g pane-active-border-bg default                               
+                                                                   
+# command line/message text                                        
+set -g message-bg black                                            
+set -g message-fg yellow                                           
+                                                                   
+# pane number display                                              
+set -g display-panes-active-colour yellow                          
+set -g display-panes-colour brightblue                             
+                                                                   
+# clock                                                            
+setw -g clock-mode-colour yellow                                   
+# --- end colors
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
index 4f1e6ec..af85499 160000
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 4f1e6ecb057fc0bac189171c1430d71ef25f6bb1
+Subproject commit af85499edace2acca27ce41790ac333f62b689bb