From ed5e5150d68c60481da7b73d035162ddce988b58 Mon Sep 17 00:00:00 2001 From: Trysdyn Black Date: Sun, 4 Apr 2021 00:09:46 -0700 Subject: [PATCH] Push base16 theme changes - Switch to a base16 builder wrapper I wrote myself - Switch small details on a bunch of templates - Switch to a QVP based color scheme I wrote myself This should form the most rational default for colors going forward. --- .Xresources | 33 +++--- .config/i3/config | 35 +++--- .config/kitty/kitty.conf | 66 ++++++------ .config/qutebrowser/config.py | 34 +++--- .config/rofi/base16.rasi | 40 +++---- .tmux.conf | 24 ++--- .vim/autoload/airline/themes/base16.vim | 36 +++---- .vim/colors/base16.vim | 138 +++++++++++------------- 8 files changed, 180 insertions(+), 226 deletions(-) diff --git a/.Xresources b/.Xresources index 662374f..09e9ea9 100644 --- a/.Xresources +++ b/.Xresources @@ -1,23 +1,20 @@ ! %%base16_template: xresources##default %% -! Base16 IR Black - Trysdyn Edit -! Scheme: Trysdyn - #define base00 #000000 -#define base01 #242422 -#define base02 #401040 -#define base03 #6c6c66 -#define base04 #918f88 -#define base05 #b5b3aa -#define base06 #d9d7cc -#define base07 #fdfbee -#define base08 #ff6c60 -#define base09 #e9c062 -#define base0A #ffffb6 -#define base0B #a8ff60 -#define base0C #c6c5fe -#define base0D #96cbfe -#define base0E #ff73fd -#define base0F #b18a3d +#define base01 #202020 +#define base02 #311647 +#define base03 #606060 +#define base04 #b0b0b0 +#define base05 #f0f0f0 +#define base06 #c0c0c0 +#define base07 #ffffff +#define base08 #ed008c +#define base09 #f7941d +#define base0A #f7c61d +#define base0B #8dc73f +#define base0C #65cdcd +#define base0D #3f7fff +#define base0E #9f4fdf +#define base0F #a16946 *foreground: base05 #ifdef background_opacity diff --git a/.config/i3/config b/.config/i3/config index 1611c08..1eafea0 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -1,26 +1,21 @@ # base16 color scheme # %%base16_template: i3##colors %% -## Base16 IR Black - Trysdyn Edit -# Author: Trysdyn -# -# You can use these variables anywhere in the i3 configuration file. - set $base00 #000000 -set $base01 #242422 -set $base02 #401040 -set $base03 #6c6c66 -set $base04 #918f88 -set $base05 #b5b3aa -set $base06 #d9d7cc -set $base07 #fdfbee -set $base08 #ff6c60 -set $base09 #e9c062 -set $base0A #ffffb6 -set $base0B #a8ff60 -set $base0C #c6c5fe -set $base0D #96cbfe -set $base0E #ff73fd -set $base0F #b18a3d +set $base01 #202020 +set $base02 #311647 +set $base03 #606060 +set $base04 #b0b0b0 +set $base05 #f0f0f0 +set $base06 #c0c0c0 +set $base07 #ffffff +set $base08 #ed008c +set $base09 #f7941d +set $base0A #f7c61d +set $base0B #8dc73f +set $base0C #65cdcd +set $base0D #3f7fff +set $base0E #9f4fdf +set $base0F #a16946 # %%base16_template_end%% diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 4f6bcfb..384c2b7 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -32,48 +32,46 @@ map kitty_mod+u input_unicode_character map kitty_mod+f2 edit_config_file # %%base16_template: kitty##default-256 %% -# Base16 IR Black - Trysdyn Edit - kitty color config -# Scheme by Trysdyn background #000000 -foreground #b5b3aa -selection_background #b5b3aa -selection_foreground #000000 -url_color #918f88 -cursor #b5b3aa -active_border_color #6c6c66 -inactive_border_color #242422 +foreground #f0f0f0 +selection_background #311647 +selection_foreground #f0f0f0 +url_color #b0b0b0 +cursor #f0f0f0 +active_border_color #606060 +inactive_border_color #202020 active_tab_background #000000 -active_tab_foreground #b5b3aa -inactive_tab_background #242422 -inactive_tab_foreground #918f88 -tab_bar_background #242422 +active_tab_foreground #f0f0f0 +inactive_tab_background #202020 +inactive_tab_foreground #b0b0b0 +tab_bar_background #202020 # normal color0 #000000 -color1 #ff6c60 -color2 #a8ff60 -color3 #ffffb6 -color4 #96cbfe -color5 #ff73fd -color6 #c6c5fe -color7 #b5b3aa +color1 #ed008c +color2 #8dc73f +color3 #f7c61d +color4 #3f7fff +color5 #9f4fdf +color6 #65cdcd +color7 #f0f0f0 # bright -color8 #6c6c66 -color9 #ff6c60 -color10 #a8ff60 -color11 #ffffb6 -color12 #96cbfe -color13 #ff73fd -color14 #c6c5fe -color15 #fdfbee +color8 #606060 +color9 #ed008c +color10 #8dc73f +color11 #f7c61d +color12 #3f7fff +color13 #9f4fdf +color14 #65cdcd +color15 #ffffff # extended base16 colors -color16 #e9c062 -color17 #b18a3d -color18 #242422 -color19 #401040 -color20 #918f88 -color21 #d9d7cc +color16 #f7941d +color17 #a16946 +color18 #202020 +color19 #311647 +color20 #b0b0b0 +color21 #c0c0c0 # %%base16_template_end%% diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 136d2f1..1721992 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -1,24 +1,20 @@ # %%base16_template: qutebrowser##default %% -# base16-qutebrowser (https://github.com/theova/base16-qutebrowser) -# Base16 qutebrowser template by theova -# IR Black - Trysdyn Edit scheme by Trysdyn - base00 = "#000000" -base01 = "#242422" -base02 = "#401040" -base03 = "#6c6c66" -base04 = "#918f88" -base05 = "#b5b3aa" -base06 = "#d9d7cc" -base07 = "#fdfbee" -base08 = "#ff6c60" -base09 = "#e9c062" -base0A = "#ffffb6" -base0B = "#a8ff60" -base0C = "#c6c5fe" -base0D = "#96cbfe" -base0E = "#ff73fd" -base0F = "#b18a3d" +base01 = "#202020" +base02 = "#311647" +base03 = "#606060" +base04 = "#b0b0b0" +base05 = "#f0f0f0" +base06 = "#c0c0c0" +base07 = "#ffffff" +base08 = "#ed008c" +base09 = "#f7941d" +base0A = "#f7c61d" +base0B = "#8dc73f" +base0C = "#65cdcd" +base0D = "#3f7fff" +base0E = "#9f4fdf" +base0F = "#a16946" # set qutebrowser colors diff --git a/.config/rofi/base16.rasi b/.config/rofi/base16.rasi index 737045f..db87129 100644 --- a/.config/rofi/base16.rasi +++ b/.config/rofi/base16.rasi @@ -1,29 +1,21 @@ -// %%base16_template: rofi-trysdyn##colors %% -/** - * Base16 IR Black - Trysdyn Edit ROFI Color theme - * - * Authors - * Scheme: Trysdyn - * Template: Jordi Pakey-Rodriguez (https://github.com/0xdec), Andrea Scarpino (https://github.com/ilpianista) - */ - +// %%base16_template: rofi##colors %% * { base00: rgba ( 0, 0, 0, 100 % ); - base01: rgba ( 36, 36, 34, 100 % ); - base02: rgba ( 64, 16, 64, 100 % ); - base03: rgba ( 108, 108, 102, 100 % ); - base04: rgba ( 145, 143, 136, 100 % ); - base05: rgba ( 181, 179, 170, 100 % ); - base06: rgba ( 217, 215, 204, 100 % ); - base07: rgba ( 253, 251, 238, 100 % ); - base08: rgba ( 255, 108, 96, 100 % ); - base09: rgba ( 233, 192, 98, 100 % ); - base0A: rgba ( 255, 255, 182, 100 % ); - base0B: rgba ( 168, 255, 96, 100 % ); - base0C: rgba ( 198, 197, 254, 100 % ); - base0D: rgba ( 150, 203, 254, 100 % ); - base0E: rgba ( 255, 115, 253, 100 % ); - base0F: rgba ( 177, 138, 61, 100 % ); + base01: rgba ( 32, 32, 32, 100 % ); + base02: rgba ( 49, 22, 71, 100 % ); + base03: rgba ( 96, 96, 96, 100 % ); + base04: rgba ( 176, 176, 176, 100 % ); + base05: rgba ( 240, 240, 240, 100 % ); + base06: rgba ( 192, 192, 192, 100 % ); + base07: rgba ( 255, 255, 255, 100 % ); + base08: rgba ( 237, 0, 140, 100 % ); + base09: rgba ( 247, 148, 29, 100 % ); + base0A: rgba ( 247, 198, 29, 100 % ); + base0B: rgba ( 141, 199, 63, 100 % ); + base0C: rgba ( 101, 205, 205, 100 % ); + base0D: rgba ( 63, 127, 255, 100 % ); + base0E: rgba ( 159, 79, 223, 100 % ); + base0F: rgba ( 161, 105, 70, 100 % ); } // %%base16_template_end%% diff --git a/.tmux.conf b/.tmux.conf index 0b47021..b12fc3d 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -10,35 +10,33 @@ set-option -ga terminal-overrides ",xterm-256color:Tc" # %%base16_template: tmux##default %% -# COLOUR (base16) - # default statusbar colors -set-option -g status-style "fg=#918f88,bg=#242422" +set-option -g status-style "fg=#b0b0b0,bg=#202020" # default window title colors -set-window-option -g window-status-style "fg=#918f88,bg=default" +set-window-option -g window-status-style "fg=#b0b0b0,bg=default" # active window title colors -set-window-option -g window-status-current-style "fg=#ffffb6,bg=default" +set-window-option -g window-status-current-style "fg=#f7c61d,bg=default" # pane border -set-option -g pane-border-style "fg=#242422" -set-option -g pane-active-border-style "fg=#401040" +set-option -g pane-border-style "fg=#202020" +set-option -g pane-active-border-style "fg=#311647" # message text -set-option -g message-style "fg=#b5b3aa,bg=#242422" +set-option -g message-style "fg=#f0f0f0,bg=#202020" # pane number display -set-option -g display-panes-active-colour "#a8ff60" -set-option -g display-panes-colour "#ffffb6" +set-option -g display-panes-active-colour "#8dc73f" +set-option -g display-panes-colour "#f7c61d" # clock -set-window-option -g clock-mode-colour "#a8ff60" +set-window-option -g clock-mode-colour "#8dc73f" # copy mode highligh -set-window-option -g mode-style "fg=#918f88,bg=#401040" +set-window-option -g mode-style "fg=#b0b0b0,bg=#311647" # bell -set-window-option -g window-status-bell-style "fg=#242422,bg=#ff6c60" +set-window-option -g window-status-bell-style "fg=#202020,bg=#ed008c" # %%base16_template_end%% diff --git a/.vim/autoload/airline/themes/base16.vim b/.vim/autoload/airline/themes/base16.vim index 17d48ba..e17a33a 100644 --- a/.vim/autoload/airline/themes/base16.vim +++ b/.vim/autoload/airline/themes/base16.vim @@ -1,29 +1,23 @@ " %%base16_template: vim-airline-themes##default %% -" Base16 IR Black - Trysdyn Edit vim-airline-theme (https://github.com/dawikur/base16-vim-airline-themes) -" For vim-airline (https://github.com/vim-airline/vim-airline) -" By Trysdyn - -let s:scheme_slug = substitute("irblack-trysdyn", "-", "_", "g") - let g:airline#themes#base16#palette = {} " GUI color definitions let s:gui00 = '#000000' -let s:gui01 = '#242422' -let s:gui02 = '#401040' -let s:gui03 = '#6c6c66' -let s:gui04 = '#918f88' -let s:gui05 = '#b5b3aa' -let s:gui06 = '#d9d7cc' -let s:gui07 = '#fdfbee' -let s:gui08 = '#ff6c60' -let s:gui09 = '#e9c062' -let s:gui0A = '#ffffb6' -let s:gui0B = '#a8ff60' -let s:gui0C = '#c6c5fe' -let s:gui0D = '#96cbfe' -let s:gui0E = '#ff73fd' -let s:gui0F = '#b18a3d' +let s:gui01 = '#202020' +let s:gui02 = '#311647' +let s:gui03 = '#606060' +let s:gui04 = '#b0b0b0' +let s:gui05 = '#f0f0f0' +let s:gui06 = '#c0c0c0' +let s:gui07 = '#ffffff' +let s:gui08 = '#ed008c' +let s:gui09 = '#f7941d' +let s:gui0A = '#f7c61d' +let s:gui0B = '#8dc73f' +let s:gui0C = '#65cdcd' +let s:gui0D = '#3f7fff' +let s:gui0E = '#9f4fdf' +let s:gui0F = '#a16946' " Terminal color definitions let s:cterm00 = "00" diff --git a/.vim/colors/base16.vim b/.vim/colors/base16.vim index 1d4f875..c73b4b8 100644 --- a/.vim/colors/base16.vim +++ b/.vim/colors/base16.vim @@ -1,53 +1,37 @@ " %%base16_template: vim##default %% -" vi:syntax=vim - -" base16-vim (https://github.com/chriskempson/base16-vim) -" by Chris Kempson (http://chriskempson.com) -" IR Black - Trysdyn Edit scheme by Trysdyn - -" This enables the coresponding base16-shell script to run so that -" :colorscheme works in terminals supported by base16-shell scripts -" User must set this variable in .vimrc -" 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-irblack-trysdyn.sh" - endif -endif - " GUI color definitions let s:gui00 = "000000" let g:base16_gui00 = "000000" -let s:gui01 = "242422" -let g:base16_gui01 = "242422" -let s:gui02 = "401040" -let g:base16_gui02 = "401040" -let s:gui03 = "6c6c66" -let g:base16_gui03 = "6c6c66" -let s:gui04 = "918f88" -let g:base16_gui04 = "918f88" -let s:gui05 = "b5b3aa" -let g:base16_gui05 = "b5b3aa" -let s:gui06 = "d9d7cc" -let g:base16_gui06 = "d9d7cc" -let s:gui07 = "fdfbee" -let g:base16_gui07 = "fdfbee" -let s:gui08 = "ff6c60" -let g:base16_gui08 = "ff6c60" -let s:gui09 = "e9c062" -let g:base16_gui09 = "e9c062" -let s:gui0A = "ffffb6" -let g:base16_gui0A = "ffffb6" -let s:gui0B = "a8ff60" -let g:base16_gui0B = "a8ff60" -let s:gui0C = "c6c5fe" -let g:base16_gui0C = "c6c5fe" -let s:gui0D = "96cbfe" -let g:base16_gui0D = "96cbfe" -let s:gui0E = "ff73fd" -let g:base16_gui0E = "ff73fd" -let s:gui0F = "b18a3d" -let g:base16_gui0F = "b18a3d" +let s:gui01 = "202020" +let g:base16_gui01 = "202020" +let s:gui02 = "311647" +let g:base16_gui02 = "311647" +let s:gui03 = "606060" +let g:base16_gui03 = "606060" +let s:gui04 = "b0b0b0" +let g:base16_gui04 = "b0b0b0" +let s:gui05 = "f0f0f0" +let g:base16_gui05 = "f0f0f0" +let s:gui06 = "c0c0c0" +let g:base16_gui06 = "c0c0c0" +let s:gui07 = "ffffff" +let g:base16_gui07 = "ffffff" +let s:gui08 = "ed008c" +let g:base16_gui08 = "ed008c" +let s:gui09 = "f7941d" +let g:base16_gui09 = "f7941d" +let s:gui0A = "f7c61d" +let g:base16_gui0A = "f7c61d" +let s:gui0B = "8dc73f" +let g:base16_gui0B = "8dc73f" +let s:gui0C = "65cdcd" +let g:base16_gui0C = "65cdcd" +let s:gui0D = "3f7fff" +let g:base16_gui0D = "3f7fff" +let s:gui0E = "9f4fdf" +let g:base16_gui0E = "9f4fdf" +let s:gui0F = "a16946" +let g:base16_gui0F = "a16946" " Terminal color definitions let s:cterm00 = "00" @@ -101,21 +85,21 @@ endif " Neovim terminal colours if has("nvim") let g:terminal_color_0 = "#000000" - let g:terminal_color_1 = "#ff6c60" - let g:terminal_color_2 = "#a8ff60" - let g:terminal_color_3 = "#ffffb6" - let g:terminal_color_4 = "#96cbfe" - let g:terminal_color_5 = "#ff73fd" - let g:terminal_color_6 = "#c6c5fe" - let g:terminal_color_7 = "#b5b3aa" - let g:terminal_color_8 = "#6c6c66" - let g:terminal_color_9 = "#ff6c60" - let g:terminal_color_10 = "#a8ff60" - let g:terminal_color_11 = "#ffffb6" - let g:terminal_color_12 = "#96cbfe" - let g:terminal_color_13 = "#ff73fd" - let g:terminal_color_14 = "#c6c5fe" - let g:terminal_color_15 = "#fdfbee" + let g:terminal_color_1 = "#ed008c" + let g:terminal_color_2 = "#8dc73f" + let g:terminal_color_3 = "#f7c61d" + let g:terminal_color_4 = "#3f7fff" + let g:terminal_color_5 = "#9f4fdf" + let g:terminal_color_6 = "#65cdcd" + let g:terminal_color_7 = "#f0f0f0" + let g:terminal_color_8 = "#606060" + let g:terminal_color_9 = "#ed008c" + let g:terminal_color_10 = "#8dc73f" + let g:terminal_color_11 = "#f7c61d" + let g:terminal_color_12 = "#3f7fff" + let g:terminal_color_13 = "#9f4fdf" + let g:terminal_color_14 = "#65cdcd" + let g:terminal_color_15 = "#ffffff" let g:terminal_color_background = g:terminal_color_0 let g:terminal_color_foreground = g:terminal_color_5 if &background == "light" @@ -125,28 +109,28 @@ if has("nvim") elseif has("terminal") let g:terminal_ansi_colors = [ \ "#000000", - \ "#ff6c60", - \ "#a8ff60", - \ "#ffffb6", - \ "#96cbfe", - \ "#ff73fd", - \ "#c6c5fe", - \ "#b5b3aa", - \ "#6c6c66", - \ "#ff6c60", - \ "#a8ff60", - \ "#ffffb6", - \ "#96cbfe", - \ "#ff73fd", - \ "#c6c5fe", - \ "#fdfbee", + \ "#ed008c", + \ "#8dc73f", + \ "#f7c61d", + \ "#3f7fff", + \ "#9f4fdf", + \ "#65cdcd", + \ "#f0f0f0", + \ "#606060", + \ "#ed008c", + \ "#8dc73f", + \ "#f7c61d", + \ "#3f7fff", + \ "#9f4fdf", + \ "#65cdcd", + \ "#ffffff", \ ] endif " Theme setup hi clear syntax reset -let g:colors_name = "base16-irblack-trysdyn" +let g:colors_name = "base16" " Highlighting function " Optional variables are attributes and guisp