From afed3d84c4fe13923dba3b7d4fa6fd93c3f302ed Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Sat, 2 Feb 2019 12:12:35 -0600 Subject: [PATCH] Pro-gress --- de/gtk/3settings.ini | 4 +-- de/x/resources | 2 +- scripts/colors/generator/gen.bash | 2 +- scripts/colors/set-theme.bash | 13 ++++++++ scripts/colors/shell | 52 +++++++++++++++---------------- scripts/colors/vconsole | 22 ++++++------- scripts/colors/vim | 36 ++++++++++----------- scripts/colors/xresources | 32 +++++++++---------- 8 files changed, 88 insertions(+), 75 deletions(-) create mode 100755 scripts/colors/set-theme.bash diff --git a/de/gtk/3settings.ini b/de/gtk/3settings.ini index f28fbfc..010c652 100644 --- a/de/gtk/3settings.ini +++ b/de/gtk/3settings.ini @@ -1,5 +1,5 @@ [Settings] gtk-icon-theme-name = elementary -gtk-theme-name = Arc-Light +gtk-theme-name = Arc-Dark gtk-font-name = Iosevka 9 -gtk-application-prefer-dark-theme = false +gtk-application-prefer-dark-theme = true diff --git a/de/x/resources b/de/x/resources index 61c0d21..6f91fcd 100755 --- a/de/x/resources +++ b/de/x/resources @@ -30,7 +30,7 @@ URxvt*utf8: 1 URxvt*scaleHeight: 1 URxvt*depth: 32 URxvt*internalBorder: 24 -URxvt*perl-ext-common: default,matcher,resize-font +URxvt*perl-ext-common: default,matcher,resize-font,config-reload URxvt*keysym.M-Escape: perl:keyboard-select:activate URxvt*resize-font.smaller: C-Down URxvt*resize-font.bigger: C-Up diff --git a/scripts/colors/generator/gen.bash b/scripts/colors/generator/gen.bash index 05290f6..df3acf4 100755 --- a/scripts/colors/generator/gen.bash +++ b/scripts/colors/generator/gen.bash @@ -3,7 +3,7 @@ SCHEME="donokai" TYPE="dark" -v=$(ruby --version) +# v=$(ruby --version) if [[ $? -eq 0 ]]; then if [[ -n $1 ]]; then SCHEME=$1; fi diff --git a/scripts/colors/set-theme.bash b/scripts/colors/set-theme.bash new file mode 100755 index 0000000..3d5b685 --- /dev/null +++ b/scripts/colors/set-theme.bash @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd) + +THEME="$1" + +echo "$THEME" + +"$DIR/generator/gen.bash" "$THEME" +"$DOTFILES_PATH/de/x/loadresources" +resrc +restartbar +# TODO: set GTK theme to "Arc-Dark" or "Arc-Light" diff --git a/scripts/colors/shell b/scripts/colors/shell index 036af7a..ebeb6fc 100755 --- a/scripts/colors/shell +++ b/scripts/colors/shell @@ -1,5 +1,5 @@ #!/bin/sh -# Base16 Holodized - Shell color setup script +# Base16 Donokai - Shell color setup script # Daniel Flanagan(https://lytedev.io) if [ "${TERM%%-*}" = 'linux' ]; then @@ -7,31 +7,31 @@ if [ "${TERM%%-*}" = 'linux' ]; then return 2>/dev/null || exit 0 fi -color00="fd/f6/e3" # Base 00 - Black -color01="99/08/33" # Base 08 - Red -color02="06/62/3e" # Base 0B - Green -color03="94/70/10" # Base 0A - Yellow -color04="00/44/88" # Base 0D - Blue -color05="4e/11/7f" # Base 0E - Magenta -color06="00/66/77" # Base 0C - Cyan -color07="11/11/11" # Base 05 - White -color08="8d/86/73" # Base 03 - Bright Black +color00="11/11/11" # Base 00 - Black +color01="f9/26/72" # Base 08 - Red +color02="a6/e2/2e" # Base 0B - Green +color03="f4/bf/75" # Base 0A - Yellow +color04="66/d9/ef" # Base 0D - Blue +color05="ae/81/ff" # Base 0E - Magenta +color06="a1/ef/e4" # Base 0C - Cyan +color07="f8/f8/f2" # Base 05 - White +color08="75/71/5e" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="55/55/55" # Base 07 - Bright White +color15="f9/f8/f5" # Base 07 - Bright White color16="fd/97/1f" # Base 09 -color17="88/33/11" # Base 0F -color18="dd/d6/c3" # Base 01 -color19="ad/a6/93" # Base 02 -color20="55/4f/45" # Base 04 -color21="33/33/33" # Base 06 -color_foreground="11/11/11" # Base 05 -color_background="fd/f6/e3" # Base 00 -color_cursor="11/11/11" # Base 05 +color17="cc/66/33" # Base 0F +color18="38/38/30" # Base 01 +color19="49/48/3e" # Base 02 +color20="a5/9f/85" # Base 04 +color21="f5/f4/f1" # Base 06 +color_foreground="f8/f8/f2" # Base 05 +color_background="11/11/11" # Base 00 +color_cursor="f8/f8/f2" # Base 05 if [ -n "$TMUX" ]; then # tell tmux to pass the escape sequences through @@ -82,13 +82,13 @@ printf $printf_template 21 $color21 # foreground / background / cursor color if [ -n "$ITERM_SESSION_ID" ]; then # iTerm2 proprietary escape codes - printf $printf_template_custom Pg 111111 # forground - printf $printf_template_custom Ph fdf6e3 # background - printf $printf_template_custom Pi 111111 # bold color - printf $printf_template_custom Pj ada693 # selection color - printf $printf_template_custom Pk 111111 # selected text color - printf $printf_template_custom Pl 111111 # cursor - printf $printf_template_custom Pm fdf6e3 # cursor text + printf $printf_template_custom Pg f8f8f2 # forground + printf $printf_template_custom Ph 111111 # background + printf $printf_template_custom Pi f8f8f2 # bold color + printf $printf_template_custom Pj 49483e # selection color + printf $printf_template_custom Pk f8f8f2 # selected text color + printf $printf_template_custom Pl f8f8f2 # cursor + printf $printf_template_custom Pm 111111 # cursor text else printf $printf_template_var 10 $color_foreground printf $printf_template_var 11 $color_background diff --git a/scripts/colors/vconsole b/scripts/colors/vconsole index 6bbdeec..f742227 100755 --- a/scripts/colors/vconsole +++ b/scripts/colors/vconsole @@ -1,23 +1,23 @@ #!/bin/sh -# Base16 Holodized - Virtual console color setup script +# Base16 Donokai - Virtual console color setup script # Daniel Flanagan(https://lytedev.io) -color00="fdf6e3" # Base 00 - Black -color01="990833" # Base 08 - Red -color02="06623e" # Base 0B - Green -color03="947010" # Base 0A - Yellow -color04="004488" # Base 0D - Blue -color05="4e117f" # Base 0E - Magenta -color06="006677" # Base 0C - Cyan -color07="111111" # Base 05 - White -color08="8d8673" # Base 03 - Bright Black +color00="111111" # Base 00 - Black +color01="f92672" # Base 08 - Red +color02="a6e22e" # Base 0B - Green +color03="f4bf75" # Base 0A - Yellow +color04="66d9ef" # Base 0D - Blue +color05="ae81ff" # Base 0E - Magenta +color06="a1efe4" # Base 0C - Cyan +color07="f8f8f2" # Base 05 - White +color08="75715e" # Base 03 - Bright Black color09=$color01 # Base 08 - Bright Red color10=$color02 # Base 0B - Bright Green color11=$color03 # Base 0A - Bright Yellow color12=$color04 # Base 0D - Bright Blue color13=$color05 # Base 0E - Bright Magenta color14=$color06 # Base 0C - Bright Cyan -color15="555555" # Base 07 - Bright White +color15="f9f8f5" # Base 07 - Bright White # 16 color space echo -e "\e]P0$color00" diff --git a/scripts/colors/vim b/scripts/colors/vim index de0bef2..7fbf468 100644 --- a/scripts/colors/vim +++ b/scripts/colors/vim @@ -1,4 +1,4 @@ -" Base16 Holodized (https://github.com/chriskempson/base16) +" Base16 Donokai (https://github.com/chriskempson/base16) " Scheme: Daniel Flanagan(https://lytedev.io) " This enables the coresponding base16-shell script to run so that @@ -7,27 +7,27 @@ " let g:base16_shell_path=base16-builder/output/shell/ if !has('gui_running') if exists("g:base16_shell_path") - execute "silent !/bin/sh ".g:base16_shell_path."/base16-holodized.".&background.".sh" + execute "silent !/bin/sh ".g:base16_shell_path."/base16-donokai.".&background.".sh" endif endif " GUI color definitions -let s:gui00 = "fdf6e3" -let s:gui01 = "ddd6c3" -let s:gui02 = "ada693" -let s:gui03 = "8d8673" -let s:gui04 = "554f45" -let s:gui05 = "111111" -let s:gui06 = "333333" -let s:gui07 = "555555" -let s:gui08 = "990833" +let s:gui00 = "111111" +let s:gui01 = "383830" +let s:gui02 = "49483e" +let s:gui03 = "75715e" +let s:gui04 = "a59f85" +let s:gui05 = "f8f8f2" +let s:gui06 = "f5f4f1" +let s:gui07 = "f9f8f5" +let s:gui08 = "f92672" let s:gui09 = "fd971f" -let s:gui0A = "947010" -let s:gui0B = "06623e" -let s:gui0C = "006677" -let s:gui0D = "004488" -let s:gui0E = "4e117f" -let s:gui0F = "883311" +let s:gui0A = "f4bf75" +let s:gui0B = "a6e22e" +let s:gui0C = "a1efe4" +let s:gui0D = "66d9ef" +let s:gui0E = "ae81ff" +let s:gui0F = "cc6633" " Terminal color definitions let s:cterm00 = "00" @@ -59,7 +59,7 @@ endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-holodized" +let g:colors_name = "base16-donokai" " Highlighting function fun hi(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) diff --git a/scripts/colors/xresources b/scripts/colors/xresources index 7eddade..45d6593 100644 --- a/scripts/colors/xresources +++ b/scripts/colors/xresources @@ -1,22 +1,22 @@ -! Base16 Holodized +! Base16 Donokai ! Scheme: Daniel Flanagan(https://lytedev.io) -#define base00 #fdf6e3 -#define base01 #ddd6c3 -#define base02 #ada693 -#define base03 #8d8673 -#define base04 #554f45 -#define base05 #111111 -#define base06 #333333 -#define base07 #555555 -#define base08 #990833 +#define base00 #111111 +#define base01 #383830 +#define base02 #49483e +#define base03 #75715e +#define base04 #a59f85 +#define base05 #f8f8f2 +#define base06 #f5f4f1 +#define base07 #f9f8f5 +#define base08 #f92672 #define base09 #fd971f -#define base0A #947010 -#define base0B #06623e -#define base0C #006677 -#define base0D #004488 -#define base0E #4e117f -#define base0F #883311 +#define base0A #f4bf75 +#define base0B #a6e22e +#define base0C #a1efe4 +#define base0D #66d9ef +#define base0E #ae81ff +#define base0F #cc6633 *foreground: base05 *background: base00