From 9d0dfd6c1355003513d23e3bb0d99e5d4206b63e Mon Sep 17 00:00:00 2001 From: Gaetan Date: Sun, 12 Nov 2023 14:25:08 +0100 Subject: [PATCH] Add 'Google-Light theme' for terminals/VIM + enablic italics in VIM --- config/alacritty/google-light_theme.yml | 31 ++++++++++++++++++ config/kitty/google-light_theme.conf | 43 +++++++++++++++++++++++++ config/tmux/tmux-workstation.conf | 10 +++--- vim/vimrc | 35 +++++++++++++------- 4 files changed, 103 insertions(+), 16 deletions(-) create mode 100644 config/alacritty/google-light_theme.yml create mode 100644 config/kitty/google-light_theme.conf diff --git a/config/alacritty/google-light_theme.yml b/config/alacritty/google-light_theme.yml new file mode 100644 index 00000000..38960952 --- /dev/null +++ b/config/alacritty/google-light_theme.yml @@ -0,0 +1,31 @@ +colors: + primary: + background: '#ffffff' + foreground: '#373b41' + normal: + black: '#1d1f21' + red: '#cc342b' + green: '#198844' + yellow: '#fba922' + blue: '#3971ed' + magenta: '#a36ac7' + cyan: '#3971ed' + white: '#c5c8c6' + bright: + black: '#969896' + red: '#cc342b' + green: '#198844' + yellow: '#fba922' + blue: '#3971ed' + magenta: '#a36ac7' + cyan: '#3971ed' + white: '#ffffff' + dim: + black: '#1d1f21' + red: '#cc342b' + green: '#198844' + yellow: '#fba922' + blue: '#3971ed' + magenta: '#a36ac7' + cyan: '#3971ed' + white: '#c5c8c6' diff --git a/config/kitty/google-light_theme.conf b/config/kitty/google-light_theme.conf new file mode 100644 index 00000000..0ecd4334 --- /dev/null +++ b/config/kitty/google-light_theme.conf @@ -0,0 +1,43 @@ +# Color theme +foreground: #373b41 +background: #ffffff +selection_foreground #000000 +selection_background #fffacd + +url_color #0087bd + +# black +color0: #1d1f21 +color8: #969896 + +# red +color1: #cc342b +color9: #cc342b + +# green +color2: #198844 +color10: #198844 + +# yellow +color3: #fba922 +color11: #fba922 + +# blue +color4: #3971ed +color12: #3971ed + +# magenta +color5: #a36ac7 +color13: #a36ac7 + +# cyan +color6: #3971ed +color14: #3971ed + +# white +color7: #c5c8c6 +color15: #ffffff + +# Cursor colors +cursor #cccccc +cursor_text_color #111111 diff --git a/config/tmux/tmux-workstation.conf b/config/tmux/tmux-workstation.conf index 4abe7957..32a2bb23 100644 --- a/config/tmux/tmux-workstation.conf +++ b/config/tmux/tmux-workstation.conf @@ -6,10 +6,12 @@ set-option -g prefix C-a # Enable 256 color terminal -if-shell '[[ ${OSTYPE} =~ darwin ]]' \ - 'set -g default-terminal "screen-256color"' -if-shell '[[ ${OSTYPE} =~ linux-gnu ]]' \ - 'set -g default-terminal "tmux-256color"' +set -g default-terminal "tmux-256color" +# if-shell '[[ ${OSTYPE} =~ darwin ]]' \ +# 'set -g default-terminal "screen-256color"' +# if-shell '[[ ${OSTYPE} =~ linux-gnu ]]' \ +# 'set -g default-terminal "tmux-256color"' + # Monitor activity set-window-option -g monitor-activity on diff --git a/vim/vimrc b/vim/vimrc index 618692f0..7bf7edc9 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -37,6 +37,7 @@ call plug#begin('~/.vim/bundle') Plug 'romgrk/doom-one.vim' Plug 'pineapplegiant/spaceduck', { 'branch': 'main' } Plug 'rafalbromirski/vim-aurora' + Plug 'google/vim-colorscheme-primary' " Linters Plug 'chr4/nginx.vim' " Status bar @@ -182,13 +183,13 @@ function ToggleSyntax() if s:syntax == 1 syntax off let s:syntax = 0 - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE else syntax on let s:syntax = 1 - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE endif @@ -204,13 +205,23 @@ if empty($SSH_CLIENT) set termguicolors endif colorscheme kuroi -" highlight Comment cterm=italic gui=italic +highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE function ToggleColors() - if (g:colors_name == "aurora") + if (g:colors_name == "kuroi") + colorscheme primary + highlight Comment cterm=italic gui=italic + highlight Normal guibg=NONE ctermbg=NONE + highlight EndOfBuffer guibg=NONE ctermbg=NONE + let g:lightline = {'colorscheme': 'jellybeans'} + call lightline#init() + call lightline#colorscheme() + set t_Co=256 + set background=light + elseif (g:colors_name == "aurora") colorscheme kuroi - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'jellybeans'} @@ -218,7 +229,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "spaceduck") colorscheme aurora - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'jellybeans'} @@ -226,7 +237,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "doom-one") colorscheme spaceduck - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'spaceduck'} @@ -234,7 +245,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "nord") colorscheme doom-one - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'jellybeans'} @@ -242,7 +253,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "onedark") colorscheme nord - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'nord'} @@ -250,7 +261,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "dracula") colorscheme onedark - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'onedark'} @@ -258,7 +269,7 @@ function ToggleColors() call lightline#colorscheme() elseif (g:colors_name == "gruvbox-material") colorscheme dracula - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline = {'colorscheme': 'dracula'} @@ -266,7 +277,7 @@ function ToggleColors() call lightline#colorscheme() else colorscheme gruvbox-material - " highlight Comment cterm=italic gui=italic + highlight Comment cterm=italic gui=italic highlight Normal guibg=NONE ctermbg=NONE highlight EndOfBuffer guibg=NONE ctermbg=NONE let g:lightline.colorscheme = 'gruvbox_material'