From d38e4cd7f26003709cbcba749aa818e7f044ce04 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 30 Oct 2014 23:29:04 +0100 Subject: [PATCH] fix solarized theme with base16's version --- .gitmodules | 3 + Xresources | 167 ++++++++++++++++++++++++++++++--------------------- base16-shell | 1 + vimrc | 7 ++- zshenv | 4 ++ 5 files changed, 111 insertions(+), 71 deletions(-) create mode 160000 base16-shell diff --git a/.gitmodules b/.gitmodules index cf92bea..2d0def5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "oh-my-zsh"] path = oh-my-zsh url = git@github.com:robbyrussell/oh-my-zsh.git +[submodule "base16-shell"] + path = base16-shell + url = git@github.com:chriskempson/base16-shell.git diff --git a/Xresources b/Xresources index 0356d19..83560e4 100644 --- a/Xresources +++ b/Xresources @@ -62,73 +62,104 @@ URxvt.saveLines: 65536 ! + : current screen and scrollbackbuffer URxvt.print-pipe: cat > $(echo /tmp/urxvt.dump.$(date +'%Y-%m-%d--%H:%M:%S')) -! Solarized color scheme for the X Window System +! Base16 Solarized Dark +! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) + +#define base00 #002b36 +#define base01 #073642 +#define base02 #586e75 +#define base03 #657b83 +#define base04 #839496 +#define base05 #93a1a1 +#define base06 #eee8d5 +#define base07 #fdf6e3 +#define base08 #dc322f +#define base09 #cb4b16 +#define base0A #b58900 +#define base0B #859900 +#define base0C #2aa198 +#define base0D #268bd2 +#define base0E #6c71c4 +#define base0F #d33682 + +*.foreground: base05 +*.background: base00 +*.cursorColor: base05 + +*.color0: base00 +*.color1: base08 +*.color2: base0B +*.color3: base0A +*.color4: base0D +*.color5: base0E +*.color6: base0C +*.color7: base05 + +*.color8: base03 +*.color9: base08 +*.color10: base0B +*.color11: base0A +*.color12: base0D +*.color13: base0E +*.color14: base0C +*.color15: base07 + +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +*.color16: base09 +*.color17: base0F +*.color18: base01 +*.color19: base02 +*.color20: base04 +*.color21: base06 + +! Base16 Solarized +! Scheme: Ethan Schoonover (http://ethanschoonover.com/solarized) ! -! http://ethanschoonover.com/solarized - - -! Common - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - - -! Dark - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: +!#define base00 #002b36 +!#define base01 #073642 +!#define base02 #586e75 +!#define base03 #657b83 +!#define base04 #839496 +!#define base05 #93a1a1 +!#define base06 #eee8d5 +!#define base07 #fdf6e3 +!#define base08 #dc322f +!#define base09 #cb4b16 +!#define base0A #b58900 +!#define base0B #859900 +!#define base0C #2aa198 +!#define base0D #268bd2 +!#define base0E #6c71c4 +!#define base0F #d33682 ! -! URxvt*background: S_base03 - -*background: S_base03 -*foreground: S_base0 -*fading: 40 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground: S_base01 -*pointerColorForeground: S_base1 - -*color0: S_base02 -*color1: S_red -*color2: S_green -*color3: S_yellow -*color4: S_blue -*color5: S_magenta -*color6: S_cyan -*color7: S_base2 -*color9: S_orange -*color8: S_base03 -*color10: S_base01 -*color11: S_base00 -*color12: S_base0 -*color13: S_violet -*color14: S_base1 -*color15: S_base3 +!*.foreground: base02 +!*.background: base07 +!*.cursorColor: base02 +! +!*.color0: base00 +!*.color1: base08 +!*.color2: base0B +!*.color3: base0A +!*.color4: base0D +!*.color5: base0E +!*.color6: base0C +!*.color7: base05 +! +!*.color8: base03 +!*.color9: base08 +!*.color10: base0B +!*.color11: base0A +!*.color12: base0D +!*.color13: base0E +!*.color14: base0C +!*.color15: base07 +! +! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), +! use 'shell' template to set these if necessary +!*.color16: base09 +!*.color17: base0F +!*.color18: base01 +!*.color19: base02 +!*.color20: base04 +!*.color21: base06 diff --git a/base16-shell b/base16-shell new file mode 160000 index 0000000..8eabd0f --- /dev/null +++ b/base16-shell @@ -0,0 +1 @@ +Subproject commit 8eabd0f4aa034e3578436249db26a57a9c6815eb diff --git a/vimrc b/vimrc index 2bb48d4..ecd69e3 100644 --- a/vimrc +++ b/vimrc @@ -38,7 +38,7 @@ Plugin 'airblade/vim-gitgutter' Plugin 'mileszs/ack.vim' Plugin 'vim-airline', {'name': 'airline'} -Plugin 'altercation/vim-colors-solarized' +Plugin 'chriskempson/base16-vim' Plugin 'scrooloose/syntastic.git' Plugin 'Townk/vim-autoclose' @@ -119,7 +119,8 @@ set cursorline syntax enable set background=dark -colorscheme solarized +let base16colorspace=256 +colorscheme base16-solarized set scrolloff=3 @@ -234,7 +235,7 @@ let g:syntastic_javascript_checkers = ['jscs','jshint'] let g:syntastic_check_on_open = 1 "" ariline -let g:airline_theme = 'solarized' +let g:airline_theme = 'powerlineish' let g:airline_enable_syntastic = 1 let g:airline#extensions#tabline#enabled = 1 diff --git a/zshenv b/zshenv index 3516cd9..1d6c976 100644 --- a/zshenv +++ b/zshenv @@ -15,3 +15,7 @@ export NVM_DIR="$HOME/.nvm" # todo.sh alias t=todo.sh +# Base16 Shell +BASE16_SCHEME="solarized" +BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh" +[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL