Add tomorrow theme and improve script

11 files changed, 138 insertions, 19 deletions

diff --git a/Xresources/.Xresources/Tomorrow b/Xresources/.Xresources/Tomorrow
new file mode 100644
index 0000000..680fcc4
--- /dev/null
+++ b/Xresources/.Xresources/Tomorrow
@@ -0,0 +1,23 @@
+# include ".Xresources/base"
+
+URxvt*foreground:   #4d4d4c
+URxvt*background:   #ffffff
+URxvt*borderColor:  #ffffff
+URxvt*cursorColor:  #aeafad
+
+URxvt*color0:       #000000
+URxvt*color8:       #666666
+URxvt*color1:       #c82829
+URxvt*color9:       #FF3334
+URxvt*color2:       #718c00
+URxvt*color10:      #9ec400
+URxvt*color3:       #f5871f
+URxvt*color11:      #eab700
+URxvt*color4:       #4271ae
+URxvt*color12:      #4271ae
+URxvt*color5:       #8959a8
+URxvt*color13:      #b777e0
+URxvt*color6:       #3e999f
+URxvt*color14:      #54ced6
+URxvt*color7:       #d6d6d6
+URxvt*color15:      #efefef
diff --git a/Xresources/.Xresources/Tomorrow-Night b/Xresources/.Xresources/Tomorrow-Night
new file mode 100644
index 0000000..cd6a958
--- /dev/null
+++ b/Xresources/.Xresources/Tomorrow-Night
@@ -0,0 +1,23 @@
+# include ".Xresources/base"
+
+URxvt*foreground:   #c5c8c6
+URxvt*background:   #1d1f21
+URxvt*borderColor:  #1d1f21
+URxvt*cursorColor:  #aeafad
+
+URxvt*color0:       #000000
+URxvt*color8:       #666666
+URxvt*color1:       #cc6666
+URxvt*color9:       #FF3334
+URxvt*color2:       #b5bd68
+URxvt*color10:      #9ec400
+URxvt*color3:       #de935f
+URxvt*color11:      #f0c674
+URxvt*color4:       #81a2be
+URxvt*color12:      #81a2be
+URxvt*color5:       #b294bb
+URxvt*color13:      #b777e0
+URxvt*color6:       #8abeb7
+URxvt*color14:      #54ced6
+URxvt*color7:       #373b41
+URxvt*color15:      #282a2e
diff --git a/Xresources/.Xresources/Tomorrow-Night-Blue b/Xresources/.Xresources/Tomorrow-Night-Blue
new file mode 100644
index 0000000..693ab61
--- /dev/null
+++ b/Xresources/.Xresources/Tomorrow-Night-Blue
@@ -0,0 +1,23 @@
+# include ".Xresources/base"
+
+URxvt*foreground:   #ffffff
+URxvt*background:   #002451
+URxvt*borderColor:  #002451
+URxvt*cursorColor:  #aeafad
+
+URxvt*color0:       #000000
+URxvt*color8:       #666666
+URxvt*color1:       #ff9da4
+URxvt*color9:       #FF3334
+URxvt*color2:       #d1f1a9
+URxvt*color10:      #9ec400
+URxvt*color3:       #ffc58f
+URxvt*color11:      #ffeead
+URxvt*color4:       #bbdaff
+URxvt*color12:      #bbdaff
+URxvt*color5:       #ebbbff
+URxvt*color13:      #b777e0
+URxvt*color6:       #99ffff
+URxvt*color14:      #54ced6
+URxvt*color7:       #003f8e
+URxvt*color15:      #00346e
diff --git a/Xresources/.Xresources/Tomorrow-Night-Bright b/Xresources/.Xresources/Tomorrow-Night-Bright
new file mode 100644
index 0000000..14f57b1
--- /dev/null
+++ b/Xresources/.Xresources/Tomorrow-Night-Bright
@@ -0,0 +1,23 @@
+# include ".Xresources/base"
+
+URxvt*foreground:   #eaeaea
+URxvt*background:   #000000
+URxvt*borderColor:  #000000
+URxvt*cursorColor:  #aeafad
+
+URxvt*color0:       #000000
+URxvt*color8:       #666666
+URxvt*color1:       #d54e53
+URxvt*color9:       #FF3334
+URxvt*color2:       #b9ca4a
+URxvt*color10:      #9ec400
+URxvt*color3:       #e78c45
+URxvt*color11:      #e7c547
+URxvt*color4:       #7aa6da
+URxvt*color12:      #7aa6da
+URxvt*color5:       #c397d8
+URxvt*color13:      #b777e0
+URxvt*color6:       #70c0b1
+URxvt*color14:      #54ced6
+URxvt*color7:       #424242
+URxvt*color15:      #2a2a2a
diff --git a/Xresources/.Xresources/Tomorrow-Night-Eighties b/Xresources/.Xresources/Tomorrow-Night-Eighties
new file mode 100644
index 0000000..0a7dff7
--- /dev/null
+++ b/Xresources/.Xresources/Tomorrow-Night-Eighties
@@ -0,0 +1,23 @@
+# include ".Xresources/base"
+
+URxvt*foreground:   #cccccc
+URxvt*background:   #2d2d2d
+URxvt.borderColor:  #2d2d2d
+URxvt*cursorColor:  #aeafad
+
+URxvt*color0:       #000000
+URxvt*color8:       #666666
+URxvt*color1:       #f2777a
+URxvt*color9:       #FF3334
+URxvt*color2:       #99cc99
+URxvt*color10:      #9ec400
+URxvt*color3:       #f99157
+URxvt*color11:      #ffcc66
+URxvt*color4:       #6699cc
+URxvt*color12:      #6699cc
+URxvt*color5:       #cc99cc
+URxvt*color13:      #b777e0
+URxvt*color6:       #66cccc
+URxvt*color14:      #54ced6
+URxvt*color7:       #515151
+URxvt*color15:      #393939
diff --git a/Xresources/.Xresources/seoul b/Xresources/.Xresources/seoul256
index 8b282e9..8b282e9 100644
--- a/Xresources/.Xresources/seoul
+++ b/Xresources/.Xresources/seoul256
diff --git a/Xresources/.Xresources/dark b/Xresources/.Xresources/solarized-dark
index 1c51f21..1c51f21 100644
--- a/Xresources/.Xresources/dark
+++ b/Xresources/.Xresources/solarized-dark
diff --git a/Xresources/.Xresources/light b/Xresources/.Xresources/solarized-light
index c4b962d..c4b962d 100644
--- a/Xresources/.Xresources/light
+++ b/Xresources/.Xresources/solarized-light
diff --git a/Xresources/.Xresources/transparent b/Xresources/.Xresources/transparent
index b3c2d8e..0791609 100644
--- a/Xresources/.Xresources/transparent
+++ b/Xresources/.Xresources/transparent
@@ -1,4 +1,4 @@
-# include "dark"
+# include "solarized-dark"
 
 ! True transparency
 URxvt.transparent: true
