Add color environment variables for zsh and vim

4 files changed, 40 insertions, 19 deletions

diff --git a/mutt/colormutt b/mutt/colormutt
index 8967158..ddaa7ba 100644
--- a/mutt/colormutt
+++ b/mutt/colormutt
@@ -1,12 +1,11 @@
 #!/bin/bash
-h=`date +%H`
 
-if [ $h -lt 9 ]; then
-    theme=dark
-elif [ $h -lt 21 ]; then
+if [ "$COLORSCHEME" = "light" ]; then
     theme=light
-else
+elif [ "$COLORSCHEME" = "dark" ]; then
     theme=dark
+else 
+    echo $COLORSCHEME
 fi
 
-echo "/home/urbain/.solarized/mutt-colors-solarized/mutt-colors-solarized-"$theme"-16.muttrc"
+echo "/home/urbain/github/mutt-colors-solarized/mutt-colors-solarized-"$theme"-16.muttrc"
diff --git a/mutt/muttrc b/mutt/muttrc
index 23755f1..10b07e1 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -83,14 +83,17 @@ bind   pager   j    next-entry
 bind   pager   k    previous-entry
 bind   pager   R    group-reply
 
+# Source mutt solarized
+source `sh /home/urbain/.mutt/colormutt`
+
 # Colors
-color index brightblue color0 "~f edfenergy"
-color index brightblue color0 "~f terravision"
-color index magenta color0 "~f avaaz"
-color index green color0 "~f vaes"
-color index blue color0 "~f pavliotis"
-color index blue color0 "~f abdulle"
-color index magenta color0 "~f santos"
-color index magenta color0 "~f rusudan"
-color index red color0 "~F"
-color index cyan color0 "~U"
+color index brightblue default "~f edfenergy"
+color index brightblue default "~f terravision"
+color index magenta default "~f avaaz"
+color index green default "~f vaes"
+color index blue default "~f pavliotis"
+color index blue default "~f abdulle"
+color index magenta default "~f santos"
+color index magenta default "~f rusudan"
+color index red default "~F"
+color index cyan default "~U"
diff --git a/vimrc b/vimrc
index e8a6886..a2cf4f2 100644
--- a/vimrc
+++ b/vimrc
@@ -190,6 +190,12 @@ set hidden
 
 " Colorscheme
 silent! colo solarized
+if $COLORSCHEME=="light"
+    set background=light
+elseif $COLORSCHEME=="dark"
+    set background=dark
+endif
+    
 highlight Comment cterm=italic
 set t_ZH=
 set t_ZR=
diff --git a/zshrc b/zshrc
index af6361e..3ad65c8 100644
--- a/zshrc
+++ b/zshrc
@@ -20,6 +20,7 @@ if ! zgen saved; then
 
     # Other plugins
     zgen load rupa/z
+    zgen load djui/alias-tips
     zgen load tarruda/zsh-autosuggestions
     zgen load Tarrasch/zsh-autoenv
     zgen load uvaes/fzf-marks plugin develop
@@ -88,8 +89,6 @@ alias upgrade='sudo apt-get upgrade'
 alias v='vim'
 alias x='sh ~/.xmodmap'
 alias xcape='/home/urbain/xcape/xcape'
-alias light='xrdb ~/.Xresources.light'
-alias dark='xrdb ~/.Xresources.dark'
 
 # Configuration
 alias em="$EDITOR ~/.mutt/muttrc"
@@ -139,7 +138,6 @@ fshow() {
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
-TERM=xterm-256color
 
 if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
     case $(tmux showenv TERM 2>/dev/null) in
@@ -150,3 +148,18 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
             TERM=screen
     esac
 fi
+
+
+# Colors
+export TERM=xterm-256color
+export COLORSCHEME=light
+
+light() {
+    xrdb ~/.Xresources.light
+    export COLORSCHEME=light
+}
+
+dark() {
+    xrdb ~/.Xresources.dark
+    export COLORSCHEME=dark
+}