Some changes

emacs/wunki/wunki-theme.el

@@ -1,5 +1,5 @@
 ;; load theme and don't ask if it's save.
-(load-theme 'sanityinc-tomorrow-blue t)
+(load-theme 'sanityinc-solarized-light)
 
 (set-frame-font "Source Code Pro")
 (add-to-list 'default-frame-alist '(font . "Source Code Pro"))

git/gitconfig

@@ -37,7 +37,3 @@
     protocol = https
 [push]
     default = upstream
-[merge]
-    tool = vimdiff
-[pull]
-	default = upstream

tmux/tmux-status.conf

@@ -1,29 +1,29 @@
 # This tmux statusbar config was created by tmuxline.vim
-# on Sat, 18 Apr 2015
+# on Tue, 28 Apr 2015
 
-set -g status-bg "colour236"
-set -g message-command-fg "colour250"
+set -g status-bg "colour17"
+set -g message-command-fg "colour231"
 set -g status-justify "left"
 set -g status-left-length "100"
 set -g status "on"
-set -g pane-active-border-fg "colour109"
-set -g message-bg "colour239"
+set -g pane-active-border-fg "colour153"
+set -g message-bg "colour18"
 set -g status-right-length "100"
 set -g status-right-attr "none"
-set -g message-fg "colour250"
-set -g message-command-bg "colour239"
+set -g message-fg "colour231"
+set -g message-command-bg "colour18"
 set -g status-attr "none"
 set -g status-utf8 "on"
-set -g pane-border-fg "colour239"
+set -g pane-border-fg "colour18"
 set -g status-left-attr "none"
-setw -g window-status-fg "colour250"
+setw -g window-status-fg "colour231"
 setw -g window-status-attr "none"
-setw -g window-status-activity-bg "colour236"
+setw -g window-status-activity-bg "colour17"
 setw -g window-status-activity-attr "none"
-setw -g window-status-activity-fg "colour109"
+setw -g window-status-activity-fg "colour153"
 setw -g window-status-separator ""
-setw -g window-status-bg "colour236"
-set -g status-left "#[fg=colour235,bg=colour109,bold] #S #[fg=colour109,bg=colour236,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=colour239,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour239] %Y-%m-%d  %H:%M #[fg=colour109,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour235,bg=colour109] #h "
-setw -g window-status-format "#[fg=colour250,bg=colour236] #I #[fg=colour250,bg=colour236] #W "
-setw -g window-status-current-format "#[fg=colour236,bg=colour239,nobold,nounderscore,noitalics]#[fg=colour250,bg=colour239] #I #[fg=colour250,bg=colour239] #W #[fg=colour239,bg=colour236,nobold,nounderscore,noitalics]"
+setw -g window-status-bg "colour17"
+set -g status-left "#[fg=colour17,bg=colour153,bold] #S #[fg=colour153,bg=colour17,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=colour18,bg=colour17,nobold,nounderscore,noitalics]#[fg=colour231,bg=colour18] %Y-%m-%d  %H:%M #[fg=colour153,bg=colour18,nobold,nounderscore,noitalics]#[fg=colour17,bg=colour153] #h "
+setw -g window-status-format "#[fg=colour231,bg=colour17] #I #[fg=colour231,bg=colour17] #W "
+setw -g window-status-current-format "#[fg=colour17,bg=colour18,nobold,nounderscore,noitalics]#[fg=colour231,bg=colour18] #I #[fg=colour231,bg=colour18] #W #[fg=colour18,bg=colour17,nobold,nounderscore,noitalics]"

vim/vimrc

@@ -137,7 +137,7 @@ else
     set termencoding=utf-8
 endif
 
-colors Tomorrow-Night
+colors Tomorrow-Night-Blue
 
 " Find Shell
 if executable('/usr/local/bin/zsh')