diff --git a/vim/.vimrc b/vim/.vimrc
index 0132d45..d084e70 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -130,6 +130,7 @@ Plug 'troydm/zoomwintab.vim'
 Plug 'vim-scripts/gmsh.vim'
 Plug 'holomorph/vim-freefem'
 Plug 'nanotech/jellybeans.vim'
+Plug 'chriskempson/vim-tomorrow-theme'
 
 if has("nvim")
     Plug 'benekastah/neomake'
@@ -231,19 +232,11 @@ au BufNewFile,BufRead *.edp comp freefem
 au BufNewFile,BufRead *.geo setf gmsh
 
 " Colorscheme
-if $COLORSCHEME=="light"
-    silent! colo solarized
-    set background=light
-elseif $COLORSCHEME=="dark"
-    silent! colo solarized
-    set background=dark
-elseif $COLORSCHEME=="seoul"
-    silent! colo seoul256
-elseif $COLORSCHEME=="molokai"
-    silent! colo molokai
-else
-    silent! colo solarized
+silent! colo $COLORSCHEME
+if $BACKGROUND=="dark"
     set background=dark
+elseif $BACKGROUND=="light"
+    set background=light
 endif
 
 highlight Comment cterm=italic
diff --git a/zsh/.zsh/functions b/zsh/.zsh/functions
index 7c2b49a..07fca73 100644
--- a/zsh/.zsh/functions
+++ b/zsh/.zsh/functions
@@ -2,15 +2,26 @@
 
 function colo {
 
+    # Change environment variable
+    export COLORSCHEME=$1
+    export BACKGROUND=$2
+
+    if [[ -z ${BACKGROUND} ]]; then
+        XRESOURCE=~/.Xresources/${COLORSCHEME}
+    else
+        XRESOURCE=~/.Xresources/${COLORSCHEME}-${BACKGROUND}
+    fi
+
     # Change colors for current session
-    $HOME/bin/recolor < ~/.Xresources/$1
+    $HOME/bin/recolor < ${XRESOURCE}
 
     # Load Xresources file for future sessions
-    xrdb -I$HOME ~/.Xresources/$1
-
-    # Change environment variable
-    export COLORSCHEME=$1
+    xrdb -I$HOME ${XRESOURCE}
 
     # Change default environment variable for future sessions
-    sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/.zsh/tmp
+    sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=${COLORSCHEME}/g" ~/.zsh/tmp
+    sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export BACKGROUND=${BACKGROUND}/g" ~/.zsh/tmp
 }
+
+# Completion for colorschemes
+compctl -k "($(ls ${HOME}/.Xresources))" colo