From 750e9a5d58c2719a87f931eb5bcc505d382cb6c7 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 21 Apr 2016 14:21:38 +0100 Subject: Add tomorrow theme and improve script --- Xresources/.Xresources/Tomorrow | 23 ++++++++++++++++++++ Xresources/.Xresources/Tomorrow-Night | 23 ++++++++++++++++++++ Xresources/.Xresources/Tomorrow-Night-Blue | 23 ++++++++++++++++++++ Xresources/.Xresources/Tomorrow-Night-Bright | 23 ++++++++++++++++++++ Xresources/.Xresources/Tomorrow-Night-Eighties | 23 ++++++++++++++++++++ Xresources/.Xresources/dark | 28 ------------------------- Xresources/.Xresources/light | 28 ------------------------- Xresources/.Xresources/seoul | 29 -------------------------- Xresources/.Xresources/seoul256 | 29 ++++++++++++++++++++++++++ Xresources/.Xresources/solarized-dark | 28 +++++++++++++++++++++++++ Xresources/.Xresources/solarized-light | 28 +++++++++++++++++++++++++ Xresources/.Xresources/transparent | 2 +- vim/.vimrc | 17 +++++---------- zsh/.zsh/functions | 23 ++++++++++++++------ 14 files changed, 223 insertions(+), 104 deletions(-) create mode 100644 Xresources/.Xresources/Tomorrow create mode 100644 Xresources/.Xresources/Tomorrow-Night create mode 100644 Xresources/.Xresources/Tomorrow-Night-Blue create mode 100644 Xresources/.Xresources/Tomorrow-Night-Bright create mode 100644 Xresources/.Xresources/Tomorrow-Night-Eighties delete mode 100644 Xresources/.Xresources/dark delete mode 100644 Xresources/.Xresources/light delete mode 100644 Xresources/.Xresources/seoul create mode 100644 Xresources/.Xresources/seoul256 create mode 100644 Xresources/.Xresources/solarized-dark create mode 100644 Xresources/.Xresources/solarized-light 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/dark b/Xresources/.Xresources/dark deleted file mode 100644 index 1c51f21..0000000 --- a/Xresources/.Xresources/dark +++ /dev/null @@ -1,28 +0,0 @@ -# include ".Xresources/base" - -URxvt.borderColor: #002b36 - -*background: #002b36 -*foreground: #839496 -*fadeColor: #002b36 -*cursorColor: #93a1a1 - -*pointerColorBackground: #586e75 -*pointerColorForeground: #93a1a1 - -*color0: #073642 -*color8: #002b36 -*color1: #dc322f -*color9: #cb4b16 -*color2: #859900 -*color10: #586e75 -*color3: #b58900 -*color11: #657b83 -*color4: #268bd2 -*color12: #839496 -*color5: #d33682 -*color13: #6c71c4 -*color6: #2aa198 -*color14: #93a1a1 -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources/.Xresources/light b/Xresources/.Xresources/light deleted file mode 100644 index c4b962d..0000000 --- a/Xresources/.Xresources/light +++ /dev/null @@ -1,28 +0,0 @@ -# include ".Xresources/base" - -URxvt.borderColor: #fdf6e3 - -*background: #fdf6e3 -*foreground: #657b83 -*fadeColor: #fdf6e3 -*cursorColor: #586e75 - -*pointerColorBackground: #93a1a1 -*pointerColorForeground: #586e75 - -*color0: #073642 -*color8: #002b36 -*color1: #dc322f -*color9: #cb4b16 -*color2: #859900 -*color10: #586e75 -*color3: #b58900 -*color11: #657b83 -*color4: #268bd2 -*color12: #839496 -*color5: #d33682 -*color13: #6c71c4 -*color6: #2aa198 -*color14: #93a1a1 -*color7: #eee8d5 -*color15: #fdf6e3 diff --git a/Xresources/.Xresources/seoul b/Xresources/.Xresources/seoul deleted file mode 100644 index 8b282e9..0000000 --- a/Xresources/.Xresources/seoul +++ /dev/null @@ -1,29 +0,0 @@ -# include ".Xresources/base" - -! Border color -URxvt.borderColor: #3a3a3a - -! Background / Foreground -URxvt*background: #3a3a3a -URxvt*foreground: #d0d0d0 - -! Other colors -URxvt*color0: #4e4e4e -URxvt*color1: #d68787 -URxvt*color2: #5f865f -URxvt*color3: #d8af5f -URxvt*color4: #85add4 -URxvt*color5: #d7afaf -URxvt*color6: #87afaf -URxvt*color7: #d0d0d0 -URxvt*color8: #626262 -URxvt*color9: #d75f87 -URxvt*color10: #87af87 -URxvt*color11: #ffd787 -URxvt*color12: #add4fb -URxvt*color13: #ffafaf -URxvt*color14: #87d7d7 -URxvt*color15: #e4e4e4 -URxvt*cursorColor: #d0d0d0 -URxvt*cursorColor2: #3a3a3a -URxvt*colorBD: #e4e4e4 diff --git a/Xresources/.Xresources/seoul256 b/Xresources/.Xresources/seoul256 new file mode 100644 index 0000000..8b282e9 --- /dev/null +++ b/Xresources/.Xresources/seoul256 @@ -0,0 +1,29 @@ +# include ".Xresources/base" + +! Border color +URxvt.borderColor: #3a3a3a + +! Background / Foreground +URxvt*background: #3a3a3a +URxvt*foreground: #d0d0d0 + +! Other colors +URxvt*color0: #4e4e4e +URxvt*color1: #d68787 +URxvt*color2: #5f865f +URxvt*color3: #d8af5f +URxvt*color4: #85add4 +URxvt*color5: #d7afaf +URxvt*color6: #87afaf +URxvt*color7: #d0d0d0 +URxvt*color8: #626262 +URxvt*color9: #d75f87 +URxvt*color10: #87af87 +URxvt*color11: #ffd787 +URxvt*color12: #add4fb +URxvt*color13: #ffafaf +URxvt*color14: #87d7d7 +URxvt*color15: #e4e4e4 +URxvt*cursorColor: #d0d0d0 +URxvt*cursorColor2: #3a3a3a +URxvt*colorBD: #e4e4e4 diff --git a/Xresources/.Xresources/solarized-dark b/Xresources/.Xresources/solarized-dark new file mode 100644 index 0000000..1c51f21 --- /dev/null +++ b/Xresources/.Xresources/solarized-dark @@ -0,0 +1,28 @@ +# include ".Xresources/base" + +URxvt.borderColor: #002b36 + +*background: #002b36 +*foreground: #839496 +*fadeColor: #002b36 +*cursorColor: #93a1a1 + +*pointerColorBackground: #586e75 +*pointerColorForeground: #93a1a1 + +*color0: #073642 +*color8: #002b36 +*color1: #dc322f +*color9: #cb4b16 +*color2: #859900 +*color10: #586e75 +*color3: #b58900 +*color11: #657b83 +*color4: #268bd2 +*color12: #839496 +*color5: #d33682 +*color13: #6c71c4 +*color6: #2aa198 +*color14: #93a1a1 +*color7: #eee8d5 +*color15: #fdf6e3 diff --git a/Xresources/.Xresources/solarized-light b/Xresources/.Xresources/solarized-light new file mode 100644 index 0000000..c4b962d --- /dev/null +++ b/Xresources/.Xresources/solarized-light @@ -0,0 +1,28 @@ +# include ".Xresources/base" + +URxvt.borderColor: #fdf6e3 + +*background: #fdf6e3 +*foreground: #657b83 +*fadeColor: #fdf6e3 +*cursorColor: #586e75 + +*pointerColorBackground: #93a1a1 +*pointerColorForeground: #586e75 + +*color0: #073642 +*color8: #002b36 +*color1: #dc322f +*color9: #cb4b16 +*color2: #859900 +*color10: #586e75 +*color3: #b58900 +*color11: #657b83 +*color4: #268bd2 +*color12: #839496 +*color5: #d33682 +*color13: #6c71c4 +*color6: #2aa198 +*color14: #93a1a1 +*color7: #eee8d5 +*color15: #fdf6e3 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 -- cgit v1.2.3