From 5cff6289d6d9d8630a04dd86f132818a91635d98 Mon Sep 17 00:00:00 2001 From: Juan Ibiapina Date: Mon, 30 Jan 2023 13:11:38 +0100 Subject: [PATCH] colors: Switch theme to selenized Many JS libraries do not work well with solarized: https://github.com/altercation/solarized/issues/220 --- .../alacritty_base/alacritty_Darwin.yml | 80 ++++++++++++------- .../alacritty_base/alacritty_Linux.yml | 80 ++++++++++++------- dotfiles/nvim/.config/nvim/conf/conf.vim | 7 +- dotfiles/nvim/.config/nvim/conf/plugins.vim | 3 +- 4 files changed, 110 insertions(+), 60 deletions(-) diff --git a/dotfiles/alacritty/.config/alacritty_base/alacritty_Darwin.yml b/dotfiles/alacritty/.config/alacritty_base/alacritty_Darwin.yml index e9f79bfc..f5c9c8f5 100644 --- a/dotfiles/alacritty/.config/alacritty_base/alacritty_Darwin.yml +++ b/dotfiles/alacritty/.config/alacritty_base/alacritty_Darwin.yml @@ -183,38 +183,62 @@ font: draw_bold_text_with_bright_colors: false # Colors (Solarized Dark) +#colors: +# # Default colors +# primary: +# background: '0x002b36' # base03 +# foreground: '0x839496' # base0 +# +# # Cursor colors +# cursor: +# text: '0x002b36' # base03 +# cursor: '0x839496' # base0 +# +# # Normal colors +# normal: +# black: '0x073642' # base02 +# red: '0xdc322f' # red +# green: '0x859900' # green +# yellow: '0xb58900' # yellow +# blue: '0x268bd2' # blue +# magenta: '0xd33682' # magenta +# cyan: '0x2aa198' # cyan +# white: '0xeee8d5' # base2 +# +# # Bright colors +# bright: +# black: '0x002b36' # base03 +# red: '0xcb4b16' # orange +# green: '0x586e75' # base01 +# yellow: '0x657b83' # base00 +# blue: '0x839496' # base0 +# magenta: '0x6c71c4' # violet +# cyan: '0x93a1a1' # base1 +# white: '0xfdf6e3' # base3 + +# Colors (Selenized dark) colors: - # Default colors primary: - background: '0x002b36' # base03 - foreground: '0x839496' # base0 - - # Cursor colors - cursor: - text: '0x002b36' # base03 - cursor: '0x839496' # base0 - - # Normal colors + background: '0x103c48' + foreground: '0xadbcbc' normal: - black: '0x073642' # base02 - red: '0xdc322f' # red - green: '0x859900' # green - yellow: '0xb58900' # yellow - blue: '0x268bd2' # blue - magenta: '0xd33682' # magenta - cyan: '0x2aa198' # cyan - white: '0xeee8d5' # base2 - - # Bright colors + black: '0x184956' + red: '0xfa5750' + green: '0x75b938' + yellow: '0xdbb32d' + blue: '0x4695f7' + magenta: '0xf275be' + cyan: '0x41c7b9' + white: '0x72898f' bright: - black: '0x002b36' # base03 - red: '0xcb4b16' # orange - green: '0x586e75' # base01 - yellow: '0x657b83' # base00 - blue: '0x839496' # base0 - magenta: '0x6c71c4' # violet - cyan: '0x93a1a1' # base1 - white: '0xfdf6e3' # base3 + black: '0x2d5b69' + red: '0xff665c' + green: '0x84c747' + yellow: '0xebc13d' + blue: '0x58a3ff' + magenta: '0xff84cd' + cyan: '0x53d6c7' + white: '0xcad8d9' # Visual Bell # diff --git a/dotfiles/alacritty/.config/alacritty_base/alacritty_Linux.yml b/dotfiles/alacritty/.config/alacritty_base/alacritty_Linux.yml index 4bbdfb4d..b48033c7 100644 --- a/dotfiles/alacritty/.config/alacritty_base/alacritty_Linux.yml +++ b/dotfiles/alacritty/.config/alacritty_base/alacritty_Linux.yml @@ -183,38 +183,62 @@ font: draw_bold_text_with_bright_colors: false # Colors (Solarized Dark) +#colors: +# # Default colors +# primary: +# background: '0x002b36' # base03 +# foreground: '0x839496' # base0 +# +# # Cursor colors +# cursor: +# text: '0x002b36' # base03 +# cursor: '0x839496' # base0 +# +# # Normal colors +# normal: +# black: '0x073642' # base02 +# red: '0xdc322f' # red +# green: '0x859900' # green +# yellow: '0xb58900' # yellow +# blue: '0x268bd2' # blue +# magenta: '0xd33682' # magenta +# cyan: '0x2aa198' # cyan +# white: '0xeee8d5' # base2 +# +# # Bright colors +# bright: +# black: '0x002b36' # base03 +# red: '0xcb4b16' # orange +# green: '0x586e75' # base01 +# yellow: '0x657b83' # base00 +# blue: '0x839496' # base0 +# magenta: '0x6c71c4' # violet +# cyan: '0x93a1a1' # base1 +# white: '0xfdf6e3' # base3 + +# Colors (Selenized dark) colors: - # Default colors primary: - background: '0x002b36' # base03 - foreground: '0x839496' # base0 - - # Cursor colors - cursor: - text: '0x002b36' # base03 - cursor: '0x839496' # base0 - - # Normal colors + background: '0x103c48' + foreground: '0xadbcbc' normal: - black: '0x073642' # base02 - red: '0xdc322f' # red - green: '0x859900' # green - yellow: '0xb58900' # yellow - blue: '0x268bd2' # blue - magenta: '0xd33682' # magenta - cyan: '0x2aa198' # cyan - white: '0xeee8d5' # base2 - - # Bright colors + black: '0x184956' + red: '0xfa5750' + green: '0x75b938' + yellow: '0xdbb32d' + blue: '0x4695f7' + magenta: '0xf275be' + cyan: '0x41c7b9' + white: '0x72898f' bright: - black: '0x002b36' # base03 - red: '0xcb4b16' # orange - green: '0x586e75' # base01 - yellow: '0x657b83' # base00 - blue: '0x839496' # base0 - magenta: '0x6c71c4' # violet - cyan: '0x93a1a1' # base1 - white: '0xfdf6e3' # base3 + black: '0x2d5b69' + red: '0xff665c' + green: '0x84c747' + yellow: '0xebc13d' + blue: '0x58a3ff' + magenta: '0xff84cd' + cyan: '0x53d6c7' + white: '0xcad8d9' # Visual Bell # diff --git a/dotfiles/nvim/.config/nvim/conf/conf.vim b/dotfiles/nvim/.config/nvim/conf/conf.vim index 345721b3..a3abb43b 100644 --- a/dotfiles/nvim/.config/nvim/conf/conf.vim +++ b/dotfiles/nvim/.config/nvim/conf/conf.vim @@ -51,10 +51,11 @@ set tags+=gems.tags "colors set termguicolors -let &t_8f = "\[38;2;%lu;%lu;%lum" -let &t_8b = "\[48;2;%lu;%lu;%lum" +"let &t_8f = "\[38;2;%lu;%lu;%lum" +"let &t_8b = "\[48;2;%lu;%lu;%lum" +let g:selenized_green_keywords=1 " green keywords for solarized compatibility in selenized set background=dark -colorscheme solarized8 +colorscheme selenized " set distance between cursor and window border set scrolloff=3 diff --git a/dotfiles/nvim/.config/nvim/conf/plugins.vim b/dotfiles/nvim/.config/nvim/conf/plugins.vim index f38f12ca..c193073a 100644 --- a/dotfiles/nvim/.config/nvim/conf/plugins.vim +++ b/dotfiles/nvim/.config/nvim/conf/plugins.vim @@ -36,7 +36,8 @@ Plug 'kassio/neoterm' Plug 'juanibiapina/bats.vim' " Colors -Plug 'lifepillar/vim-solarized8' +"Plug 'lifepillar/vim-solarized8' +Plug 'jan-warchol/selenized', { 'rtp': 'editors/vim' } " Github CoPilot Plug 'github/copilot.vim'