From 3844d7d5b874112c5c0d50555be914ba41124e39 Mon Sep 17 00:00:00 2001 From: Jinho Date: Thu, 8 Apr 2021 18:17:20 +0900 Subject: [PATCH 01/47] Add JSON quotation syntax color. --- colors/spaceduck.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index ffdc406..979e8d9 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -148,6 +148,7 @@ hi link jsObjectProp Tag hi link jsTernaryIfOperator Title hi link jsTemplateBraces Title hi link jsTemplateExpression String +hi link jsonQuote Label hi link texTypeStyle Special hi link mkdDelimiter Normal hi link phpFunction Function From 76ada76b07f2fe2d861036e2ad2fc43b278ec7f5 Mon Sep 17 00:00:00 2001 From: Jinho Date: Fri, 9 Apr 2021 19:19:24 +0900 Subject: [PATCH 02/47] Fix Airline tabline colors. --- autoload/airline/themes/spaceduck.vim | 23 +++++++++++++++++++++++ estilo/syntax/base.yml | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/autoload/airline/themes/spaceduck.vim b/autoload/airline/themes/spaceduck.vim index 0f4f02e..fe8e40d 100644 --- a/autoload/airline/themes/spaceduck.vim +++ b/autoload/airline/themes/spaceduck.vim @@ -34,6 +34,29 @@ let s:inactive2 = [ "#1b1c36", "#16172d", 234, 234 ] let s:inactive3 = [ "#1b1c36", "#16172d", 234, 234 ] let g:airline#themes#spaceduck#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3) +" tabline colors +let s:tab_fill = [ "#ecf0c1", "#0f111b", 255, 233] +let s:selected_tab = [ "#b3a1e6", "#0f111b", 146, 233 ] +let s:modified_tab = [ "#5ccc96", "#0f111b", 78, 233 ] +let s:background_tab = [ "#686f9a", "#0f111b", 60, 233 ] + +" reference airline-tabline-hlgroups for more information +let g:airline#themes#spaceduck#palette.tabline = { + \ "airline_tab": s:background_tab, + \ "airline_tab_right": s:background_tab, + \ "airline_tabsel": s:selected_tab, + \ "airline_tabsel_right": s:selected_tab, + \ "airline_tabmod": s:modified_tab, + \ "airline_tabmod_right": s:modified_tab, + \ "airline_tabmod_unsel": s:modified_tab, + \ "airline_tabmod_unsel_right": s:modified_tab, + \ "airline_tabfill": s:tab_fill, + \ "airline_tablabel": s:background_tab, + \ "airline_tablabel_right": s:background_tab, + \ "airline_tabhid": s:background_tab, + \ "airline_tabhid_right": s:background_tab + \ } + if !get(g:, 'loaded_ctrlp', 0) finish endif diff --git a/estilo/syntax/base.yml b/estilo/syntax/base.yml index 6424a7f..2f2e0a9 100644 --- a/estilo/syntax/base.yml +++ b/estilo/syntax/base.yml @@ -48,9 +48,9 @@ StatusLine: 'foreground background r' StatusLineTerm: '@StatusLine' StatusLineTermNC: 'pureBlack darkPurp r' StatusLineNC: '@StatusLineTermNC' -TabLine: 'pureBlack grey' -TabLineFill: 'grey pureBlack' -TabLineSel: 'grey2 background' +TabLine: 'foreground background' +TabLineFill: 'darkPurp2 background' +TabLineSel: 'purple background' Visual: '- visualSel' VisualNOS: '@Visual' WarningMsg: 'orange background' From 7f17f6e9d2c62fecec602f3b7af19a5032c62ef8 Mon Sep 17 00:00:00 2001 From: Jinho Date: Thu, 15 Apr 2021 11:27:06 +0900 Subject: [PATCH 03/47] Fix Airline vertical split vertex color. --- colors/spaceduck.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 979e8d9..ed29c38 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -64,10 +64,10 @@ hi SpellBad guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=underline cter hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellCap guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellRare guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi StatusLine guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=reverse cterm=reverse +hi StatusLine guifg=#0f111b ctermfg=255 guibg=#0f111b ctermbg=233 gui=reverse cterm=reverse hi link StatusLineTerm StatusLine hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse -hi link StatusLineNC StatusLineTermNC +hi StatusLineNC guifg=#0f111b hi TabLine guifg=#000000 ctermfg=0 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi TabLineFill guifg=#818596 ctermfg=102 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi TabLineSel guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE From 0e92b119416493b1ad93229a4bbc18efb3a7a545 Mon Sep 17 00:00:00 2001 From: Jinho Date: Thu, 15 Apr 2021 11:48:18 +0900 Subject: [PATCH 04/47] Fix Airline warnings / errors and make Airline statusline colors darker. --- autoload/airline/themes/spaceduck.vim | 29 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/autoload/airline/themes/spaceduck.vim b/autoload/airline/themes/spaceduck.vim index fe8e40d..ed8cd56 100644 --- a/autoload/airline/themes/spaceduck.vim +++ b/autoload/airline/themes/spaceduck.vim @@ -9,14 +9,14 @@ let g:airline#themes#spaceduck#palette = {} -let s:normal1 = [ "#000000", "#30365F", 0, 237 ] -let s:normal2 = [ "#30365F", "#686f9a", 237, 60 ] -let s:normal3 = [ "#30365F", "#686f9a", 237, 60 ] +let s:normal1 = [ "#1b1c36", "#686f9a", 0, 237 ] +let s:normal2 = [ "#686f9a", "#1b1c36", 60, 234 ] +let s:normal3 = [ "#686f9a", "#1b1c36", 60, 234 ] let g:airline#themes#spaceduck#palette.normal = airline#themes#generate_color_map(s:normal1, s:normal2, s:normal3) let s:insert1 = [ "#000000", "#5ccc96", 0, 78 ] -let s:insert2 = [ "#30365F", "#686f9a", 237, 60 ] -let s:insert3 = [ "#30365F", "#686f9a", 237, 60 ] +let s:insert2 = [ "#5ccc96", "#1b1c36", 60, 234 ] +let s:insert3 = [ "#5ccc96", "#1b1c36", 60, 234 ] let g:airline#themes#spaceduck#palette.insert = airline#themes#generate_color_map(s:insert1, s:insert2, s:insert3) let s:replace1 = [ "#000000", "#7a5ccc", 0, 98 ] @@ -24,9 +24,9 @@ let s:replace2 = [ "#30365F", "#686f9a", 237, 60 ] let s:replace3 = [ "#30365F", "#686f9a", 237, 60 ] let g:airline#themes#spaceduck#palette.replace = airline#themes#generate_color_map(s:replace1, s:replace2, s:replace3) -let s:visual1 = [ "#000000", "#f2ce00", 0, 220 ] -let s:visual2 = [ "#30365F", "#686f9a", 237, 60 ] -let s:visual3 = [ "#30365F", "#686f9a", 237, 60 ] +let s:visual1 = [ "#000000", "#b3a1e6", 0, 220 ] +let s:visual2 = [ "#b3a1e6", "#1b1c36", 146, 234 ] +let s:visual3 = [ "#b3a1e6", "#1b1c36", 146, 234 ] let g:airline#themes#spaceduck#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3) let s:inactive1 = [ "#1b1c36", "#16172d", 234, 234 ] @@ -34,6 +34,18 @@ let s:inactive2 = [ "#1b1c36", "#16172d", 234, 234 ] let s:inactive3 = [ "#1b1c36", "#16172d", 234, 234 ] let g:airline#themes#spaceduck#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3) +" statusline warnings ( the [3]trailing block at the right end of your status bar) +let s:warning_color = [ "#686f9a", "#30365F", 0, 237 ] +let g:airline#themes#spaceduck#palette.normal.airline_warning = s:warning_color +let g:airline#themes#spaceduck#palette.insert.airline_warning = s:warning_color +let g:airline#themes#spaceduck#palette.visual.airline_warning = s:warning_color + +" statusline errors +let s:error_color = [ "#ce6f8f", "#1b1c36", 0, 237 ] +let g:airline#themes#spaceduck#palette.normal.airline_error = s:error_color +let g:airline#themes#spaceduck#palette.insert.airline_error = s:error_color +let g:airline#themes#spaceduck#palette.visual.airline_error = s:error_color + " tabline colors let s:tab_fill = [ "#ecf0c1", "#0f111b", 255, 233] let s:selected_tab = [ "#b3a1e6", "#0f111b", 146, 233 ] @@ -57,6 +69,7 @@ let g:airline#themes#spaceduck#palette.tabline = { \ "airline_tabhid_right": s:background_tab \ } +" ctrlp extension if !get(g:, 'loaded_ctrlp', 0) finish endif From c78c1c0cef1e5e543c44c56b4d6e521ad0f18080 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 18 Apr 2021 16:05:31 -0600 Subject: [PATCH 05/47] =?UTF-8?q?Deprecate=20Estilo=20=F0=9F=92=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +- colors/spaceduck.vim | 181 +++++++++++---------- estilo.yml | 18 --- estilo/addons/nvim-term.yml | 18 --- estilo/airline/spaceduck.yml | 18 --- estilo/lightline/spaceduck.yml | 31 ---- estilo/palettes/spaceduck.yml | 51 ------ estilo/syntax/base.yml | 285 --------------------------------- 8 files changed, 94 insertions(+), 522 deletions(-) delete mode 100644 estilo.yml delete mode 100644 estilo/addons/nvim-term.yml delete mode 100644 estilo/airline/spaceduck.yml delete mode 100644 estilo/lightline/spaceduck.yml delete mode 100644 estilo/palettes/spaceduck.yml delete mode 100644 estilo/syntax/base.yml diff --git a/README.md b/README.md index ba45848..40abda3 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,6 @@ If using Vim/Neovim I recommend installing the [vim-polyglot](https://github.com # Vim and Neovim This repo hosts the Vim/Neovim color scheme. - Install the plugin with whatever plugin manager you use: `Plug 'pineapplegiant/spaceduck', { 'branch': 'main' }` @@ -104,9 +103,7 @@ And add this to your vimrc/init.vim configuration file: colorscheme spaceduck ``` -Or manually add the color theme to your 'runtimepath' for the file. - -`:h colors` +## Plugins - [Airline](https://github.com/vim-airline/vim-airline) @@ -287,10 +284,6 @@ And in your `.bash_profile or .zshrc`: If you'd like to contribute please reach out! I don't know what I'm doing. Try to send a screenshot when posting issues as well. If you port it to whatever you're using, send me a link so I can link it here! -## Vim Estilo - -I currently use [estilo](https://github.com/jacoborus/estilo) to manage colors for Vim/Neovim, please install the dependencies to compile the colors specified in the YAML into the color scheme. - To find the [current syntax element under the cursor](https://vim.fandom.com/wiki/Identify_the_syntax_highlighting_group_used_at_the_cursor), I use this mapping which maps Ctrl+a to find the id under the cursor: ```viml @@ -308,10 +301,11 @@ This will show you the syntax ID to where we can then modify the color of that w ### Testing colors look good -- To test that colors look good, you can run: `:source $VIMRUNTIME/syntax/hitest.vim` this will open a buffer of all color groups defined! +- Edit the colors/spaceduck.vim. When finished run `:source %` to source the buffer and see changes live. +- To test that colors look good, you can also run: `:source $VIMRUNTIME/syntax/hitest.vim` this will open a buffer of all color groups defined! - Check current defined colors in buffer `:highlight` or `:hi` for short. - Looking for more syntax elements? Check out `$VIMRUNTIME/syntax/` for all of vim's language support. -### TODO +### TODO/WIP Check out my [Todo list](https://github.com/pineapplegiant/spaceduck/projects/1) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index ed29c38..6d7ae89 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -1,120 +1,115 @@ -" =============================================================== -" spaceduck -" +" _ _ +" | | | | +" ___ _ __ __ _ ___ ___ __| |_ _ ___| | __ +" / __| '_ \ / _` |/ __/ _ \/ _` | | | |/ __| |/ / +" \__ \ |_) | (_| | (_| __/ (_| | |_| | (__| < +" |___/ .__/ \__,_|\___\___|\__,_|\__,_|\___|_|\_\ +" | | +" |_| +" " URL: https://github.com/pineapplegiant/spaceduck -" Author: Guillermo Rodriguez +" Maintainer: Guillermo Rodriguez +" Modified: 2021/03/16 22:28 " License: MIT -" Last Change: 2021/03/16 22:28 -" =============================================================== set background=dark + hi clear if exists("syntax_on") syntax reset endif -let g:colors_name="spaceduck" +let g:colors_name="spaceduck" -let Italic = "" -if exists('g:spaceduck_italic') - let Italic = "italic" -endif -let g:spaceduck_italic = get(g:, 'spaceduck_italic', 0) - -let Bold = "" -if exists('g:spaceduck_bold') - let Bold = "bold" -endif - -let g:spaceduck_bold = get(g:, 'spaceduck_bold', 0) +hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Boolean guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Character guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi CursorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +hi Comment guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Conceal guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Conditional guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Constant guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Cursor guifg=#0f111b ctermfg=233 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE -hi link CursorIM Cursor +hi CursorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE hi CursorLine guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi Directory guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Debug guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Define guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Delimiter guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi DiffAdd guifg=#5ccc96 ctermfg=78 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffChange guifg=#e39400 ctermfg=172 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffDelete guifg=#e33400 ctermfg=166 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffText guifg=#f2ce00 ctermfg=220 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE +hi Directory guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi EndOfBuffer guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi link TermCursor Cursor +hi Error guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi ErrorMsg guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi VertSplit guifg=#000000 ctermfg=0 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE -hi Folded guifg=#686f9a ctermfg=60 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Exception guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Float guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi FoldColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi SignColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Folded guifg=#686f9a ctermfg=60 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Function guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Identifier guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Ignore guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi IncSearch guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE +hi Include guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Keyword guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Label guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi LineNr guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Macro guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi MatchParen guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi ModeMsg guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi MoreMsg guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi link NonText EndOfBuffer +hi Number guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Operator guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Pmenu guifg=#ecf0c1 ctermfg=255 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi PmenuSel guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi PmenuSbar guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE +hi PmenuSel guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi PmenuThumb guifg=NONE ctermfg=NONE guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE +hi PreCondit guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi PreProc guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Question guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi QuickFixLine guifg=#ecf0c1 ctermfg=255 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +hi Repeat guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Search guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE +hi SignColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Special guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpecialChar guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpecialKey guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi SpellBad guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellCap guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellRare guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi Statement guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi StatusLine guifg=#0f111b ctermfg=255 guibg=#0f111b ctermbg=233 gui=reverse cterm=reverse -hi link StatusLineTerm StatusLine -hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse hi StatusLineNC guifg=#0f111b +hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse +hi StorageClass guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi String guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Structure guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi TabLine guifg=#000000 ctermfg=0 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi TabLineFill guifg=#818596 ctermfg=102 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi TabLineSel guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Tag guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Title guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Todo guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=underline cterm=underline +hi Type guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Typedef guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Underlined guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline +hi VertSplit guifg=#000000 ctermfg=0 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi Visual guifg=NONE ctermfg=NONE guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi link VisualNOS Visual hi WarningMsg guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi WildMenu guifg=#000000 ctermfg=0 guibg=#c1c3cc ctermbg=251 gui=NONE cterm=NONE -hi link Whitespace EndOfBuffer hi diffAdded guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi diffRemoved guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Comment guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Constant guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Statement guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Type guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Special guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Underlined guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi Error guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Delimiter guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Operator guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Tag guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Debug guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi StorageClass guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi String guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Structure guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Typedef guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Function guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Include guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Label guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Exception guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Keyword guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi SpecialChar guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Boolean guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Character guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Float guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Number guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Conditional guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Repeat guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Title guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Define guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Macro guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi PreCondit guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + +"Link +hi link Whitespace EndOfBuffer +hi link VisualNOS Visual +hi link StatusLineTerm StatusLine +hi link NonText EndOfBuffer hi link SpecialComment Comment -hi Todo guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=underline cterm=underline +hi link TermCursor Cursor hi link cFormat Title hi link cCppOutIf1 Normal hi link cCppOutIf2 Normal @@ -223,6 +218,7 @@ hi link typescriptDOMFormMethod Function hi link vimGroupName Normal hi link yamlKeyValueDelimiter Normal hi link yamlBlockMappingKey Function +"Plugin hi link vistaTag Conditional hi link vistaIcon Identifier hi link vistaColon Normal @@ -246,26 +242,29 @@ hi BufferCurrentTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=N hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -let g:terminal_color_foreground = "#ecf0c1" -let g:terminal_color_background = "#0f111b" -let g:terminal_color_0 = "#000000" -let g:terminal_color_1 = "#e33400" -let g:terminal_color_2 = "#5ccc96" -let g:terminal_color_3 = "#b3a1e6" -let g:terminal_color_4 = "#00a3cc" -let g:terminal_color_5 = "#ce6f8f" -let g:terminal_color_6 = "#7a5ccc" -let g:terminal_color_7 = "#686f9a" -let g:terminal_color_8 = "#686f9a" -let g:terminal_color_9 = "#e33400" -let g:terminal_color_10 = "#5ccc96" -let g:terminal_color_11 = "#b3a1e6" -let g:terminal_color_12 = "#00a3cc" -let g:terminal_color_13 = "#ce6f8f" -let g:terminal_color_14 = "#7a5ccc" -let g:terminal_color_15 = "#ecf0c1" -" =================================== -" Generated by Estilo 1.4.1 -" https://github.com/jacoborus/estilo -" =================================== +" Neovim uses different terminal colors apart from Vim + if has('nvim') + let g:terminal_color_foreground = "#ecf0c1" + let g:terminal_color_background = "#0f111b" + let g:terminal_color_0 = "#000000" + let g:terminal_color_1 = "#e33400" + let g:terminal_color_2 = "#5ccc96" + let g:terminal_color_3 = "#b3a1e6" + let g:terminal_color_4 = "#00a3cc" + let g:terminal_color_5 = "#ce6f8f" + let g:terminal_color_6 = "#7a5ccc" + let g:terminal_color_7 = "#686f9a" + let g:terminal_color_8 = "#686f9a" + let g:terminal_color_9 = "#e33400" + let g:terminal_color_10 = "#5ccc96" + let g:terminal_color_11 = "#b3a1e6" + let g:terminal_color_12 = "#00a3cc" + let g:terminal_color_13 = "#ce6f8f" + let g:terminal_color_14 = "#7a5ccc" + let g:terminal_color_15 = "#ecf0c1" + else + let g:terminal_ansi_colors = [ + \ '#000000', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#686f9a', + \ '#686f9a', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#ecf0c1'] +endif diff --git a/estilo.yml b/estilo.yml deleted file mode 100644 index aeeb63c..0000000 --- a/estilo.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: 'spaceduck' -version: '1.0.0' -license: 'MIT' -author: 'Guillermo Rodriguez' -url: 'https://github.com/pineapplegiant/spaceduck' -description: 'An intergalactic space theme for Vim, Terminal & more!' -colorschemes: - - name: 'spaceduck' - background: 'dark' - palette: 'spaceduck' -airline: - - name: 'spaceduck' - palette: 'spaceduck' - style: 'spaceduck' -lightline: - - name: 'spaceduck' - palette: 'spaceduck' - style: 'spaceduck' diff --git a/estilo/addons/nvim-term.yml b/estilo/addons/nvim-term.yml deleted file mode 100644 index 2013d30..0000000 --- a/estilo/addons/nvim-term.yml +++ /dev/null @@ -1,18 +0,0 @@ -color_foreground: 'foreground' -color_background: 'background' -color_0: 'pureBlack' -color_1: 'red' -color_2: 'green' -color_3: 'purple' -color_4: 'cyan' -color_5: 'magenta' -color_6: 'purple2' -color_7: 'darkPurp2' -color_8: 'darkPurp2' -color_9: 'red' -color_10: 'green' -color_11: 'purple' -color_12: 'cyan' -color_13: 'magenta' -color_14: 'purple2' -color_15: 'foreground' diff --git a/estilo/airline/spaceduck.yml b/estilo/airline/spaceduck.yml deleted file mode 100644 index e6a1adc..0000000 --- a/estilo/airline/spaceduck.yml +++ /dev/null @@ -1,18 +0,0 @@ -normal1: 'pureBlack darkPurp' -normal2: 'darkPurp darkPurp2' -normal3: 'darkPurp darkPurp2' -inactive1: 'visualSel cursorLine' -inactive2: 'visualSel cursorLine' -inactive3: 'visualSel cursorLine' -insert1: 'pureBlack green' -insert2: 'darkPurp darkPurp2' -insert3: 'darkPurp darkPurp2' -replace1: 'pureBlack purple2' -replace2: 'darkPurp darkPurp2' -replace3: 'darkPurp darkPurp2' -visual1: 'pureBlack yellow' -visual2: 'darkPurp darkPurp2' -visual3: 'darkPurp darkPurp2' -ctrlp1: 'foreground background' -ctrlp2: 'foreground background' -ctrlp3: 'foreground background' diff --git a/estilo/lightline/spaceduck.yml b/estilo/lightline/spaceduck.yml deleted file mode 100644 index def702d..0000000 --- a/estilo/lightline/spaceduck.yml +++ /dev/null @@ -1,31 +0,0 @@ -normal1: 'background darkPurp2' -normal2: 'background darkPurp' -normal3: 'darkPurp2 visualSel' -normal4: 'background darkPurp' -normal5: 'darkPurp2 visualSel' -normalError: 'background red' -normalWarning: 'background orange' -inactive1: 'darkPurp2 visualSel' -inactive2: 'background darkPurp' -inactive3: 'darkPurp2 visualSel' -inactive4: 'darkPurp2 visualSel' -inactive5: 'darkPurp2 visualSel' -insert1: 'background green' -insert2: 'background darkPurp' -insert3: 'darkPurp2 visualSel' -insert4: 'background green' -insert5: 'darkPurp2 visualSel' -replace1: 'background purple2' -replace2: 'background darkPurp' -replace3: 'darkPurp2 visualSel' -replace4: 'background purple2' -replace5: 'darkPurp2 visualSel' -visual1: 'background yellow' -visual2: 'background darkPurp' -visual3: 'darkPurp2 visualSel' -visual4: 'background yellow' -visual5: 'darkPurp2 visualSel' -tablineLeft: 'background darkPurp' -tablineSelected: 'background darkPurp2' -tablineMiddle: 'darkPurp2 visualSel' -tablineRight: 'background darkPurp' diff --git a/estilo/palettes/spaceduck.yml b/estilo/palettes/spaceduck.yml deleted file mode 100644 index 7300484..0000000 --- a/estilo/palettes/spaceduck.yml +++ /dev/null @@ -1,51 +0,0 @@ -# Special Colors -background: '#0f111b' -foreground: '#ecf0c1' -visualSel: '#1b1c36' -cursorLine: '#16172d' - -# Base Colors -red: '#e33400' -orange: '#e39400' -green: '#5ccc96' -green2: '#67bf95' -yellow: '#f2ce00' -purple: '#b3a1e6' -purple2: '#7a5ccc' -darkPurp: '#30365F' -darkPurp2: '#686f9a' -cyan: '#00a3cc' -magenta: '#ce6f8f' - - -# Coloration -pureWhite: '#ffffff' -pureBlack: '#000000' -grey: '#818596' -grey2: '#c1c3cc' - - -# Deprecated maybe -#search: '#114fd6' -#pink: '#e6a1a3' -#darkPurp: '#2e3459' -#darkPurp: '#373E6C' -#visualSel: '#272c42' -#visualSel: '#222344' -#diffAdd: '#6bb391' -#diffChange: '#b39a6b' -#diffDelete: '#b37d6b' -#diffText: '#6b76b3' -#white1: '#656782' -#white2: '#B6A8DD' -#cursorColor: '#c1c3cc' -#vertSplit: '#0f1117' -#folded: '#686f9a' -#matchParen: '#3e445e' -#pmenu: '#3d425b' -#quickFixLine: '#272c42' -# tabline: '#818596' -# TablineSel: '#9a9ca5' -#darkness: '#17171b' -#black1: '#444b71' -#black2: '#1a1b35' diff --git a/estilo/syntax/base.yml b/estilo/syntax/base.yml deleted file mode 100644 index 2f2e0a9..0000000 --- a/estilo/syntax/base.yml +++ /dev/null @@ -1,285 +0,0 @@ -# COLORS: Foreground Background buri (bold, underlined, reverse ,italic) - -# UI ELEMENTS -ColorColumn: '- cursorLine' -CursorColumn: '- cursorLine' -Conceal: 'darkPurp2' # IDK what these is -Cursor: 'background grey' -CursorIM: '@Cursor' # IDK what this is -CursorLine: '- cursorLine' -CursorLineNr: 'grey2 cursorLine' -Directory: 'cyan' -DiffAdd: 'green visualSel' -DiffChange: 'orange visualSel' -DiffDelete: 'red visualSel' -DiffText: 'yellow visualSel' -EndOfBuffer: 'darkPurp background' -TermCursor: '@Cursor' -#TermCursorNC: '' -ErrorMsg: 'red' -VertSplit: 'pureBlack pureBlack' -Folded: 'darkPurp2 background' -FoldColumn: 'darkPurp background' -SignColumn: 'darkPurp background' -IncSearch: 'pureWhite darkPurp' -#Substitute: '' -LineNr: 'darkPurp background' -MatchParen: 'pureWhite darkPurp' -ModeMsg: 'purple' -#MsgArea: '' -#MsgSeparator: '' -MoreMsg: 'purple' -NonText: '@EndOfBuffer' -#NormalFloat: '' -#NormalNC: '' -Pmenu: 'foreground visualSel' -PmenuSel: 'pureWhite darkPurp' -PmenuSbar: '- darkPurp' -PmenuThumb: '- darkPurp2' -Question: 'purple' -QuickFixLine: 'foreground cursorLine' -Search: 'pureWhite darkPurp2' -SpecialKey: 'orange background' -SpellBad: 'red - u' -SpellLocal: 'foreground - u' -SpellCap: 'green - u' -SpellRare: 'yellow - u' -StatusLine: 'foreground background r' -StatusLineTerm: '@StatusLine' -StatusLineTermNC: 'pureBlack darkPurp r' -StatusLineNC: '@StatusLineTermNC' -TabLine: 'foreground background' -TabLineFill: 'darkPurp2 background' -TabLineSel: 'purple background' -Visual: '- visualSel' -VisualNOS: '@Visual' -WarningMsg: 'orange background' -WildMenu: 'pureBlack grey2' -Whitespace: '@EndOfBuffer' -diffAdded: 'purple -' -diffRemoved: 'red -' - -#Gui -#Menu: '' -#Scrollbar: '' -#Tooltip: '' - -# BASE SYNTAX -Normal: 'foreground background' -Comment: 'darkPurp' # 1 -Constant: 'yellow' # 2 -Identifier: 'cyan' # 3 -Statement: 'green' # 4 -PreProc: 'purple' # 5 -Type: 'magenta' # 6 -Special: 'purple' # 7 -Underlined: 'green - u' # 8 -Error: 'red' # 9 -Ignore: 'red' -Delimiter: 'foreground' -Operator: 'magenta' -Tag: 'purple' -Debug: 'purple' -StorageClass: 'purple' -String: 'cyan' -Structure: 'cyan' -Typedef: 'cyan' -Function: 'green' -Include: 'green' -Label: 'green' -Exception: 'orange' -Keyword: 'orange' -SpecialChar: 'orange' -Boolean: 'yellow' -Character: 'yellow' -Float: 'yellow' -Number: 'yellow' -Conditional: 'green' -Repeat: 'green' -Title: 'purple2' -Define: 'purple2' -Macro: 'purple2' -PreCondit: 'purple2' -SpecialComment: '@Comment' -Todo: 'pureWhite darkPurp2 u' - -# LANGUAGE SPECIFICS -# C -cFormat: '@Title' -cCppOutIf1: '@Normal' -cCppOutIf2: '@Normal' -cBracket: '@Title' -#cOperator: '@Type' - -# C++ - -# CSS -cssBraces: '@Normal' -cssSelectorOp: 'magenta' - -# Fortran -fortranType: '@Tag' -fortranStructure: '@Structure' -fortranStorageClass: '@StorageClass' -fortranUnitHeader: '@Title' - -# Haskell -haskellType: '@Tag' -haskellIdentifier: '@Label' -haskellKeyword: '@Boolean' -haskellDecl: '@Boolean' -#haskellDelimeter: '@Operator' -#haskellOperators: '@Title' - -# HTML -htmlTagName: '@Function' -htmlEndTag: '@Conditional' -htmlArg: '@Tag' -htmlSpecialTagName: '@Type' - -# Java -javaClassDecl: '@Structure' -javaTypeDef: '@Keyword' - -# Javascript -jsStorageClass: '@Title' -jsFunction: '@Function' -jsFuncName: '@Special' -jsOperator: '@Operator' -jsNull: '@Constant' -jsGlobalObjects: '@Constant' -jsFuncCall: '@Function' -jsOperatorKeyword: '@Operator' -jsExceptions: '@Error' -jsObjectProp: '@Tag' -jsTernaryIfOperator: '@Title' -jsTemplateBraces: '@Title' -jsTemplateExpression: '@String' - -# lAtEx -texTypeStyle: '@Special' - -# Markdown -mkdDelimiter: '@Normal' - -# PHP -#phpInclude: '@Conditional' -phpFunction: '@Function' -phpMethod: '@Function' -phpType: '@Constant' -#phpKeyword: '@Constant' -#phpMemberSelector: '@Title' -#phpVarSelector: '@String' -#phpIdentifier: '@String' -phpStringSingle: '@String' -phpStringDouble: '@String' - -# Python -pythonOperator: 'magenta' - -# Ruby -rubyConstant: '@Constant' -rubyDefine: '@Define' -rubyMethodName: '@Function' -rubyInstanceVariable: '@Tag' -rubyKeywordAsMethod: '@Tag' - -# Typescript -typescriptProp: '@Tag' -typescriptVariable: '@Title' -jsxTagName: '@HTMLTagName' -jsxComponentName: '@Tag' -jsxOpenPunct: '@jsxTagName' -jsxClosePunct: '@jsxOpenPunct' -jsxCloseString: '@jsxClosePunct' -typescriptBraces: '@Normal' -typescriptArrowFunc: 'magenta' -typescriptNumberStaticMethod: '@Function' -typescriptNumberMethod: '@Function' -typescriptStringStaticMethod: '@Function' -typescriptStringMethod: '@Function' -typescriptArrayStaticMethod: '@Function' -typescriptArrayMethod: '@Function' -typescriptObjectStaticMethod: '@Function' -typescriptObjectMethod: '@Function' -typescriptSymbolStaticMethod: '@Function' -typescriptFunctionMethod: '@Function' -typescriptMathStaticMethod: '@Function' -typescriptDateStaticMethod: '@Function' -typescriptDateMethod: '@Function' -typescriptJSONStaticMethod: '@Function' -typescriptRegExpMethod: '@Function' -typescriptES6MapMethod: '@Function' -typescriptES6SetMethod: '@Function' -typescriptPromiseStaticMethod: '@Function' -typescriptPromiseMethod: '@Function' -typescriptReflectMethod: '@Function' -typescriptIntlMethod: '@Function' -typescriptBOMNavigatorMethod: '@Function' -typescriptServiceWorkerMethod: '@Function' -typescriptBOMLocationMethod: '@Function' -typescriptBOMHistoryMethod: '@Function' -typescriptConsoleMethod: '@Function' -typescriptXHRMethod: '@Function' -typescriptFileMethod: '@Function' -typescriptFileReaderMethod: '@Function' -typescriptFileListMethod: '@Function' -typescriptBlobMethod: '@Function' -typescriptURLStaticMethod: '@Function' -typescriptSubtleCryptoMethod: '@Function' -typescriptCryptoMethod: '@Function' -typescriptHeadersMethod: '@Function' -typescriptRequestMethod: '@Function' -typescriptResponseMethod: '@Function' -typescriptCacheMethod: '@Function' -typescriptEncodingMethod: '@Function' -typescriptGeolocationMethod: '@Function' -typescriptPaymentMethod: '@Function' -typescriptPaymentResponseMethod: '@Function' -typescriptDOMNodeMethod: '@Function' -typescriptDOMDocMethod: '@Function' -typescriptDOMEventTargetMethod: '@Function' -typescriptDOMEventMethod: '@Function' -typescriptDOMStorageMethod: '@Function' -typescriptDOMFormMethod: '@Function' - - -#Vim -vimGroupName: '@Normal' - -# YAML -yamlKeyValueDelimiter: '@Normal' -yamlBlockMappingKey: '@Function' - -# PLUGINS -#Vista -vistaTag: '@Conditional' -vistaIcon: '@Identifier' -vistaColon: '@Normal' -vistaScope: '@Constant' -vistaKind: '@Conditional' - -# Sneak -Sneak: 'pureBlack yellow' - -# romgrk/barbar support :') -BufferCurrent: 'grey2 background' -BufferVisible: 'darkPurp background' -BufferInactive: 'darkPurp background' -BufferTabpageFill: 'background background' -#INDEX -BufferCurrentIndex: 'green background' -BufferVisibleIndex: 'darkPurp background' -BufferInactiveIndex: 'darkPurp background' -#MOD -BufferCurrentMod: 'orange background' -BufferVisibleMod: 'orange background' -BufferInactiveMod: 'orange background' -#SIGN (Separator between buffers) -BufferCurrentSign: 'green background' -BufferVisibleSign: 'darkPurp background' -BufferInactiveSign: 'darkPurp background' -#TARGET (Letter in bufferpicking mode) -BufferCurrentTarget: 'magenta background' -BufferVisibleTarget: 'magenta background' -BufferInactiveTarget: 'magenta background' From 05d883df7d4a159fe117f8de095ebf3dd20aa039 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 19 Apr 2021 10:55:38 +0900 Subject: [PATCH 06/47] Add additional colors for JavaScript functions and objects. --- colors/spaceduck.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index ed29c38..ad20b71 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -148,6 +148,10 @@ hi link jsObjectProp Tag hi link jsTernaryIfOperator Title hi link jsTemplateBraces Title hi link jsTemplateExpression String +hi jsArrowFunction guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi jsFuncParens guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi jsObjectBraces guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi jsTemplateExpression guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi link jsonQuote Label hi link texTypeStyle Special hi link mkdDelimiter Normal From f7012e4cdba209bf09a81a5692966523d4c9a947 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 19 Apr 2021 10:57:48 +0900 Subject: [PATCH 07/47] Change cursor line, visual, and comments to be more visible. - Cursor line: previous VisualLine - Comments: Purple - Visual: DarkPurple --- colors/spaceduck.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index ad20b71..c2cfaa4 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -32,7 +32,7 @@ hi CursorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm hi Conceal guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Cursor guifg=#0f111b ctermfg=233 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi link CursorIM Cursor -hi CursorLine guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +hi CursorLine guifg=NONE ctermfg=NONE guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE hi Directory guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi DiffAdd guifg=#5ccc96 ctermfg=78 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE @@ -71,7 +71,7 @@ hi StatusLineNC guifg=#0f111b hi TabLine guifg=#000000 ctermfg=0 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi TabLineFill guifg=#818596 ctermfg=102 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi TabLineSel guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Visual guifg=NONE ctermfg=NONE guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE +hi Visual guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi link VisualNOS Visual hi WarningMsg guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi WildMenu guifg=#000000 ctermfg=0 guibg=#c1c3cc ctermbg=251 gui=NONE cterm=NONE @@ -79,7 +79,7 @@ hi link Whitespace EndOfBuffer hi diffAdded guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi diffRemoved guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Comment guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Comment guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Constant guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Identifier guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Statement guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE From 1e3979f1b8e6184af8b1cb47821600f8bfb48a63 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 19 Apr 2021 11:19:42 +0900 Subject: [PATCH 08/47] Fix comment color. --- colors/spaceduck.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 69b8ee9..a7e2f38 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -25,7 +25,7 @@ hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NON hi Boolean guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Character guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi Comment guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi Comment guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Conceal guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Conditional guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Constant guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE From e6df4d8f6a4695bf160a373805a217f7d13558f6 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 19 Apr 2021 17:13:31 +0900 Subject: [PATCH 09/47] Initialize highlight variables for every color; add light mode extensibility. TODO: the DarkPurple color is not implemented yet. Any highlight group requiring a background color or font weight has not been implemented yet. --- colors/spaceduck.vim | 143 ++++++++++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 51 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index a7e2f38..21f29c3 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -12,8 +12,6 @@ " Modified: 2021/03/16 22:28 " License: MIT -set background=dark - hi clear if exists("syntax_on") syntax reset @@ -21,86 +19,125 @@ endif let g:colors_name="spaceduck" +"//////////////////////////// +" +" Spaceduck Colors +" +"//////////////////////////// + +" dark theme and light theme settings +" TODO light theme isn't done yet +if &background == 'dark' + hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + " DarkPurple TODO + hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckCyan guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +elseif &background == 'light' + hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + " DarkPurple TODO + hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckCyan guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +endif + +" +" Syntax Highlighting +" hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Boolean guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Character guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Boolean SpaceduckYellow +hi! link Character SpaceduckYellow hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi Comment guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Conceal guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Conditional guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Constant guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Comment SpaceduckPurple +hi! link Conceal SpaceduckDarkPurple2 +hi! link Conditional SpaceduckGreen +hi! link Constant SpaceduckYellow hi Cursor guifg=#0f111b ctermfg=233 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi CursorLine guifg=NONE ctermfg=NONE guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi Debug guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Define guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Delimiter guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Debug SpaceduckPurple +hi! link Define SpaceduckPurple2 +hi! link Delimiter SpaceduckForeground hi DiffAdd guifg=#5ccc96 ctermfg=78 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffChange guifg=#e39400 ctermfg=172 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffDelete guifg=#e33400 ctermfg=166 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi DiffText guifg=#f2ce00 ctermfg=220 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi Directory guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Directory SpaceduckCyan hi EndOfBuffer guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Error guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi ErrorMsg guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Exception guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Float guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Error SpaceduckRed +hi! link ErrorMsg SpaceduckRed +hi! link Exception SpaceduckOrange +hi! link Float SpaceduckYellow hi FoldColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi Folded guifg=#686f9a ctermfg=60 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Function guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Identifier guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Ignore guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Function SpaceduckGreen +hi! link Identifier SpaceduckCyan +hi! link Ignore SpaceduckRed hi IncSearch guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi Include guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Keyword guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Label guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Include SpaceduckGreen +hi! link Keyword SpaceduckOrange +hi! link Label SpaceduckGreen hi LineNr guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Macro guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Macro SpaceduckPurple2 hi MatchParen guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi ModeMsg guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi MoreMsg guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Number guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Operator guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link ModeMsg SpaceduckPurple +hi! link MoreMsg SpaceduckPurple +hi! link Number SpaceduckYellow +hi! link Operator SpaceduckMagenta hi Pmenu guifg=#ecf0c1 ctermfg=255 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE hi PmenuSbar guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi PmenuSel guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi PmenuThumb guifg=NONE ctermfg=NONE guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE -hi PreCondit guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi PreProc guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Question guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link PreCondit SpaceduckPurple2 +hi! link PreProc SpaceduckPurple +hi! link Question SpaceduckPurple hi QuickFixLine guifg=#ecf0c1 ctermfg=255 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi Repeat guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Repeat SpaceduckGreen hi Search guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE hi SignColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Special guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi SpecialChar guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Special SpaceduckPurple +hi! link SpecialChar SpaceduckOrange hi SpecialKey guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi SpellBad guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellCap guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellRare guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi Statement guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Statement SpaceduckGreen hi StatusLine guifg=#0f111b ctermfg=255 guibg=#0f111b ctermbg=233 gui=reverse cterm=reverse hi StatusLineNC guifg=#0f111b hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse -hi StorageClass guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi String guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Structure guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link StorageClass SpaceduckPurple +hi! link String SpaceduckCyan +hi! link Structure SpaceduckCyan hi TabLine guifg=#000000 ctermfg=0 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE hi TabLineFill guifg=#818596 ctermfg=102 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi TabLineSel guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Tag guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Title guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Tag SpaceduckPurple +hi! link Title SpaceduckPurple2 hi Todo guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=underline cterm=underline -hi Type guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Typedef guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link Type SpaceduckMagenta +hi! link Typedef SpaceduckCyan hi Underlined guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi VertSplit guifg=#000000 ctermfg=0 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE hi Visual guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi WarningMsg guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi WildMenu guifg=#000000 ctermfg=0 guibg=#c1c3cc ctermbg=251 gui=NONE cterm=NONE -hi diffAdded guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi diffRemoved guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link diffAdded SpaceduckPurple +hi! link diffRemoved SpaceduckRed "Link hi link Whitespace EndOfBuffer @@ -114,7 +151,7 @@ hi link cCppOutIf1 Normal hi link cCppOutIf2 Normal hi link cBracket Title hi link cssBraces Normal -hi cssSelectorOp guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link cssSelectorOp SpaceduckMagenta hi link fortranType Tag hi link fortranStructure Structure hi link fortranStorageClass StorageClass @@ -129,6 +166,8 @@ hi link htmlArg Tag hi link htmlSpecialTagName Type hi link javaClassDecl Structure hi link javaTypeDef Keyword + +" JavaScript hi link jsStorageClass Title hi link jsFunction Function hi link jsFuncName Special @@ -142,11 +181,12 @@ hi link jsObjectProp Tag hi link jsTernaryIfOperator Title hi link jsTemplateBraces Title hi link jsTemplateExpression String -hi jsArrowFunction guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi jsFuncParens guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi jsObjectBraces guifg=#b3a1e6 ctermfg=146 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi jsTemplateExpression guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link jsArrowFunction SpaceduckYellow +hi! link jsFuncParens SpaceduckPurple +hi! link jsObjectBraces SpaceduckPurple +hi! link jsTemplateExpression SpaceduckMagenta hi link jsonQuote Label + hi link texTypeStyle Special hi link mkdDelimiter Normal hi link phpFunction Function @@ -155,7 +195,7 @@ hi link phpType Constant hi link phpIdentifier Type hi link phpStringSingle String hi link phpStringDouble String -hi pythonOperator guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link pythonOperator SpaceduckMagenta hi link rubyConstant Constant hi link rubyDefine Define hi link rubyMethodName Function @@ -169,7 +209,7 @@ hi link jsxOpenPunct jsxTagName hi link jsxClosePunct jsxOpenPunct hi link jsxCloseString jsxClosePunct hi link typescriptBraces Normal -hi typescriptArrowFunc guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi! link typescriptArrowFunc SpaceduckMagenta hi link typescriptNumberStaticMethod Function hi link typescriptNumberMethod Function hi link typescriptStringStaticMethod Function @@ -221,7 +261,8 @@ hi link typescriptDOMFormMethod Function hi link vimGroupName Normal hi link yamlKeyValueDelimiter Normal hi link yamlBlockMappingKey Function -"Plugin + +" Plugins hi link vistaTag Conditional hi link vistaIcon Identifier hi link vistaColon Normal From 9420fec19f6abb743c7ccb26973c0f4bd99fd6ca Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 26 Apr 2021 11:23:13 +0900 Subject: [PATCH 10/47] Edit README.md with new correct Visual/Cursor colors. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 40abda3..b4dcdf1 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ _Note: The Syntax color ID's are not an exhaustive & complete list._ | -------------------------------------------------------------------------------------------------------------------------- | ---------------- | --------- | ------------- | --------------- | --------- | -------------------- | | ![Background Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/background.png?raw=true) | Background | `#0f111b` | `230,44,11` | `15, 17, 27` | `233` | Background | | ![Foreground Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/foreground.png?raw=true) | Foreground | `#ecf0c1` | `65,20,94` | `236, 240, 193` | `255` | Foregrond, Delimiter | -| ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#1b1c36` | `238, 50, 21` | `27, 28, 54` | `234` | Visual | -| ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true) | Cursor Line | `#16172d` | `237,51,18` | `22, 23, 45` | `234` | CursorLine | +| ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#30365F` | `232, 49, 37` | `48, 54, 95` | `237` | Visual | +| ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true) | Cursor Line | `#1b1c36` | `238, 50, 21` | `27, 28, 54` | `234` | CursorLine | ## Coloration Colors From 399b6629928f0a848e4b8fa9902053c537a43229 Mon Sep 17 00:00:00 2001 From: Jinho Yoon <40512164+jinh0@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:33:30 +0900 Subject: [PATCH 11/47] Update README.md with old special colors. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index b4dcdf1..25a3aeb 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,14 @@ _Note: The Syntax color ID's are not an exhaustive & complete list._ | ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#30365F` | `232, 49, 37` | `48, 54, 95` | `237` | Visual | | ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true) | Cursor Line | `#1b1c36` | `238, 50, 21` | `27, 28, 54` | `234` | CursorLine | +
Old Special Colors + + | ![Color Picker Boxes](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/eyedropper.png?raw=true) | Palette | Hex | HSV/HSB | RGB | cterm/256 | SYN ID | +| -------------------------------------------------------------------------------------------------------------------------- | ---------------- | --------- | ------------- | --------------- | --------- | -------------------- | + | ![Visual Selection Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/visualSelection.png?raw=true) | Visual Selection | `#1b1c36` | `238, 50, 21` | `27, 28, 54` | `234` | Visual | +| ![Cursor Line Color](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/cursorLine.png?raw=true) | Cursor Line | `#16172d` | `237,51,18` | `22, 23, 45` | `234` | CursorLine | +
+ ## Coloration Colors | ![Color Picker Boxes](https://github.com/pineapplegiant/spaceduck-terminal/blob/main/img/eyedropper.png?raw=true) | Palette | Hex | HSV/HSB | RGB | cterm/256 | SYN ID | From e1b2b58fb33edee7a02c0986888e3878c27bf1d0 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 3 May 2021 14:51:42 +0900 Subject: [PATCH 12/47] Add JavaScript braces colors. ...and other minor changes. --- colors/spaceduck.vim | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 21f29c3..e225821 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -258,7 +258,18 @@ hi link typescriptDOMEventTargetMethod Function hi link typescriptDOMEventMethod Function hi link typescriptDOMStorageMethod Function hi link typescriptDOMFormMethod Function + +hi! link graphqlType Type +hi! link graphqlName SpaceduckGreen +hi! link graphqlVariable String +hi! link graphqlFold SpaceduckPurple +hi! link graphqlTemplateString SpaceduckForeground +hi! link graphqlStructure Define + hi link vimGroupName Normal +hi! link vimLet SpaceduckPurple2 +hi! link vimVar SpaceduckForeground + hi link yamlKeyValueDelimiter Normal hi link yamlBlockMappingKey Function @@ -269,6 +280,8 @@ hi link vistaColon Normal hi link vistaScope Constant hi link vistaKind Conditional hi Sneak guifg=#000000 ctermfg=0 guibg=#f2ce00 ctermbg=220 gui=NONE cterm=NONE + +" Barbar hi BufferCurrent guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferVisible guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferInactive guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE @@ -286,6 +299,16 @@ hi BufferCurrentTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=N hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +" NERDTree +hi! link nerdtreeFileExtensionLabel_js SpaceduckYellow +hi! link nerdtreeFileExtensionIcon_js SpaceduckForeground +hi! link nerdtreeFileExtensionLabel_css SpaceduckMagenta +hi! link nerdtreeFileExtensionLabel_json SpaceduckPurple +hi! link nerdtreeFileExtensionIcon_json SpaceduckPurple2 +hi! link nerdtreeExactMatchFolder_node_modules SpaceduckDarkPurple2 +hi! link nerdtreeExactMatchLabel_.gitignore SpaceduckDarkPurple2 + +" }}} " Neovim uses different terminal colors apart from Vim if has('nvim') From 81c9f0894898ffa44adecd0ad22d8caedd5848bc Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 3 May 2021 14:57:15 +0900 Subject: [PATCH 13/47] Add JavaScript braces colors (and remove NERDTree highlighting). --- colors/spaceduck.vim | 109 +++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 60 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index e225821..fefa4fc 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -9,22 +9,19 @@ " " URL: https://github.com/pineapplegiant/spaceduck " Maintainer: Guillermo Rodriguez -" Modified: 2021/03/16 22:28 +" Modified: 2022/03/16 22:28 " License: MIT +" Initalization {{{ hi clear if exists("syntax_on") syntax reset endif let g:colors_name="spaceduck" +" }}} -"//////////////////////////// -" -" Spaceduck Colors -" -"//////////////////////////// - +" Spaceduck Color Variables {{{ " dark theme and light theme settings " TODO light theme isn't done yet if &background == 'dark' @@ -34,30 +31,16 @@ if &background == 'dark' hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - " DarkPurple TODO + hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckCyan guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - - hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -elseif &background == 'light' - hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - " DarkPurple TODO - hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckCyan guifg=#00a3cc ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE endif +" }}} -" -" Syntax Highlighting -" +" Syntax Highlighting {{{ hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi! link Boolean SpaceduckYellow hi! link Character SpaceduckYellow @@ -83,7 +66,7 @@ hi! link ErrorMsg SpaceduckRed hi! link Exception SpaceduckOrange hi! link Float SpaceduckYellow hi FoldColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Folded guifg=#686f9a ctermfg=60 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi Folded guifg=#686f9a ctermfg=60 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE hi! link Function SpaceduckGreen hi! link Identifier SpaceduckCyan hi! link Ignore SpaceduckRed @@ -132,14 +115,12 @@ hi Todo guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=underline cterm=un hi! link Type SpaceduckMagenta hi! link Typedef SpaceduckCyan hi Underlined guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi VertSplit guifg=#000000 ctermfg=0 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE +hi VertSplit guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi Visual guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE hi WarningMsg guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi WildMenu guifg=#000000 ctermfg=0 guibg=#c1c3cc ctermbg=251 gui=NONE cterm=NONE hi! link diffAdded SpaceduckPurple hi! link diffRemoved SpaceduckRed - -"Link hi link Whitespace EndOfBuffer hi link VisualNOS Visual hi link StatusLineTerm StatusLine @@ -167,7 +148,7 @@ hi link htmlSpecialTagName Type hi link javaClassDecl Structure hi link javaTypeDef Keyword -" JavaScript +" JavaScript {{{ hi link jsStorageClass Title hi link jsFunction Function hi link jsFuncName Special @@ -182,10 +163,21 @@ hi link jsTernaryIfOperator Title hi link jsTemplateBraces Title hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow -hi! link jsFuncParens SpaceduckPurple -hi! link jsObjectBraces SpaceduckPurple +hi! link jsFuncArgs SpaceduckMagenta +hi! link jsFuncParens SpaceduckDarkPurple2 +hi! link jsDestructuringBraces SpaceduckDarkPurple2 +hi! link jsObjectBraces SpaceduckDarkPurple2 +hi! link jsModuleBraces SpaceduckDarkPurple2 hi! link jsTemplateExpression SpaceduckMagenta + +hi link jsxTagName HTMLTagName +hi link jsxComponentName Tag +hi link jsxClosePunct jsxOpenPunct +hi link jsxCloseString jsxClosePunct +hi! link jsxOpenPunct SpaceduckDarkPurple2 + hi link jsonQuote Label +" }}} hi link texTypeStyle Special hi link mkdDelimiter Normal @@ -201,13 +193,10 @@ hi link rubyDefine Define hi link rubyMethodName Function hi link rubyInstanceVariable Tag hi link rubyKeywordAsMethod Tag + +" Typescript hi link typescriptProp Tag hi link typescriptVariable Title -hi link jsxTagName HTMLTagName -hi link jsxComponentName Tag -hi link jsxOpenPunct jsxTagName -hi link jsxClosePunct jsxOpenPunct -hi link jsxCloseString jsxClosePunct hi link typescriptBraces Normal hi! link typescriptArrowFunc SpaceduckMagenta hi link typescriptNumberStaticMethod Function @@ -311,27 +300,27 @@ hi! link nerdtreeExactMatchLabel_.gitignore SpaceduckDarkPurple2 " }}} " Neovim uses different terminal colors apart from Vim - if has('nvim') - let g:terminal_color_foreground = "#ecf0c1" - let g:terminal_color_background = "#0f111b" - let g:terminal_color_0 = "#000000" - let g:terminal_color_1 = "#e33400" - let g:terminal_color_2 = "#5ccc96" - let g:terminal_color_3 = "#b3a1e6" - let g:terminal_color_4 = "#00a3cc" - let g:terminal_color_5 = "#ce6f8f" - let g:terminal_color_6 = "#7a5ccc" - let g:terminal_color_7 = "#686f9a" - let g:terminal_color_8 = "#686f9a" - let g:terminal_color_9 = "#e33400" - let g:terminal_color_10 = "#5ccc96" - let g:terminal_color_11 = "#b3a1e6" - let g:terminal_color_12 = "#00a3cc" - let g:terminal_color_13 = "#ce6f8f" - let g:terminal_color_14 = "#7a5ccc" - let g:terminal_color_15 = "#ecf0c1" - else - let g:terminal_ansi_colors = [ - \ '#000000', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#686f9a', - \ '#686f9a', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#ecf0c1'] +if has('nvim') + let g:terminal_color_foreground = "#ecf0c1" + let g:terminal_color_background = "#0f111b" + let g:terminal_color_0 = "#000000" + let g:terminal_color_1 = "#e33400" + let g:terminal_color_2 = "#5ccc96" + let g:terminal_color_3 = "#b3a1e6" + let g:terminal_color_4 = "#00a3cc" + let g:terminal_color_5 = "#ce6f8f" + let g:terminal_color_6 = "#7a5ccc" + let g:terminal_color_7 = "#686f9a" + let g:terminal_color_8 = "#686f9a" + let g:terminal_color_9 = "#e33400" + let g:terminal_color_10 = "#5ccc96" + let g:terminal_color_11 = "#b3a1e6" + let g:terminal_color_12 = "#00a3cc" + let g:terminal_color_13 = "#ce6f8f" + let g:terminal_color_14 = "#7a5ccc" + let g:terminal_color_15 = "#ecf0c1" +else + let g:terminal_ansi_colors = [ + \ '#000000', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#686f9a', + \ '#686f9a', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#ecf0c1'] endif From b5b4ceb71754fda32c9dd5670e0bcdff9525bba5 Mon Sep 17 00:00:00 2001 From: Jinho Date: Tue, 4 May 2021 12:23:32 +0900 Subject: [PATCH 14/47] Change Comment color and fix git error. --- colors/spaceduck.vim | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index fefa4fc..74a3662 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -45,7 +45,7 @@ hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NON hi! link Boolean SpaceduckYellow hi! link Character SpaceduckYellow hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi! link Comment SpaceduckPurple +hi! Comment guifg=#535F97 guibg=NONE ctermfg=236 ctermbg=NONE hi! link Conceal SpaceduckDarkPurple2 hi! link Conditional SpaceduckGreen hi! link Constant SpaceduckYellow @@ -295,7 +295,6 @@ hi! link nerdtreeFileExtensionLabel_css SpaceduckMagenta hi! link nerdtreeFileExtensionLabel_json SpaceduckPurple hi! link nerdtreeFileExtensionIcon_json SpaceduckPurple2 hi! link nerdtreeExactMatchFolder_node_modules SpaceduckDarkPurple2 -hi! link nerdtreeExactMatchLabel_.gitignore SpaceduckDarkPurple2 " }}} From ae43190bb5eca3986050f58bf32f3f3ec797ba3a Mon Sep 17 00:00:00 2001 From: Nargonath Date: Sun, 23 May 2021 19:13:11 +0200 Subject: [PATCH 15/47] wip: add light theme --- colors/spaceduck.vim | 64 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 74a3662..116db13 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -23,7 +23,31 @@ let g:colors_name="spaceduck" " Spaceduck Color Variables {{{ " dark theme and light theme settings -" TODO light theme isn't done yet +let s:palette = { + \ 'red': ['#e33400', '166'], + \ 'orange': ['#e39400', '172'], + \ 'green': ['#5ccc96', '78'], + \ 'yellow': ['#f2ce00', '220'], + \ 'lavender': ['#b3a1e6', '146'], + \ 'grape': ['#7a5ccc', '98'], + \ 'space': ['#30365F', '237'], + \ 'blueberry': ['#686f9a', '60'], + \ 'cyan': ['#00a3cc', '38'], + \ 'magenta': ['#ce6f8f', '168'], + \ + \ 'deep_space': ['#0f111b', '233'], + \ 'cream': ['#ecf0c1', '255'], + \ 'vision': ['#1b1c36', '234'], + \ 'cursor': ['#16172d', '234'], + \ + \ 'grey': ['#818596', '102'], + \ 'light_grey': ['#818596', '102'], + \ 'white': ['#ffffff', '15'], + \ 'black': ['#000000', '0'], + \ + \ 'none': ['NONE', 'NONE'] + \ } + if &background == 'dark' hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE @@ -37,11 +61,47 @@ if &background == 'dark' hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + let s:palette.bg = s:palette.deep_space + let s:palette.fg = s:palette.cream + +elseif &background == 'light' + hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + + let s:palette.bg = s:palette.cream + let s:palette.fg = s:palette.deep_space + endif " }}} +" +" Highlight function {{{ +function! s:hi(group, fg, bg, ...) + let hl_string = [ + \ 'highlight', a:group, + \ 'guifg=' . a:fg[0], + \ 'guibg=' . a:bg[0], + \ 'ctermfg=' . a:fg[1], + \ 'ctermbg=' . a:bg[1], + \ ] + + execute join(hl_string, ' ') +endfunction +" }}} " Syntax Highlighting {{{ -hi Normal guifg=#ecf0c1 ctermfg=255 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +call s:hi('Normal', s:palette.fg, s:palette.bg) + hi! link Boolean SpaceduckYellow hi! link Character SpaceduckYellow hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE From d97d32e5b1b27180b883bfb8eb6dc97ec0375646 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 31 May 2021 09:44:48 +0900 Subject: [PATCH 16/47] style: group syntax by language --- colors/spaceduck.vim | 126 +++++++++++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 41 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 74a3662..5eaac09 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -22,22 +22,21 @@ let g:colors_name="spaceduck" " }}} " Spaceduck Color Variables {{{ -" dark theme and light theme settings -" TODO light theme isn't done yet -if &background == 'dark' - hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -endif +"hi SpaceduckMint guifg=#ffee52 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE +hi SpaceduckMint guifg=#ffe042 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE + +hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE " }}} " Syntax Highlighting {{{ @@ -100,7 +99,7 @@ hi SpellCap guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi SpellRare guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=underline cterm=underline hi! link Statement SpaceduckGreen -hi StatusLine guifg=#0f111b ctermfg=255 guibg=#0f111b ctermbg=233 gui=reverse cterm=reverse +hi StatusLine guifg=#0f111b ctermfg=255 guibg=#ecf0c1 ctermbg=233 gui=reverse cterm=reverse hi StatusLineNC guifg=#0f111b hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse hi! link StorageClass SpaceduckPurple @@ -127,26 +126,45 @@ hi link StatusLineTerm StatusLine hi link NonText EndOfBuffer hi link SpecialComment Comment hi link TermCursor Cursor + +" C / C++ {{{ hi link cFormat Title hi link cCppOutIf1 Normal hi link cCppOutIf2 Normal hi link cBracket Title -hi link cssBraces Normal -hi! link cssSelectorOp SpaceduckMagenta +" }}} + +" Fortran {{{ hi link fortranType Tag hi link fortranStructure Structure hi link fortranStorageClass StorageClass hi link fortranUnitHeader Title +" }}} + +" Haskell {{{ hi link haskellType Tag hi link haskellIdentifier Label hi link haskellKeyword Boolean hi link haskellDecl Boolean +" }}} + +" Java {{{ +hi link javaClassDecl Structure +hi link javaTypeDef Keyword +" }}} + +" HTML {{{ hi link htmlTagName Function hi link htmlEndTag Conditional hi link htmlArg Tag hi link htmlSpecialTagName Type -hi link javaClassDecl Structure -hi link javaTypeDef Keyword +" }}} + +" CSS {{{ +hi link cssBraces Normal +hi! link cssSelectorOp SpaceduckMagenta +" }}} + " JavaScript {{{ hi link jsStorageClass Title @@ -164,35 +182,46 @@ hi link jsTemplateBraces Title hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow hi! link jsFuncArgs SpaceduckMagenta -hi! link jsFuncParens SpaceduckDarkPurple2 +hi! link jsFuncParens SpaceduckPurple hi! link jsDestructuringBraces SpaceduckDarkPurple2 hi! link jsObjectBraces SpaceduckDarkPurple2 hi! link jsModuleBraces SpaceduckDarkPurple2 +hi! link jsBrackets SpaceduckDarkPurple2 hi! link jsTemplateExpression SpaceduckMagenta hi link jsxTagName HTMLTagName -hi link jsxComponentName Tag hi link jsxClosePunct jsxOpenPunct hi link jsxCloseString jsxClosePunct hi! link jsxOpenPunct SpaceduckDarkPurple2 +hi! link jsxComponentName SpaceduckPurple + +hi link jsClassKeyword SpaceduckPurple2 +hi link jsClassDefinition SpaceduckYellow +hi link jsClassFuncName SpaceduckGreen +hi link jsObjectProp SpaceduckMagenta +hi link jsThis SpaceduckYellow +hi link jsFunction SpaceduckPurple2 +hi link jsFuncName SpaceduckGreen hi link jsonQuote Label " }}} +" Others {{{ hi link texTypeStyle Special hi link mkdDelimiter Normal -hi link phpFunction Function -hi link phpMethod Function -hi link phpType Constant -hi link phpIdentifier Type -hi link phpStringSingle String -hi link phpStringDouble String +" }}} + +" Python TODO {{{ hi! link pythonOperator SpaceduckMagenta +" }}} + +" Ruby {{{ hi link rubyConstant Constant hi link rubyDefine Define hi link rubyMethodName Function hi link rubyInstanceVariable Tag hi link rubyKeywordAsMethod Tag +" }}} " Typescript hi link typescriptProp Tag @@ -248,21 +277,27 @@ hi link typescriptDOMEventMethod Function hi link typescriptDOMStorageMethod Function hi link typescriptDOMFormMethod Function +" GraphQL {{{ hi! link graphqlType Type hi! link graphqlName SpaceduckGreen hi! link graphqlVariable String hi! link graphqlFold SpaceduckPurple hi! link graphqlTemplateString SpaceduckForeground hi! link graphqlStructure Define +" }}} +" YAML {{{ +hi link yamlKeyValueDelimiter Normal +hi link yamlBlockMappingKey Function +" }}} +" +" VIM {{{ hi link vimGroupName Normal hi! link vimLet SpaceduckPurple2 hi! link vimVar SpaceduckForeground +" }}} -hi link yamlKeyValueDelimiter Normal -hi link yamlBlockMappingKey Function - -" Plugins +" Plugins {{{ hi link vistaTag Conditional hi link vistaIcon Identifier hi link vistaColon Normal @@ -271,9 +306,9 @@ hi link vistaKind Conditional hi Sneak guifg=#000000 ctermfg=0 guibg=#f2ce00 ctermbg=220 gui=NONE cterm=NONE " Barbar -hi BufferCurrent guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisible guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactive guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi BufferCurrent guifg=#ecf0c1 ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi BufferVisible guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi BufferInactive guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferTabpageFill guifg=#0f111b ctermfg=233 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferCurrentIndex guifg=#5ccc96 ctermfg=78 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferVisibleIndex guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE @@ -289,15 +324,23 @@ hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=N hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE " NERDTree -hi! link nerdtreeFileExtensionLabel_js SpaceduckYellow -hi! link nerdtreeFileExtensionIcon_js SpaceduckForeground -hi! link nerdtreeFileExtensionLabel_css SpaceduckMagenta -hi! link nerdtreeFileExtensionLabel_json SpaceduckPurple -hi! link nerdtreeFileExtensionIcon_json SpaceduckPurple2 -hi! link nerdtreeExactMatchFolder_node_modules SpaceduckDarkPurple2 +" hi! link nerdtreeFileExtensionLabel_json SpaceduckPurple +" hi! link nerdtreeFileExtensionIcon_json SpaceduckPurple2 +" hi! link nerdtreeFileExtensionLabel_css SpaceduckMagenta +" hi! link nerdtreeFileExtensionLabel_js SpaceduckGreen +" hi! link nerdtreeFileExtensionIcon_js SpaceduckGreen +" hi! link nerdtreeExactMatchFolder_node_modules SpaceduckDarkPurple2 +hi! link NERDTreeFlags SpaceduckCyan + +hi! link FernRootText SpaceduckPurple + +highlight default CocHighlightText guibg=#1b1c36 " }}} +" }}} + +" Terminal colors VIM / NeoVIM {{{ " Neovim uses different terminal colors apart from Vim if has('nvim') let g:terminal_color_foreground = "#ecf0c1" @@ -323,3 +366,4 @@ else \ '#000000', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#686f9a', \ '#686f9a', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#ecf0c1'] endif +" }}} From 62c4337a88d48b07610860f3cf39e57df9ea6538 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 31 May 2021 09:45:50 +0900 Subject: [PATCH 17/47] feat: improve php syntax highlight --- colors/spaceduck.vim | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 5eaac09..e66fcab 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -165,6 +165,20 @@ hi link cssBraces Normal hi! link cssSelectorOp SpaceduckMagenta " }}} +" php {{{ +hi link phpFunction Function +hi link phpKeyword Function +hi link phpMethod Function +hi link phpClass SpaceduckYellow +hi link phpType SpaceduckPurple2 +hi link phpIdentifier SpaceduckForeground +hi link phpVarSelector SpaceduckDarkPurple2 +hi link phpParent SpaceduckForeground +hi link phpSuperglobals SpaceduckMagenta +hi link Delimiter SpaceduckPurple +hi link phpStringSingle String +hi link phpStringDouble String +" }}} " JavaScript {{{ hi link jsStorageClass Title From c4bc743655acd382d6e0f3c09fcbf71d87bf0ffa Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 31 May 2021 09:48:03 +0900 Subject: [PATCH 18/47] fix: fix inconsistencies between JS/TS --- colors/spaceduck.vim | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index e66fcab..434f0df 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -237,7 +237,7 @@ hi link rubyInstanceVariable Tag hi link rubyKeywordAsMethod Tag " }}} -" Typescript +" Typescript {{{ hi link typescriptProp Tag hi link typescriptVariable Title hi link typescriptBraces Normal @@ -291,6 +291,28 @@ hi link typescriptDOMEventMethod Function hi link typescriptDOMStorageMethod Function hi link typescriptDOMFormMethod Function +hi link typescriptPredefinedType SpaceduckYellow +hi link typescriptAliasKeyword Define +hi link typescriptBinaryOp Operator +hi link typescriptOperator Operator +hi link typescriptGlobal Constant +hi link typescriptExceptions Statement +hi link typescriptIdentifierName SpaceduckGreen +hi link typescriptAssign Operator +hi link typescriptFuncComma SpaceduckForeground +hi link typescriptFuncKeyword Define +hi link typescriptInterfaceKeyword Define + +hi link typescriptCall SpaceduckMagenta +hi link typescriptAliasDeclaration SpaceduckPurple +hi link typescriptTypeReference SpaceduckPurple +hi link typescriptInterfaceName SpaceduckPurple + +hi link typescriptDOMFormProp SpaceduckMagenta +hi link typescriptNodeGlobal SpaceduckYellow +hi link typescriptProp SpaceduckMagenta +" }}} + " GraphQL {{{ hi! link graphqlType Type hi! link graphqlName SpaceduckGreen From da7c7ac01fb1962adb7d9a480931ae14c953b198 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 31 May 2021 10:30:59 +0900 Subject: [PATCH 19/47] feat: add gui= and cterm= flags --- colors/spaceduck.vim | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 116db13..6f0fde5 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -37,8 +37,8 @@ let s:palette = { \ \ 'deep_space': ['#0f111b', '233'], \ 'cream': ['#ecf0c1', '255'], - \ 'vision': ['#1b1c36', '234'], - \ 'cursor': ['#16172d', '234'], + \ 'selection': ['#30365F', '237'], + \ 'cursor': ['#1b1c36', '234'], \ \ 'grey': ['#818596', '102'], \ 'light_grey': ['#818596', '102'], @@ -64,8 +64,10 @@ if &background == 'dark' let s:palette.bg = s:palette.deep_space let s:palette.fg = s:palette.cream +endif -elseif &background == 'light' +" I don't want anyone accidentally stumbling on this just yet +if exists('g:spaceduck_dev_light_theme') hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE @@ -79,12 +81,12 @@ elseif &background == 'light' hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - let s:palette.bg = s:palette.cream + let s:palette.bg = s:palette.white let s:palette.fg = s:palette.deep_space endif " }}} -" + " Highlight function {{{ function! s:hi(group, fg, bg, ...) let hl_string = [ @@ -93,6 +95,8 @@ function! s:hi(group, fg, bg, ...) \ 'guibg=' . a:bg[0], \ 'ctermfg=' . a:fg[1], \ 'ctermbg=' . a:bg[1], + \ 'gui=' . (a:0 >= 1 ? a:1 : 'NONE'), + \ 'cterm=' . (a:0 >= 1 ? a:1 : 'NONE') \ ] execute join(hl_string, ' ') @@ -110,7 +114,7 @@ hi! link Conceal SpaceduckDarkPurple2 hi! link Conditional SpaceduckGreen hi! link Constant SpaceduckYellow hi Cursor guifg=#0f111b ctermfg=233 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE -hi CursorLine guifg=NONE ctermfg=NONE guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE +call s:hi('CursorLine', s:palette.none, s:palette.cursor) hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE hi! link Debug SpaceduckPurple hi! link Define SpaceduckPurple2 From 095047894832032da0c7e1406ba54990e0dfd82b Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 31 May 2021 15:51:22 +0900 Subject: [PATCH 20/47] fix: fix white background for light theme --- colors/spaceduck.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 5689e53..0c958dc 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -81,7 +81,7 @@ if exists('g:spaceduck_dev_light_theme') hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - let s:palette.bg = s:palette.white + let s:palette.bg = s:palette.cream let s:palette.fg = s:palette.deep_space endif From 45a31cc727c1fb4c1d2fa6152d2708b0a9456929 Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 5 Jun 2021 18:20:16 +0900 Subject: [PATCH 21/47] refactor: use local highlight function for general syntax --- colors/spaceduck.vim | 287 +++++++++++++++++++++++-------------------- 1 file changed, 155 insertions(+), 132 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 0c958dc..08652f6 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -21,70 +21,32 @@ endif let g:colors_name="spaceduck" " }}} -" Spaceduck Color Variables {{{ -" dark theme and light theme settings +" PALETTE: {{{ let s:palette = { \ 'red': ['#e33400', '166'], \ 'orange': ['#e39400', '172'], \ 'green': ['#5ccc96', '78'], \ 'yellow': ['#f2ce00', '220'], \ 'lavender': ['#b3a1e6', '146'], - \ 'grape': ['#7a5ccc', '98'], - \ 'space': ['#30365F', '237'], - \ 'blueberry': ['#686f9a', '60'], - \ 'cyan': ['#00a3cc', '38'], + \ 'purple2': ['#7a5ccc', '98'], + \ 'darkpurple': ['#30365F', '237'], + \ 'darkpurple2': ['#686f9a', '60'], + \ 'cyan': ['#59c2ff', '38'], \ 'magenta': ['#ce6f8f', '168'], \ \ 'deep_space': ['#0f111b', '233'], \ 'cream': ['#ecf0c1', '255'], \ 'selection': ['#30365F', '237'], \ 'cursor': ['#1b1c36', '234'], + \ 'comment': ['#535f97', '236'], \ \ 'grey': ['#818596', '102'], - \ 'light_grey': ['#818596', '102'], + \ 'light_grey': ['#c1c3cc', '102'], \ 'white': ['#ffffff', '15'], \ 'black': ['#000000', '0'], \ \ 'none': ['NONE', 'NONE'] \ } - -if &background == 'dark' - hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - - hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - - let s:palette.bg = s:palette.deep_space - let s:palette.fg = s:palette.cream -endif - -" I don't want anyone accidentally stumbling on this just yet -if exists('g:spaceduck_dev_light_theme') - hi SpaceduckRed guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckOrange guifg=#e39400 ctermfg=172 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckGreen guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckYellow guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple guifg=#b3a1e6 ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckPurple2 guifg=#7a5ccc ctermfg=98 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckDarkPurple2 guifg=#686f9a ctermfg=60 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckCyan guifg=#59c2ff ctermfg=38 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - hi SpaceduckMagenta guifg=#ce6f8f ctermfg=168 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - - hi SpaceduckForeground guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE - - let s:palette.bg = s:palette.cream - let s:palette.fg = s:palette.deep_space - -endif " }}} " Highlight function {{{ @@ -103,94 +65,155 @@ function! s:hi(group, fg, bg, ...) endfunction " }}} +" Spaceduck Color Variables {{{ +" dark theme and light theme settings +if &background == 'dark' + call s:hi('SpaceduckRed', s:palette.red, s:palette.none) + call s:hi('SpaceduckOrange', s:palette.orange, s:palette.none) + call s:hi('SpaceduckGreen', s:palette.green, s:palette.none) + call s:hi('SpaceduckYellow', s:palette.yellow, s:palette.none) + call s:hi('SpaceduckPurple', s:palette.lavender, s:palette.none) + call s:hi('SpaceduckPurple2', s:palette.purple2, s:palette.none) + call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) + call s:hi('SpaceduckDarkPurple2', s:palette.darkpurple2, s:palette.none) + call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) + call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) + + call s:hi('SpaceduckForeground', s:palette.cream, s:palette.none) + call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) + + call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) + + let s:palette.bg = s:palette.deep_space + let s:palette.fg = s:palette.cream +endif + +" I don't want anyone accidentally stumbling on this just yet +if exists('g:spaceduck_dev_light_theme') + call s:hi('SpaceduckRed', s:palette.red, s:palette.none) + call s:hi('SpaceduckOrange', s:palette.orange, s:palette.none) + call s:hi('SpaceduckGreen', s:palette.green, s:palette.none) + call s:hi('SpaceduckYellow', s:palette.yellow, s:palette.none) + call s:hi('SpaceduckPurple', s:palette.lavender, s:palette.none) + call s:hi('SpaceduckPurple2', s:palette.purple2, s:palette.none) + call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) + call s:hi('SpaceduckDarkPurple2', s:palette.darkpurple2, s:palette.none) + call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) + call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) + + call s:hi('SpaceduckForeground', s:palette.cream, s:palette.none) + call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) + + let s:palette.bg = s:palette.cream + let s:palette.fg = s:palette.deep_space +endif +" }}} + " Syntax Highlighting {{{ -call s:hi('Normal', s:palette.fg, s:palette.bg) - -hi! link Boolean SpaceduckYellow -hi! link Character SpaceduckYellow -hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi! Comment guifg=#535F97 guibg=NONE ctermfg=236 ctermbg=NONE -hi! link Conceal SpaceduckDarkPurple2 -hi! link Conditional SpaceduckGreen -hi! link Constant SpaceduckYellow -hi Cursor guifg=#0f111b ctermfg=233 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE -call s:hi('CursorLine', s:palette.none, s:palette.cursor) -hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi! link Debug SpaceduckPurple -hi! link Define SpaceduckPurple2 -hi! link Delimiter SpaceduckForeground -hi DiffAdd guifg=#5ccc96 ctermfg=78 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi DiffChange guifg=#e39400 ctermfg=172 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi DiffDelete guifg=#e33400 ctermfg=166 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi DiffText guifg=#f2ce00 ctermfg=220 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi! link Directory SpaceduckCyan -hi EndOfBuffer guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi! link Error SpaceduckRed -hi! link ErrorMsg SpaceduckRed -hi! link Exception SpaceduckOrange -hi! link Float SpaceduckYellow -hi FoldColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi Folded guifg=#686f9a ctermfg=60 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi! link Function SpaceduckGreen -hi! link Identifier SpaceduckCyan -hi! link Ignore SpaceduckRed -hi IncSearch guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi! link Include SpaceduckGreen -hi! link Keyword SpaceduckOrange -hi! link Label SpaceduckGreen -hi LineNr guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi! link Macro SpaceduckPurple2 -hi MatchParen guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi! link ModeMsg SpaceduckPurple -hi! link MoreMsg SpaceduckPurple -hi! link Number SpaceduckYellow -hi! link Operator SpaceduckMagenta -hi Pmenu guifg=#ecf0c1 ctermfg=255 guibg=#1b1c36 ctermbg=234 gui=NONE cterm=NONE -hi PmenuSbar guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi PmenuSel guifg=#ffffff ctermfg=15 guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi PmenuThumb guifg=NONE ctermfg=NONE guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE -hi! link PreCondit SpaceduckPurple2 -hi! link PreProc SpaceduckPurple -hi! link Question SpaceduckPurple -hi QuickFixLine guifg=#ecf0c1 ctermfg=255 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -hi! link Repeat SpaceduckGreen -hi Search guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=NONE cterm=NONE -hi SignColumn guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi! link Special SpaceduckPurple -hi! link SpecialChar SpaceduckOrange -hi SpecialKey guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi SpellBad guifg=#e33400 ctermfg=166 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi SpellCap guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi SpellLocal guifg=#ecf0c1 ctermfg=255 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi SpellRare guifg=#f2ce00 ctermfg=220 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi! link Statement SpaceduckGreen -hi StatusLine guifg=#0f111b ctermfg=255 guibg=#ecf0c1 ctermbg=233 gui=reverse cterm=reverse -hi StatusLineNC guifg=#0f111b -hi StatusLineTermNC guifg=#000000 ctermfg=0 guibg=#30365F ctermbg=237 gui=reverse cterm=reverse -hi! link StorageClass SpaceduckPurple -hi! link String SpaceduckCyan -hi! link Structure SpaceduckCyan -hi TabLine guifg=#000000 ctermfg=0 guibg=#818596 ctermbg=102 gui=NONE cterm=NONE -hi TabLineFill guifg=#818596 ctermfg=102 guibg=#000000 ctermbg=0 gui=NONE cterm=NONE -hi TabLineSel guifg=#c1c3cc ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi! link Tag SpaceduckPurple -hi! link Title SpaceduckPurple2 -hi Todo guifg=#ffffff ctermfg=15 guibg=#686f9a ctermbg=60 gui=underline cterm=underline -hi! link Type SpaceduckMagenta -hi! link Typedef SpaceduckCyan -hi Underlined guifg=#5ccc96 ctermfg=78 guibg=NONE ctermbg=NONE gui=underline cterm=underline -hi VertSplit guifg=#30365F ctermfg=237 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE -hi Visual guifg=NONE ctermfg=NONE guibg=#30365F ctermbg=237 gui=NONE cterm=NONE -hi WarningMsg guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi WildMenu guifg=#000000 ctermfg=0 guibg=#c1c3cc ctermbg=251 gui=NONE cterm=NONE -hi! link diffAdded SpaceduckPurple -hi! link diffRemoved SpaceduckRed -hi link Whitespace EndOfBuffer -hi link VisualNOS Visual -hi link StatusLineTerm StatusLine -hi link NonText EndOfBuffer -hi link SpecialComment Comment -hi link TermCursor Cursor +call s:hi('Normal', s:palette.fg, s:palette.bg ) +call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) +call s:hi('CursorLine', s:palette.none, s:palette.cursor ) +call s:hi('Cursor', s:palette.deep_space, s:palette.grey ) +call s:hi('CursorLineNr', s:palette.light_grey, s:palette.cursor ) + +call s:hi('DiffAdd', s:palette.green, s:palette.cursor ) +call s:hi('DiffChange', s:palette.orange, s:palette.cursor ) +call s:hi('DiffDelete', s:palette.red, s:palette.cursor ) +call s:hi('DiffText', s:palette.yellow, s:palette.cursor ) + +call s:hi('EndOfBuffer', s:palette.selection, s:palette.deep_space ) +call s:hi('FoldColumn', s:palette.selection, s:palette.deep_space ) +call s:hi('Folded', s:palette.darkpurple2, s:palette.cursor ) +call s:hi('IncSearch', s:palette.white, s:palette.selection ) +call s:hi('LineNr', s:palette.selection, s:palette.deep_space ) +call s:hi('MatchParen', s:palette.white, s:palette.darkpurple ) + +call s:hi('Pmenu', s:palette.fg, s:palette.cursor ) +call s:hi('PmenuSbar', s:palette.none, s:palette.darkpurple ) +call s:hi('PmenuSel', s:palette.white, s:palette.darkpurple ) +call s:hi('PmenuThumb', s:palette.none, s:palette.darkpurple2 ) + +call s:hi('QuickFixLine', s:palette.fg, s:palette.cursor ) +call s:hi('Search', s:palette.white, s:palette.darkpurple2 ) +call s:hi('SignColumn', s:palette.orange, s:palette.bg ) +call s:hi('SpecialKey', s:palette.orange, s:palette.bg ) +call s:hi('SpellBad', s:palette.red, s:palette.none, 'underline') +call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') +call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') + +call s:hi('StatusLine', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLineNC', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLineTermNC', s:palette.black, s:palette.darkpurple, 'reverse' ) +call s:hi('TabLine', s:palette.black, s:palette.grey ) +call s:hi('TabLineFill', s:palette.grey, s:palette.black ) +call s:hi('TabLineSel', s:palette.light_grey, s:palette.deep_space ) +call s:hi('VertSplit', s:palette.darkpurple, s:palette.none ) +call s:hi('Visual', s:palette.none, s:palette.darkpurple ) +call s:hi('WarningMsg', s:palette.orange, s:palette.deep_space ) +call s:hi('WildMenu', s:palette.black, s:palette.light_grey ) + +" These groups seem to use the old cursorline color +" +" hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +" hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +" hi Folded guifg=#686f9a ctermfg=60 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +" hi QuickFixLine guifg=#ecf0c1 ctermfg=255 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE + +" SYNTAX: Predefined syntax groups {{{ +hi! link Comment SpaceduckComment +hi! link Boolean SpaceduckYellow +hi! link Character SpaceduckYellow +hi! link Conditional SpaceduckGreen +hi! link Constant SpaceduckYellow +hi! link Debug SpaceduckPurple +hi! link Define SpaceduckPurple2 +hi! link Delimiter SpaceduckForeground +hi! link Error SpaceduckRed +hi! link Exception SpaceduckOrange +hi! link Float SpaceduckYellow +hi! link Function SpaceduckGreen +hi! link Identifier SpaceduckCyan +hi! link Ignore SpaceduckRed +hi! link Include SpaceduckGreen +hi! link Keyword SpaceduckOrange +hi! link Label SpaceduckGreen +hi! link Macro SpaceduckPurple2 +hi! link Number SpaceduckYellow +hi! link Operator SpaceduckMagenta +hi! link PreCondit SpaceduckPurple2 +hi! link PreProc SpaceduckPurple +hi! link Repeat SpaceduckGreen +hi! link Special SpaceduckPurple +hi! link SpecialChar SpaceduckOrange +hi! link Statement SpaceduckGreen +hi! link StorageClass SpaceduckPurple +hi! link String SpaceduckCyan +hi! link Structure SpaceduckCyan +hi! link SpecialComment Comment +hi! link Tag SpaceduckPurple +hi! link Type SpaceduckMagenta +hi! link Typedef SpaceduckCyan + +" TODO: better todo +call s:hi('Todo', s:palette.white, s:palette.cursor, 'underline') +call s:hi('Underlined', s:palette.green, s:palette.none, 'underline') +" }}} + +hi! link Conceal SpaceduckDarkPurple2 +hi! link Directory SpaceduckCyan +hi! link ErrorMsg SpaceduckRed +hi! link ModeMsg SpaceduckPurple +hi! link MoreMsg SpaceduckPurple +hi! link Question SpaceduckPurple +hi! link Title SpaceduckPurple2 + +hi! link diffAdded SpaceduckPurple +hi! link diffRemoved SpaceduckRed +hi! link Whitespace EndOfBuffer +hi! link VisualNOS Visual +hi! link StatusLineTerm StatusLine +hi! link NonText EndOfBuffer +hi! link TermCursor Cursor " C / C++ {{{ hi link cFormat Title From 121789bdb9a1c7eaad294a9487e29bf452082036 Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 5 Jun 2021 18:21:20 +0900 Subject: [PATCH 22/47] fix: add more Javascript/Typescript highlight groups --- colors/spaceduck.vim | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 08652f6..0ae7547 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -296,16 +296,19 @@ hi link jsxClosePunct jsxOpenPunct hi link jsxCloseString jsxClosePunct hi! link jsxOpenPunct SpaceduckDarkPurple2 hi! link jsxComponentName SpaceduckPurple +hi! link jsxTag SpaceduckPurple hi link jsClassKeyword SpaceduckPurple2 hi link jsClassDefinition SpaceduckYellow hi link jsClassFuncName SpaceduckGreen hi link jsObjectProp SpaceduckMagenta +hi link jsObjectKey SpaceduckGreen hi link jsThis SpaceduckYellow hi link jsFunction SpaceduckPurple2 hi link jsFuncName SpaceduckGreen hi link jsonQuote Label +hi link jsoncBraces SpaceduckDarkPurple2 " }}} " Others {{{ @@ -326,9 +329,8 @@ hi link rubyKeywordAsMethod Tag " }}} " Typescript {{{ -hi link typescriptProp Tag hi link typescriptVariable Title -hi link typescriptBraces Normal +hi link typescriptBraces SpaceduckDarkPurple2 hi! link typescriptArrowFunc SpaceduckMagenta hi link typescriptNumberStaticMethod Function hi link typescriptNumberMethod Function @@ -385,20 +387,30 @@ hi link typescriptBinaryOp Operator hi link typescriptOperator Operator hi link typescriptGlobal Constant hi link typescriptExceptions Statement -hi link typescriptIdentifierName SpaceduckGreen hi link typescriptAssign Operator hi link typescriptFuncComma SpaceduckForeground hi link typescriptFuncKeyword Define hi link typescriptInterfaceKeyword Define -hi link typescriptCall SpaceduckMagenta +hi link typescriptCall SpaceduckForeground hi link typescriptAliasDeclaration SpaceduckPurple hi link typescriptTypeReference SpaceduckPurple hi link typescriptInterfaceName SpaceduckPurple hi link typescriptDOMFormProp SpaceduckMagenta hi link typescriptNodeGlobal SpaceduckYellow -hi link typescriptProp SpaceduckMagenta +hi! link typescriptProp SpaceduckMagenta +hi! link typescriptIdentifierName SpaceduckForeground + +hi link typescriptImport SpaceduckGreen +hi link typescriptBOM SpaceduckMagenta +hi link typescriptFuncTypeArrow SpaceduckMagenta + +hi link tsxTagName SpaceduckPurple +hi link tsxTag SpaceduckDarkPurple2 +hi link tsxCloseTag SpaceduckDarkPurple2 +hi link tsxCloseString SpaceduckDarkPurple2 +hi link tsxBraces SpaceduckGrey " }}} " GraphQL {{{ From 548c78f4bda799a544cfa65f26b13bbecefbd026 Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 5 Jun 2021 18:22:05 +0900 Subject: [PATCH 23/47] feat: add initial python syntax This is up for change and discussion! --- colors/spaceduck.vim | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 0ae7547..8cd3063 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -318,6 +318,18 @@ hi link mkdDelimiter Normal " Python TODO {{{ hi! link pythonOperator SpaceduckMagenta +hi! link pythonBuiltinFunc SpaceduckGreen +hi! link pythonBuiltinType SpaceduckYellow +hi! link pythonClassVar SpaceduckPurple +hi! link pythonImport SpaceduckGreen +hi! link pythonFunction SpaceduckGreen +hi! link pythonRepeat SpaceduckMagenta +hi! link pythonExClass SpaceduckYellow +hi! link pythonConditional SpaceduckMagenta +hi! link pythonStatement SpaceduckPurple2 +hi! link pythonRaise SpaceduckGreen +hi! link pythonClass SpaceduckYellow +hi! link pythonReturn SpaceduckGreen " }}} " Ruby {{{ From df8069ab5cdbe62f52fcd20d871afca127cc9b23 Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 5 Jun 2021 18:22:40 +0900 Subject: [PATCH 24/47] feat: add vimScriptDelim for LUA < Date: Sat, 5 Jun 2021 18:23:05 +0900 Subject: [PATCH 25/47] fix: remove NERDTree highlights --- colors/spaceduck.vim | 6 ------ 1 file changed, 6 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 56a7e38..a79bb4f 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -473,12 +473,6 @@ hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=N hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE " NERDTree -" hi! link nerdtreeFileExtensionLabel_json SpaceduckPurple -" hi! link nerdtreeFileExtensionIcon_json SpaceduckPurple2 -" hi! link nerdtreeFileExtensionLabel_css SpaceduckMagenta -" hi! link nerdtreeFileExtensionLabel_js SpaceduckGreen -" hi! link nerdtreeFileExtensionIcon_js SpaceduckGreen -" hi! link nerdtreeExactMatchFolder_node_modules SpaceduckDarkPurple2 hi! link NERDTreeFlags SpaceduckCyan hi! link FernRootText SpaceduckPurple From 4c509053876e72e69a45a24367df557c398e1639 Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 7 Jun 2021 14:08:10 +0900 Subject: [PATCH 26/47] fix: airline inactive colors and replace black with #0f111b. --- autoload/airline/themes/spaceduck.vim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autoload/airline/themes/spaceduck.vim b/autoload/airline/themes/spaceduck.vim index ed8cd56..5689be2 100644 --- a/autoload/airline/themes/spaceduck.vim +++ b/autoload/airline/themes/spaceduck.vim @@ -9,29 +9,29 @@ let g:airline#themes#spaceduck#palette = {} -let s:normal1 = [ "#1b1c36", "#686f9a", 0, 237 ] +let s:normal1 = [ "#1b1c36", "#686f9a", 233, 237 ] let s:normal2 = [ "#686f9a", "#1b1c36", 60, 234 ] let s:normal3 = [ "#686f9a", "#1b1c36", 60, 234 ] let g:airline#themes#spaceduck#palette.normal = airline#themes#generate_color_map(s:normal1, s:normal2, s:normal3) -let s:insert1 = [ "#000000", "#5ccc96", 0, 78 ] +let s:insert1 = [ "#0f111b", "#5ccc96", 233, 78 ] let s:insert2 = [ "#5ccc96", "#1b1c36", 60, 234 ] let s:insert3 = [ "#5ccc96", "#1b1c36", 60, 234 ] let g:airline#themes#spaceduck#palette.insert = airline#themes#generate_color_map(s:insert1, s:insert2, s:insert3) -let s:replace1 = [ "#000000", "#7a5ccc", 0, 98 ] +let s:replace1 = [ "#0f111b", "#7a5ccc", 233, 98 ] let s:replace2 = [ "#30365F", "#686f9a", 237, 60 ] let s:replace3 = [ "#30365F", "#686f9a", 237, 60 ] let g:airline#themes#spaceduck#palette.replace = airline#themes#generate_color_map(s:replace1, s:replace2, s:replace3) -let s:visual1 = [ "#000000", "#b3a1e6", 0, 220 ] +let s:visual1 = [ "#0f111b", "#b3a1e6", 233, 220 ] let s:visual2 = [ "#b3a1e6", "#1b1c36", 146, 234 ] let s:visual3 = [ "#b3a1e6", "#1b1c36", 146, 234 ] let g:airline#themes#spaceduck#palette.visual = airline#themes#generate_color_map(s:visual1, s:visual2, s:visual3) -let s:inactive1 = [ "#1b1c36", "#16172d", 234, 234 ] -let s:inactive2 = [ "#1b1c36", "#16172d", 234, 234 ] -let s:inactive3 = [ "#1b1c36", "#16172d", 234, 234 ] +let s:inactive1 = [ "#30365F", "#16172d", 237, 234 ] +let s:inactive2 = [ "#30365F", "#16172d", 237, 234 ] +let s:inactive3 = [ "#30365F", "#16172d", 237, 234 ] let g:airline#themes#spaceduck#palette.inactive = airline#themes#generate_color_map(s:inactive1, s:inactive2, s:inactive3) " statusline warnings ( the [3]trailing block at the right end of your status bar) From 39babb7dfd9220a525ae40fb507e3271e31073bf Mon Sep 17 00:00:00 2001 From: Jinho Date: Wed, 9 Jun 2021 09:58:58 +0900 Subject: [PATCH 27/47] fix: StatusLine ^^^ caret bug. --- colors/spaceduck.vim | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index a79bb4f..158a681 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -34,6 +34,9 @@ let s:palette = { \ 'cyan': ['#59c2ff', '38'], \ 'magenta': ['#ce6f8f', '168'], \ + \ 'turquoise': ['#00d1b2', '78'], + \ 'light_blue': ['#14CFFB', '38'], + \ \ 'deep_space': ['#0f111b', '233'], \ 'cream': ['#ecf0c1', '255'], \ 'selection': ['#30365F', '237'], @@ -84,6 +87,9 @@ if &background == 'dark' call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) + call s:hi('SpaceduckTurquoise', s:palette.turquoise, s:palette.none) + call s:hi('SpaceduckLightBlue', s:palette.light_blue, s:palette.none) + let s:palette.bg = s:palette.deep_space let s:palette.fg = s:palette.cream endif @@ -141,7 +147,7 @@ call s:hi('SpellBad', s:palette.red, s:palette.none, 'unde call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') -call s:hi('StatusLine', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLine', s:palette.selection, s:palette.fg, 'reverse' ) call s:hi('StatusLineNC', s:palette.bg, s:palette.fg, 'reverse' ) call s:hi('StatusLineTermNC', s:palette.black, s:palette.darkpurple, 'reverse' ) call s:hi('TabLine', s:palette.black, s:palette.grey ) @@ -244,13 +250,24 @@ hi link javaTypeDef Keyword " HTML {{{ hi link htmlTagName Function hi link htmlEndTag Conditional -hi link htmlArg Tag +hi link htmlArg SpaceduckMagenta hi link htmlSpecialTagName Type +hi! link htmlTag SpaceduckDarkPurple2 +hi! link htmlEndTag SpaceduckDarkPurple2 +hi! link htmlTitle SpaceduckPurple +hi! link htmlH1 SpaceduckPurple " }}} " CSS {{{ hi link cssBraces Normal hi! link cssSelectorOp SpaceduckMagenta +hi link cssAtKeyword SpaceduckPurple +hi link cssBoxProp SpaceduckTurquoise +hi link cssBackgroundProp SpaceduckMagenta +hi link cssTextProp SpaceduckMagenta +hi link cssTagName SpaceduckGreen +hi link cssPseudoClassId SpaceduckMagenta +hi link cssClassName SpaceduckTurquoise " }}} " php {{{ @@ -280,7 +297,7 @@ hi link jsOperatorKeyword Operator hi link jsExceptions Error hi link jsObjectProp Tag hi link jsTernaryIfOperator Title -hi link jsTemplateBraces Title +hi! link jsTemplateBraces SpaceduckPurple hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow hi! link jsFuncArgs SpaceduckMagenta @@ -298,15 +315,21 @@ hi! link jsxOpenPunct SpaceduckDarkPurple2 hi! link jsxComponentName SpaceduckPurple hi! link jsxTag SpaceduckPurple +hi link jsAsyncKeyword SpaceduckOrange +hi link jsForAwait SpaceduckOrange + hi link jsClassKeyword SpaceduckPurple2 hi link jsClassDefinition SpaceduckYellow hi link jsClassFuncName SpaceduckGreen hi link jsObjectProp SpaceduckMagenta -hi link jsObjectKey SpaceduckGreen +hi link jsObjectKey SpaceduckTurquoise hi link jsThis SpaceduckYellow hi link jsFunction SpaceduckPurple2 hi link jsFuncName SpaceduckGreen +hi link jsParensCatch SpaceduckPurple +hi link jsParenCatch SpaceduckMagenta + hi link jsonQuote Label hi link jsoncBraces SpaceduckDarkPurple2 " }}} From 49427ce5bdbf97fb775465bee32af41049cdfd21 Mon Sep 17 00:00:00 2001 From: Jinho Date: Wed, 9 Jun 2021 10:05:05 +0900 Subject: [PATCH 28/47] fix: VertSplit bug w/ StatusLine caret bug. --- colors/spaceduck.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 158a681..1290b3a 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -147,8 +147,8 @@ call s:hi('SpellBad', s:palette.red, s:palette.none, 'unde call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') -call s:hi('StatusLine', s:palette.selection, s:palette.fg, 'reverse' ) -call s:hi('StatusLineNC', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLine', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'reverse' ) call s:hi('StatusLineTermNC', s:palette.black, s:palette.darkpurple, 'reverse' ) call s:hi('TabLine', s:palette.black, s:palette.grey ) call s:hi('TabLineFill', s:palette.grey, s:palette.black ) From cd1547bfafc2010456c3f479be862097a39a58eb Mon Sep 17 00:00:00 2001 From: George Pickering <9803299+bigpick@users.noreply.github.com> Date: Wed, 9 Jun 2021 17:40:53 -0400 Subject: [PATCH 29/47] feat: Add specific markdown syntax highlighting --- after/syntax/markdown.vim | 53 +++++++++++++++++++++++ autoload/spaceduck.vim | 10 +++++ colors/spaceduck.vim | 90 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 after/syntax/markdown.vim create mode 100644 autoload/spaceduck.vim diff --git a/after/syntax/markdown.vim b/after/syntax/markdown.vim new file mode 100644 index 0000000..3de78ff --- /dev/null +++ b/after/syntax/markdown.vim @@ -0,0 +1,53 @@ +if spaceduck#should_abort('markdown', 'mkd') + finish +endif + +syn match markdownBlockquote ">\%(\s\|$\).*" contained nextgroup=@markdownBlock + +if b:current_syntax ==# 'mkd' +" plasticboy/vim-markdown {{{1 + hi! link htmlBold SpaceduckOrangeBold + hi! link htmlBoldItalic SpaceduckOrangeBoldItalic + hi! link htmlH1 SpaceduckPurpleBold + hi! link htmlItalic SpaceduckYellowItalic + hi! link mkdBlockquote SpaceduckComment + hi! link mkdBold SpaceduckOrangeBold + hi! link mkdBoldItalic SpaceduckOrangeBoldItalic + hi! link mkdCode SpaceduckGreen + hi! link mkdCodeEnd SpaceduckGreen + hi! link mkdCodeStart SpaceduckGreen + hi! link mkdHeading SpaceduckPurpleBold + hi! link mkdInlineUrl SpaceduckLink + hi! link mkdItalic SpaceduckYellowItalic + hi! link mkdLink SpaceduckGreen + hi! link mkdListItem SpaceduckCyan + hi! link mkdRule SpaceduckComment + hi! link mkdUrl SpaceduckLink +"}}}1 +elseif b:current_syntax ==# 'markdown' +" Builtin: {{{1 + hi! link markdownBlockquote SpaceduckCommentItalic + hi! link markdownBold SpaceduckYellowBold + hi! link markdownBoldItalic SpaceduckYellowBoldItalic + hi! link markdownCodeBlock SpaceduckPurple + hi! link markdownCode SpaceduckPurple + hi! link markdownCodeDelimiter SpaceduckPurple + hi! link markdownH1 SpaceduckPurple2Bold + hi! link markdownH2 markdownH1 + hi! link markdownH3 markdownH1 + hi! link markdownH4 markdownH1 + hi! link markdownH5 markdownH1 + hi! link markdownH6 markdownH1 + hi! link markdownHeadingDelimiter markdownH1 + hi! link markdownHeadingRule markdownH1 + hi! link markdownItalic SpaceduckYellowItalic + hi! link markdownLinkText SpaceduckGreen + hi! link markdownListMarker SpaceduckCyan + hi! link markdownOrderedListMarker SpaceduckCyan + hi! link markdownRule SpaceduckComment + hi! link markdownUrl SpaceduckCyan +"}}} +endif + +" vim: fdm=marker ts=2 sts=2 sw=2 fdl=0: + diff --git a/autoload/spaceduck.vim b/autoload/spaceduck.vim new file mode 100644 index 0000000..ac2a11e --- /dev/null +++ b/autoload/spaceduck.vim @@ -0,0 +1,10 @@ +" Helper function that takes a variadic list of filetypes as args and returns +" whether or not the execution of the ftplugin should be aborted. +func! spaceduck#should_abort(...) + if ! exists('g:colors_name') || g:colors_name !=# 'spaceduck' + return 1 + elseif a:0 > 0 && (! exists('b:current_syntax') || index(a:000, b:current_syntax) == -1) + return 1 + endif + return 0 +endfunction diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 158a681..5ef215c 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -21,6 +21,68 @@ endif let g:colors_name="spaceduck" " }}} +" User Configuration: {{{2 +if !exists('g:spaceduck_bold') + let g:spaceduck_bold = 1 +endif + +if !exists('g:spaceduck_italic') + let g:spaceduck_italic = 1 +endif + +if !exists('g:spaceduck_underline') + let g:spaceduck_underline = 1 +endif + +if !exists('g:spaceduck_undercurl') + let g:spaceduck_undercurl = g:spaceduck_underline +endif + +if !exists('g:spaceduck_inverse') + let g:spaceduck_inverse = 1 +endif + +if !exists('g:spaceduck_colorterm') + let g:spaceduck_colorterm = 1 +endif + +"}}}2 +" Script Helpers: {{{2 +let s:attrs = { + \ 'bold': g:spaceduck_bold == 1 ? 'bold' : 0, + \ 'italic': g:spaceduck_italic == 1 ? 'italic' : 0, + \ 'underline': g:spaceduck_underline == 1 ? 'underline' : 0, + \ 'undercurl': g:spaceduck_undercurl == 1 ? 'undercurl' : 0, + \ 'inverse': g:spaceduck_inverse == 1 ? 'inverse' : 0, + \} + +function! s:h(scope, fg, ...) " bg, attr_list, special + let l:fg = copy(a:fg) + let l:bg = get(a:, 1, ['NONE', 'NONE']) + + let l:attr_list = filter(get(a:, 2, ['NONE']), 'type(v:val) == 1') + let l:attrs = len(l:attr_list) > 0 ? join(l:attr_list, ',') : 'NONE' + + " Falls back to coloring foreground group on terminals because + " nearly all do not support undercurl + let l:special = get(a:, 3, ['NONE', 'NONE']) + if l:special[0] !=# 'NONE' && l:fg[0] ==# 'NONE' && !has('gui_running') + let l:fg[0] = l:special[0] + let l:fg[1] = l:special[1] + endif + + let l:hl_string = [ + \ 'highlight', a:scope, + \ 'guifg=' . l:fg[0], 'ctermfg=' . l:fg[1], + \ 'guibg=' . l:bg[0], 'ctermbg=' . l:bg[1], + \ 'gui=' . l:attrs, 'cterm=' . l:attrs, + \ 'guisp=' . l:special[0], + \] + + execute join(l:hl_string, ' ') +endfunction +"}}}2 + " PALETTE: {{{ let s:palette = { \ 'red': ['#e33400', '166'], @@ -82,9 +144,33 @@ if &background == 'dark' call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) + call s:h('SpaceduckRedBold', s:palette.red, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckOrangeBold', s:palette.orange, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckGreenBold', s:palette.green, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckYellowBold', s:palette.yellow, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckPurpleBold', s:palette.lavender, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckDarkPurpleBold', s:palette.darkpurple, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckPurple2Bold', s:palette.purple2, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckDarkPurple2Bold', s:palette.darkpurple2, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckCyanBold', s:palette.cyan, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckMagentaBold', s:palette.magenta, s:palette.none, [s:attrs.bold]) + + call s:h('SpaceduckRedItalic', s:palette.red, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckOrangeItalic', s:palette.orange, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckGreenItalic', s:palette.green, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckYellowItalic', s:palette.yellow, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckPurpleItalic', s:palette.lavender, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckDarkPurpleItalic', s:palette.darkpurple, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckPurple2Italic', s:palette.purple2, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckDarkPurple2Italic', s:palette.darkpurple2, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckCyanItalic', s:palette.cyan, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckMagentaItalic', s:palette.magenta, s:palette.none, [s:attrs.italic]) + call s:hi('SpaceduckForeground', s:palette.cream, s:palette.none) call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) + call s:h('SpaceduckCommentItalic', s:palette.comment, s:palette.none, [s:attrs.italic]) + call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) call s:hi('SpaceduckTurquoise', s:palette.turquoise, s:palette.none) @@ -147,8 +233,8 @@ call s:hi('SpellBad', s:palette.red, s:palette.none, 'unde call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') -call s:hi('StatusLine', s:palette.selection, s:palette.fg, 'reverse' ) -call s:hi('StatusLineNC', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLine', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'reverse' ) call s:hi('StatusLineTermNC', s:palette.black, s:palette.darkpurple, 'reverse' ) call s:hi('TabLine', s:palette.black, s:palette.grey ) call s:hi('TabLineFill', s:palette.grey, s:palette.black ) From 117c9ce071fe4f0270823df4695ad584c9c2b9eb Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 20 Jun 2021 23:48:00 -0600 Subject: [PATCH 30/47] feat: major color changes, new colors?, fix normal text bug, create changelogfile --- CHANGELOG.MD | 19 ++++ colors/spaceduck.vim | 233 +++++++++++++++++++++++-------------------- 2 files changed, 144 insertions(+), 108 deletions(-) create mode 100644 CHANGELOG.MD diff --git a/CHANGELOG.MD b/CHANGELOG.MD new file mode 100644 index 0000000..59b6497 --- /dev/null +++ b/CHANGELOG.MD @@ -0,0 +1,19 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [0.1.0] - 2020-06-20 + +### Added +- This CHANGELOG file to hopefully serve as an evolving example of a + standardized open source project CHANGELOG. +- CNAME file to enable GitHub Pages custom domain +- README now contains answers to common questions about CHANGELOGs +- Good examples and basic guidelines, including proper date formatting. +- Counter-examples: "What makes unicorns cry?" + + + diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 1290b3a..9bc9cd4 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -9,7 +9,8 @@ " " URL: https://github.com/pineapplegiant/spaceduck " Maintainer: Guillermo Rodriguez -" Modified: 2022/03/16 22:28 +" Modified: 2021/06/20 13:06 +" Version: 0.1.0 " License: MIT " Initalization {{{ @@ -21,31 +22,41 @@ endif let g:colors_name="spaceduck" " }}} +"lavender is now light purple +"purple2 is now purple +"darkpurple is now selection +"darkpurple2 is now darkpurple +"turquoise is now violet +"light_blue got removed +"deep_space is now background +"cream is now fg +"comment is using darkpurple +"oldcomment is using newColor? Violet? + " PALETTE: {{{ let s:palette = { - \ 'red': ['#e33400', '166'], - \ 'orange': ['#e39400', '172'], + \ 'red': ['#f25244', '203'], + \ 'orange': ['#f2ac49', '215'], \ 'green': ['#5ccc96', '78'], - \ 'yellow': ['#f2ce00', '220'], - \ 'lavender': ['#b3a1e6', '146'], - \ 'purple2': ['#7a5ccc', '98'], - \ 'darkpurple': ['#30365F', '237'], - \ 'darkpurple2': ['#686f9a', '60'], - \ 'cyan': ['#59c2ff', '38'], - \ 'magenta': ['#ce6f8f', '168'], + \ 'yellow': ['#f0e573', '221'], + \ 'lightpurple': ['#b3a1e6', '146'], + \ 'purple': ['#936ad9', '98'], + \ 'darkpurple': ['#626999', '60'], + \ 'cyan': ['#59c2ff', '75'], + \ 'magenta': ['#cc7893', '174'], \ - \ 'turquoise': ['#00d1b2', '78'], - \ 'light_blue': ['#14CFFB', '38'], + \ 'violet': ['#606ebf', '61'], + \ 'lightorange': ['#f09873', '209'], \ - \ 'deep_space': ['#0f111b', '233'], - \ 'cream': ['#ecf0c1', '255'], - \ 'selection': ['#30365F', '237'], + \ 'background': ['#0f111b', '233'], + \ 'foreground': ['#ecf0c1', '255'], + \ 'selection': ['#30365f', '237'], \ 'cursor': ['#1b1c36', '234'], \ 'comment': ['#535f97', '236'], \ \ 'grey': ['#818596', '102'], - \ 'light_grey': ['#c1c3cc', '102'], - \ 'white': ['#ffffff', '15'], + \ 'lightgrey': ['#c1c3cc', '102'], + \ 'white': ['#edeef2', '255'], \ 'black': ['#000000', '0'], \ \ 'none': ['NONE', 'NONE'] @@ -75,23 +86,24 @@ if &background == 'dark' call s:hi('SpaceduckOrange', s:palette.orange, s:palette.none) call s:hi('SpaceduckGreen', s:palette.green, s:palette.none) call s:hi('SpaceduckYellow', s:palette.yellow, s:palette.none) - call s:hi('SpaceduckPurple', s:palette.lavender, s:palette.none) - call s:hi('SpaceduckPurple2', s:palette.purple2, s:palette.none) + call s:hi('SpaceduckLightPurple', s:palette.lightpurple, s:palette.none) + call s:hi('SpaceduckPurple', s:palette.purple, s:palette.none) call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) - call s:hi('SpaceduckDarkPurple2', s:palette.darkpurple2, s:palette.none) + call s:hi('SpaceduckSelection', s:palette.selection, s:palette.none) call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) + call s:hi('SpaceduckViolet', s:palette.violet, s:palette.none) + call s:hi('SpaceduckLightOrange', s:palette.lightorange, s:palette.none) - call s:hi('SpaceduckForeground', s:palette.cream, s:palette.none) + call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) + call s:hi('SpaceduckLightGrey', s:palette.lightgrey, s:palette.none) - call s:hi('SpaceduckTurquoise', s:palette.turquoise, s:palette.none) - call s:hi('SpaceduckLightBlue', s:palette.light_blue, s:palette.none) - let s:palette.bg = s:palette.deep_space - let s:palette.fg = s:palette.cream + let s:palette.bg = s:palette.background + let s:palette.fg = s:palette.foreground endif " I don't want anyone accidentally stumbling on this just yet @@ -100,70 +112,64 @@ if exists('g:spaceduck_dev_light_theme') call s:hi('SpaceduckOrange', s:palette.orange, s:palette.none) call s:hi('SpaceduckGreen', s:palette.green, s:palette.none) call s:hi('SpaceduckYellow', s:palette.yellow, s:palette.none) - call s:hi('SpaceduckPurple', s:palette.lavender, s:palette.none) - call s:hi('SpaceduckPurple2', s:palette.purple2, s:palette.none) + call s:hi('SpaceduckLightPurple', s:palette.lightpurple, s:palette.none) + call s:hi('SpaceduckPurple', s:palette.purple, s:palette.none) call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) - call s:hi('SpaceduckDarkPurple2', s:palette.darkpurple2, s:palette.none) + call s:hi('SpaceduckSelection', s:palette.selection, s:palette.none) call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) - call s:hi('SpaceduckForeground', s:palette.cream, s:palette.none) + call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) - let s:palette.bg = s:palette.cream - let s:palette.fg = s:palette.deep_space + let s:palette.bg = s:palette.foreground + let s:palette.fg = s:palette.background endif " }}} " Syntax Highlighting {{{ -call s:hi('Normal', s:palette.fg, s:palette.bg ) +call s:hi('Normal', s:palette.fg, s:palette.background ) call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) call s:hi('CursorLine', s:palette.none, s:palette.cursor ) -call s:hi('Cursor', s:palette.deep_space, s:palette.grey ) -call s:hi('CursorLineNr', s:palette.light_grey, s:palette.cursor ) +call s:hi('Cursor', s:palette.background, s:palette.grey ) +call s:hi('CursorLineNr', s:palette.lightgrey, s:palette.cursor ) call s:hi('DiffAdd', s:palette.green, s:palette.cursor ) call s:hi('DiffChange', s:palette.orange, s:palette.cursor ) call s:hi('DiffDelete', s:palette.red, s:palette.cursor ) call s:hi('DiffText', s:palette.yellow, s:palette.cursor ) -call s:hi('EndOfBuffer', s:palette.selection, s:palette.deep_space ) -call s:hi('FoldColumn', s:palette.selection, s:palette.deep_space ) -call s:hi('Folded', s:palette.darkpurple2, s:palette.cursor ) -call s:hi('IncSearch', s:palette.white, s:palette.selection ) -call s:hi('LineNr', s:palette.selection, s:palette.deep_space ) +call s:hi('EndOfBuffer', s:palette.selection, s:palette.background ) +call s:hi('FoldColumn', s:palette.selection, s:palette.background ) +call s:hi('Folded', s:palette.darkpurple, s:palette.cursor ) +" TODO: better incsearch & Search +call s:hi('IncSearch', s:palette.black, s:palette.darkpurple, 'underline') +call s:hi('LineNr', s:palette.selection, s:palette.background ) call s:hi('MatchParen', s:palette.white, s:palette.darkpurple ) call s:hi('Pmenu', s:palette.fg, s:palette.cursor ) -call s:hi('PmenuSbar', s:palette.none, s:palette.darkpurple ) -call s:hi('PmenuSel', s:palette.white, s:palette.darkpurple ) -call s:hi('PmenuThumb', s:palette.none, s:palette.darkpurple2 ) +call s:hi('PmenuSbar', s:palette.none, s:palette.selection ) +call s:hi('PmenuSel', s:palette.lightgrey, s:palette.selection ) +call s:hi('PmenuThumb', s:palette.none, s:palette.darkpurple ) call s:hi('QuickFixLine', s:palette.fg, s:palette.cursor ) -call s:hi('Search', s:palette.white, s:palette.darkpurple2 ) +call s:hi('Search', s:palette.black, s:palette.violet ) call s:hi('SignColumn', s:palette.orange, s:palette.bg ) call s:hi('SpecialKey', s:palette.orange, s:palette.bg ) call s:hi('SpellBad', s:palette.red, s:palette.none, 'underline') call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') -call s:hi('StatusLine', s:palette.bg, s:palette.fg, 'reverse' ) +call s:hi('StatusLine', s:palette.cursor, s:palette.lightgrey, 'reverse' ) call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'reverse' ) -call s:hi('StatusLineTermNC', s:palette.black, s:palette.darkpurple, 'reverse' ) -call s:hi('TabLine', s:palette.black, s:palette.grey ) +call s:hi('StatusLineTermNC', s:palette.bg, s:palette.darkpurple, 'reverse' ) +call s:hi('TabLine', s:palette.bg, s:palette.grey ) call s:hi('TabLineFill', s:palette.grey, s:palette.black ) -call s:hi('TabLineSel', s:palette.light_grey, s:palette.deep_space ) +call s:hi('TabLineSel', s:palette.lightgrey, s:palette.background ) call s:hi('VertSplit', s:palette.darkpurple, s:palette.none ) -call s:hi('Visual', s:palette.none, s:palette.darkpurple ) -call s:hi('WarningMsg', s:palette.orange, s:palette.deep_space ) -call s:hi('WildMenu', s:palette.black, s:palette.light_grey ) - -" These groups seem to use the old cursorline color -" -" hi CursorLineNr guifg=#c1c3cc ctermfg=251 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -" hi ColorColumn guifg=NONE ctermfg=NONE guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -" hi Folded guifg=#686f9a ctermfg=60 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE -" hi QuickFixLine guifg=#ecf0c1 ctermfg=255 guibg=#16172d ctermbg=234 gui=NONE cterm=NONE +call s:hi('Visual', s:palette.none, s:palette.selection ) +call s:hi('WarningMsg', s:palette.orange, s:palette.background ) +call s:hi('WildMenu', s:palette.black, s:palette.lightgrey ) " SYNTAX: Predefined syntax groups {{{ hi! link Comment SpaceduckComment @@ -171,10 +177,10 @@ hi! link Boolean SpaceduckYellow hi! link Character SpaceduckYellow hi! link Conditional SpaceduckGreen hi! link Constant SpaceduckYellow -hi! link Debug SpaceduckPurple -hi! link Define SpaceduckPurple2 +hi! link Debug SpaceduckLightPurple +hi! link Define SpaceduckLightPurple hi! link Delimiter SpaceduckForeground -hi! link Error SpaceduckRed +hi! link Error SpaceduckOrange hi! link Exception SpaceduckOrange hi! link Float SpaceduckYellow hi! link Function SpaceduckGreen @@ -183,37 +189,37 @@ hi! link Ignore SpaceduckRed hi! link Include SpaceduckGreen hi! link Keyword SpaceduckOrange hi! link Label SpaceduckGreen -hi! link Macro SpaceduckPurple2 +hi! link Macro SpaceduckPurple hi! link Number SpaceduckYellow -hi! link Operator SpaceduckMagenta -hi! link PreCondit SpaceduckPurple2 -hi! link PreProc SpaceduckPurple +hi! link Operator SpaceduckForeground +hi! link PreCondit SpaceduckPurple +hi! link PreProc SpaceduckLightPurple hi! link Repeat SpaceduckGreen -hi! link Special SpaceduckPurple +hi! link Special SpaceduckLightPurple hi! link SpecialChar SpaceduckOrange hi! link Statement SpaceduckGreen hi! link StorageClass SpaceduckPurple hi! link String SpaceduckCyan hi! link Structure SpaceduckCyan hi! link SpecialComment Comment -hi! link Tag SpaceduckPurple +hi! link Tag SpaceduckLightPurple hi! link Type SpaceduckMagenta hi! link Typedef SpaceduckCyan -" TODO: better todo -call s:hi('Todo', s:palette.white, s:palette.cursor, 'underline') +" TODO: better todo? +call s:hi('Todo', s:palette.violet, s:palette.cursor, 'underline') call s:hi('Underlined', s:palette.green, s:palette.none, 'underline') " }}} -hi! link Conceal SpaceduckDarkPurple2 +hi! link Conceal SpaceduckDarkPurple hi! link Directory SpaceduckCyan hi! link ErrorMsg SpaceduckRed -hi! link ModeMsg SpaceduckPurple -hi! link MoreMsg SpaceduckPurple -hi! link Question SpaceduckPurple -hi! link Title SpaceduckPurple2 +hi! link ModeMsg SpaceduckLightPurple +hi! link MoreMsg SpaceduckLightPurple +hi! link Question SpaceduckLightPurple +hi! link Title SpaceduckPurple -hi! link diffAdded SpaceduckPurple +hi! link diffAdded SpaceduckLightPurple hi! link diffRemoved SpaceduckRed hi! link Whitespace EndOfBuffer hi! link VisualNOS Visual @@ -252,22 +258,23 @@ hi link htmlTagName Function hi link htmlEndTag Conditional hi link htmlArg SpaceduckMagenta hi link htmlSpecialTagName Type -hi! link htmlTag SpaceduckDarkPurple2 -hi! link htmlEndTag SpaceduckDarkPurple2 +hi! link htmlTag SpaceduckDarkPurple +hi! link htmlEndTag SpaceduckDarkPurple hi! link htmlTitle SpaceduckPurple hi! link htmlH1 SpaceduckPurple " }}} " CSS {{{ hi link cssBraces Normal -hi! link cssSelectorOp SpaceduckMagenta -hi link cssAtKeyword SpaceduckPurple -hi link cssBoxProp SpaceduckTurquoise +"hi! link cssSelectorOp SpaceduckMagenta +hi! link cssSelectorOp SpaceduckViolet +"hi link cssAtKeyword SpaceduckPurple +hi link cssBoxProp SpaceduckViolet hi link cssBackgroundProp SpaceduckMagenta hi link cssTextProp SpaceduckMagenta hi link cssTagName SpaceduckGreen hi link cssPseudoClassId SpaceduckMagenta -hi link cssClassName SpaceduckTurquoise +hi link cssClassName SpaceduckViolet " }}} " php {{{ @@ -275,12 +282,12 @@ hi link phpFunction Function hi link phpKeyword Function hi link phpMethod Function hi link phpClass SpaceduckYellow -hi link phpType SpaceduckPurple2 +hi link phpType SpaceduckPurple hi link phpIdentifier SpaceduckForeground -hi link phpVarSelector SpaceduckDarkPurple2 +hi link phpVarSelector SpaceduckDarkPurple hi link phpParent SpaceduckForeground hi link phpSuperglobals SpaceduckMagenta -hi link Delimiter SpaceduckPurple +hi link Delimiter SpaceduckLightPurple hi link phpStringSingle String hi link phpStringDouble String " }}} @@ -296,42 +303,48 @@ hi link jsFuncCall Function hi link jsOperatorKeyword Operator hi link jsExceptions Error hi link jsObjectProp Tag -hi link jsTernaryIfOperator Title -hi! link jsTemplateBraces SpaceduckPurple +"hi link jsTernaryIfOperator Title +hi link jsTernaryIfOperator SpaceduckTurquoise +" Parentheses ugly bro +"hi! link jsTemplateBraces SpaceduckPurple hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow -hi! link jsFuncArgs SpaceduckMagenta -hi! link jsFuncParens SpaceduckPurple -hi! link jsDestructuringBraces SpaceduckDarkPurple2 -hi! link jsObjectBraces SpaceduckDarkPurple2 -hi! link jsModuleBraces SpaceduckDarkPurple2 -hi! link jsBrackets SpaceduckDarkPurple2 +"hi! link jsFuncArgs SpaceduckMagenta +" Parentheses ugly bro +"hi! link jsFuncParens SpaceduckPurple +hi! link jsDestructuringBraces SpaceduckDarkPurple +hi! link jsObjectBraces SpaceduckDarkPurple +hi! link jsModuleBraces SpaceduckDarkPurpl2 +hi! link jsBrackets SpaceduckDarkPurple hi! link jsTemplateExpression SpaceduckMagenta hi link jsxTagName HTMLTagName hi link jsxClosePunct jsxOpenPunct hi link jsxCloseString jsxClosePunct -hi! link jsxOpenPunct SpaceduckDarkPurple2 +hi! link jsxOpenPunct SpaceduckDarkPurple hi! link jsxComponentName SpaceduckPurple -hi! link jsxTag SpaceduckPurple +hi! link jsxTag SpaceduckLightPurple -hi link jsAsyncKeyword SpaceduckOrange -hi link jsForAwait SpaceduckOrange +hi link jsAsyncKeyword SpaceduckLightPurple +hi link jsForAwait SpaceduckLightPurple +"hi link jsAsyncKeyword SpaceduckOrange +"hi link jsForAwait SpaceduckOrange -hi link jsClassKeyword SpaceduckPurple2 -hi link jsClassDefinition SpaceduckYellow +hi link jsClassKeyword SpaceduckPurple +"hi link jsClassDefinition SpaceduckYellow +hi link jsClassDefinition SpaceduckLightPurple hi link jsClassFuncName SpaceduckGreen hi link jsObjectProp SpaceduckMagenta -hi link jsObjectKey SpaceduckTurquoise +hi link jsObjectKey SpaceduckViolet hi link jsThis SpaceduckYellow -hi link jsFunction SpaceduckPurple2 +hi link jsFunction SpaceduckPurple hi link jsFuncName SpaceduckGreen -hi link jsParensCatch SpaceduckPurple +hi link jsParensCatch SpaceduckLightPurple hi link jsParenCatch SpaceduckMagenta hi link jsonQuote Label -hi link jsoncBraces SpaceduckDarkPurple2 +hi link jsoncBraces SpaceduckDarkPurple " }}} " Others {{{ @@ -343,13 +356,13 @@ hi link mkdDelimiter Normal hi! link pythonOperator SpaceduckMagenta hi! link pythonBuiltinFunc SpaceduckGreen hi! link pythonBuiltinType SpaceduckYellow -hi! link pythonClassVar SpaceduckPurple +hi! link pythonClassVar SpaceduckLightPurple hi! link pythonImport SpaceduckGreen hi! link pythonFunction SpaceduckGreen hi! link pythonRepeat SpaceduckMagenta hi! link pythonExClass SpaceduckYellow hi! link pythonConditional SpaceduckMagenta -hi! link pythonStatement SpaceduckPurple2 +hi! link pythonStatement SpaceduckPurple hi! link pythonRaise SpaceduckGreen hi! link pythonClass SpaceduckYellow hi! link pythonReturn SpaceduckGreen @@ -365,7 +378,7 @@ hi link rubyKeywordAsMethod Tag " Typescript {{{ hi link typescriptVariable Title -hi link typescriptBraces SpaceduckDarkPurple2 +hi link typescriptBraces SpaceduckDarkPurple hi! link typescriptArrowFunc SpaceduckMagenta hi link typescriptNumberStaticMethod Function hi link typescriptNumberMethod Function @@ -497,24 +510,28 @@ hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui= " NERDTree hi! link NERDTreeFlags SpaceduckCyan - hi! link FernRootText SpaceduckPurple +" COC highlight default CocHighlightText guibg=#1b1c36 +hi! link CocErrorSign SpaceduckRed +hi! link CocInfoSign SpaceduckYellow +hi! link CocWarningSign SpaceduckOrange " }}} " }}} +" TODO: Need to update this with colors from above " Terminal colors VIM / NeoVIM {{{ " Neovim uses different terminal colors apart from Vim if has('nvim') let g:terminal_color_foreground = "#ecf0c1" let g:terminal_color_background = "#0f111b" let g:terminal_color_0 = "#000000" - let g:terminal_color_1 = "#e33400" - let g:terminal_color_2 = "#5ccc96" - let g:terminal_color_3 = "#b3a1e6" + let g:terminal_color_1 = "#e33400" "red + let g:terminal_color_2 = "#5ccc96" "green + let g:terminal_color_3 = "#b3a1e6" "light purple let g:terminal_color_4 = "#00a3cc" let g:terminal_color_5 = "#ce6f8f" let g:terminal_color_6 = "#7a5ccc" From bbd8557ba1e61c8c20304c20f9d8e932e3493831 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Mon, 21 Jun 2021 15:07:55 -0600 Subject: [PATCH 31/47] fix: minor yellow, light orange, and violet tweaks, and hopefully fix cursor over blankline --- colors/spaceduck.vim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 9bc9cd4..adb960d 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -38,15 +38,15 @@ let s:palette = { \ 'red': ['#f25244', '203'], \ 'orange': ['#f2ac49', '215'], \ 'green': ['#5ccc96', '78'], - \ 'yellow': ['#f0e573', '221'], + \ 'yellow': ['#f2e661', '221'], \ 'lightpurple': ['#b3a1e6', '146'], \ 'purple': ['#936ad9', '98'], \ 'darkpurple': ['#626999', '60'], \ 'cyan': ['#59c2ff', '75'], \ 'magenta': ['#cc7893', '174'], \ - \ 'violet': ['#606ebf', '61'], - \ 'lightorange': ['#f09873', '209'], + \ 'violet': ['#5c6dcc', '62'], + \ 'lightorange': ['#f29d61', '215'], \ \ 'background': ['#0f111b', '233'], \ 'foreground': ['#ecf0c1', '255'], @@ -139,9 +139,9 @@ call s:hi('DiffChange', s:palette.orange, s:palette.cursor call s:hi('DiffDelete', s:palette.red, s:palette.cursor ) call s:hi('DiffText', s:palette.yellow, s:palette.cursor ) -call s:hi('EndOfBuffer', s:palette.selection, s:palette.background ) -call s:hi('FoldColumn', s:palette.selection, s:palette.background ) -call s:hi('Folded', s:palette.darkpurple, s:palette.cursor ) +call s:hi('EndOfBuffer', s:palette.selection, s:palette.none ) +call s:hi('FoldColumn', s:palette.selection, s:palette.none ) +call s:hi('Folded', s:palette.darkpurple, s:palette.none ) " TODO: better incsearch & Search call s:hi('IncSearch', s:palette.black, s:palette.darkpurple, 'underline') call s:hi('LineNr', s:palette.selection, s:palette.background ) @@ -160,7 +160,7 @@ call s:hi('SpellBad', s:palette.red, s:palette.none, 'unde call s:hi('SpellLocal', s:palette.green, s:palette.none, 'underline') call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') -call s:hi('StatusLine', s:palette.cursor, s:palette.lightgrey, 'reverse' ) +call s:hi('StatusLine', s:palette.cursor, s:palette.foreground, 'reverse' ) call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'reverse' ) call s:hi('StatusLineTermNC', s:palette.bg, s:palette.darkpurple, 'reverse' ) call s:hi('TabLine', s:palette.bg, s:palette.grey ) From e79a6539055fffc3658282316337a52d3a8c6770 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Mon, 21 Jun 2021 23:08:46 -0600 Subject: [PATCH 32/47] fix: done tweaking. colors are good to go, now to put them in the right place --- colors/spaceduck.vim | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index adb960d..729eb19 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -36,12 +36,12 @@ let g:colors_name="spaceduck" " PALETTE: {{{ let s:palette = { \ 'red': ['#f25244', '203'], - \ 'orange': ['#f2ac49', '215'], + \ 'orange': ['#e6ac5c', '179'], \ 'green': ['#5ccc96', '78'], \ 'yellow': ['#f2e661', '221'], \ 'lightpurple': ['#b3a1e6', '146'], \ 'purple': ['#936ad9', '98'], - \ 'darkpurple': ['#626999', '60'], + \ 'darkpurple': ['#535f97', '236'], \ 'cyan': ['#59c2ff', '75'], \ 'magenta': ['#cc7893', '174'], \ @@ -128,7 +128,7 @@ endif " }}} " Syntax Highlighting {{{ -call s:hi('Normal', s:palette.fg, s:palette.background ) +call s:hi('Normal', s:palette.fg, s:palette.none ) call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) call s:hi('CursorLine', s:palette.none, s:palette.cursor ) call s:hi('Cursor', s:palette.background, s:palette.grey ) @@ -198,7 +198,7 @@ hi! link Repeat SpaceduckGreen hi! link Special SpaceduckLightPurple hi! link SpecialChar SpaceduckOrange hi! link Statement SpaceduckGreen -hi! link StorageClass SpaceduckPurple +hi! link StorageClass SpaceduckLightPurple hi! link String SpaceduckCyan hi! link Structure SpaceduckCyan hi! link SpecialComment Comment @@ -217,7 +217,7 @@ hi! link ErrorMsg SpaceduckRed hi! link ModeMsg SpaceduckLightPurple hi! link MoreMsg SpaceduckLightPurple hi! link Question SpaceduckLightPurple -hi! link Title SpaceduckPurple +hi! link Title SpaceduckLightPurple hi! link diffAdded SpaceduckLightPurple hi! link diffRemoved SpaceduckRed @@ -266,9 +266,9 @@ hi! link htmlH1 SpaceduckPurple " CSS {{{ hi link cssBraces Normal -"hi! link cssSelectorOp SpaceduckMagenta +hi! link cssSelectorOp SpaceduckMagenta hi! link cssSelectorOp SpaceduckViolet -"hi link cssAtKeyword SpaceduckPurple +hi link cssAtKeyword SpaceduckLightPurple hi link cssBoxProp SpaceduckViolet hi link cssBackgroundProp SpaceduckMagenta hi link cssTextProp SpaceduckMagenta @@ -303,15 +303,12 @@ hi link jsFuncCall Function hi link jsOperatorKeyword Operator hi link jsExceptions Error hi link jsObjectProp Tag -"hi link jsTernaryIfOperator Title -hi link jsTernaryIfOperator SpaceduckTurquoise -" Parentheses ugly bro -"hi! link jsTemplateBraces SpaceduckPurple +hi link jsTernaryIfOperator Title +hi! link jsTemplateBraces SpaceduckPurple hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow -"hi! link jsFuncArgs SpaceduckMagenta -" Parentheses ugly bro -"hi! link jsFuncParens SpaceduckPurple +hi! link jsFuncArgs SpaceduckMagenta +hi! link jsFuncParens SpaceduckPurple hi! link jsDestructuringBraces SpaceduckDarkPurple hi! link jsObjectBraces SpaceduckDarkPurple hi! link jsModuleBraces SpaceduckDarkPurpl2 @@ -327,17 +324,17 @@ hi! link jsxTag SpaceduckLightPurple hi link jsAsyncKeyword SpaceduckLightPurple hi link jsForAwait SpaceduckLightPurple -"hi link jsAsyncKeyword SpaceduckOrange -"hi link jsForAwait SpaceduckOrange +hi link jsAsyncKeyword SpaceduckOrange +hi link jsForAwait SpaceduckOrange hi link jsClassKeyword SpaceduckPurple -"hi link jsClassDefinition SpaceduckYellow +hi link jsClassDefinition SpaceduckYellow hi link jsClassDefinition SpaceduckLightPurple hi link jsClassFuncName SpaceduckGreen hi link jsObjectProp SpaceduckMagenta hi link jsObjectKey SpaceduckViolet hi link jsThis SpaceduckYellow -hi link jsFunction SpaceduckPurple +hi link jsFunction SpaceduckLightPurple hi link jsFuncName SpaceduckGreen hi link jsParensCatch SpaceduckLightPurple From 8a15e21dd29851326d0bf89eab1b5d1681cc82c3 Mon Sep 17 00:00:00 2001 From: Jinho Date: Wed, 23 Jun 2021 15:00:32 +0900 Subject: [PATCH 33/47] feat: treesitter --- colors/spaceduck.vim | 54 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 1290b3a..186b0f8 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -23,18 +23,18 @@ let g:colors_name="spaceduck" " PALETTE: {{{ let s:palette = { - \ 'red': ['#e33400', '166'], - \ 'orange': ['#e39400', '172'], + \ 'red': ['#F25244', '166'], + \ 'orange': ['#f2ac49', '172'], \ 'green': ['#5ccc96', '78'], - \ 'yellow': ['#f2ce00', '220'], + \ 'yellow': ['#f2d73d', '220'], \ 'lavender': ['#b3a1e6', '146'], \ 'purple2': ['#7a5ccc', '98'], \ 'darkpurple': ['#30365F', '237'], \ 'darkpurple2': ['#686f9a', '60'], \ 'cyan': ['#59c2ff', '38'], - \ 'magenta': ['#ce6f8f', '168'], + \ 'magenta': ['#cc859c', '168'], \ - \ 'turquoise': ['#00d1b2', '78'], + \ 'turquoise': ['#ffd57f', '78'], \ 'light_blue': ['#14CFFB', '38'], \ \ 'deep_space': ['#0f111b', '233'], @@ -502,6 +502,50 @@ hi! link FernRootText SpaceduckPurple highlight default CocHighlightText guibg=#1b1c36 +" TreeSitter: +"hi SDComment guifg=#5F6799 +hi SDYellow guifg=#fccc5d +hi SDPink guifg=#c586c0 + +hi SDStolen guifg=#936ad9 +hi SDTeal guifg=#1abc9c +hi SDLight guifg=#9cdcfe + +hi SDComment guifg=#677AE6 +hi SDComment2 guifg=#455199 + +hi SDRed guifg=#F25244 + +hi link TSKeyword SDStolen +hi link TSProperty SpaceduckMagenta +hi link TSConstructor SpaceduckPurple +hi link TSParameter SpaceduckForeground +hi link TSTypeBuiltIn SpaceduckYellow + +hi link CocErrorHighlight SDRed + +hi link TSComment SDComment + +hi link TSTag SpaceduckPurple + +hi link TSType SpaceduckMagenta + +hi link TSPunctBracket SpaceduckDarkPurple2 +hi link TSPunctDelimiter SpaceduckForeground +hi link TSPunctSpecial SpaceduckDarkPurple2 +hi link TSTagDelimiter SpaceduckDarkPurple2 + +hi link TSConstBuiltin SpaceduckYellow +hi link TSVariableBuiltin SpaceduckYellow + +hi link TSString SpaceduckCyan +hi link TSBoolean SDYellow + +hi link TSConstant SpaceduckMagenta + +hi link TSNone SpaceduckForeground +hi link TSTitle SpaceduckForeground + " }}} " }}} From 02729667822b4c3cc8a930308f682e15ac83123c Mon Sep 17 00:00:00 2001 From: Jinho Date: Wed, 23 Jun 2021 15:05:43 +0900 Subject: [PATCH 34/47] fix: fix background color. --- colors/spaceduck.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 5121ef9..2300565 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -128,7 +128,7 @@ endif " }}} " Syntax Highlighting {{{ -call s:hi('Normal', s:palette.fg, s:palette.none ) +call s:hi('Normal', s:palette.fg, s:palette.bg ) call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) call s:hi('CursorLine', s:palette.none, s:palette.cursor ) call s:hi('Cursor', s:palette.background, s:palette.grey ) From 00a5cea8967ed0e4b9958f8c933ec9479fcb657f Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Wed, 23 Jun 2021 07:30:28 -0600 Subject: [PATCH 35/47] fix: Last color tweak on yellow and orange I promise --- colors/spaceduck.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 2300565..cf04e39 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -36,9 +36,9 @@ let g:colors_name="spaceduck" " PALETTE: {{{ let s:palette = { \ 'red': ['#f25244', '203'], - \ 'orange': ['#e6ac5c', '179'], + \ 'orange': ['#f2b45c', '215'], \ 'green': ['#5ccc96', '78'], - \ 'yellow': ['#f2e661', '221'], + \ 'yellow': ['#f2e15c', '221'], \ 'lightpurple': ['#b3a1e6', '146'], \ 'purple': ['#936ad9', '98'], \ 'darkpurple': ['#535f97', '236'], @@ -128,7 +128,7 @@ endif " }}} " Syntax Highlighting {{{ -call s:hi('Normal', s:palette.fg, s:palette.bg ) +call s:hi('Normal', s:palette.fg, s:palette.bg ) call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) call s:hi('CursorLine', s:palette.none, s:palette.cursor ) call s:hi('Cursor', s:palette.background, s:palette.grey ) @@ -304,11 +304,11 @@ hi link jsOperatorKeyword Operator hi link jsExceptions Error hi link jsObjectProp Tag hi link jsTernaryIfOperator Title -hi! link jsTemplateBraces SpaceduckPurple +"hi! link jsTemplateBraces SpaceduckPurple hi link jsTemplateExpression String hi! link jsArrowFunction SpaceduckYellow hi! link jsFuncArgs SpaceduckMagenta -hi! link jsFuncParens SpaceduckPurple +"hi! link jsFuncParens SpaceduckPurple hi! link jsDestructuringBraces SpaceduckDarkPurple hi! link jsObjectBraces SpaceduckDarkPurple hi! link jsModuleBraces SpaceduckDarkPurpl2 From a7536427119eeb838682758491c37caae91d0701 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Wed, 23 Jun 2021 13:12:24 -0600 Subject: [PATCH 36/47] refactor: reference color variables for terminal --- colors/spaceduck.vim | 100 ++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index cf04e39..beec5e3 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -22,6 +22,14 @@ endif let g:colors_name="spaceduck" " }}} +"TODO: 0.1 release +" Clean up syntax groups locations +" Barbar color groups +" Fix readme +" Testing... +" Treesitter cleanup + +" TODO: Add to changelog {{ "lavender is now light purple "purple2 is now purple "darkpurple is now selection @@ -32,6 +40,7 @@ let g:colors_name="spaceduck" "cream is now fg "comment is using darkpurple "oldcomment is using newColor? Violet? +" }} " PALETTE: {{{ let s:palette = { @@ -266,7 +275,6 @@ hi! link htmlH1 SpaceduckPurple " CSS {{{ hi link cssBraces Normal -hi! link cssSelectorOp SpaceduckMagenta hi! link cssSelectorOp SpaceduckViolet hi link cssAtKeyword SpaceduckLightPurple hi link cssBoxProp SpaceduckViolet @@ -487,7 +495,7 @@ hi link vistaScope Constant hi link vistaKind Conditional hi Sneak guifg=#000000 ctermfg=0 guibg=#f2ce00 ctermbg=220 gui=NONE cterm=NONE -" Barbar +" TODO: Update this with variables hi BufferCurrent guifg=#ecf0c1 ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferVisible guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferInactive guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE @@ -505,12 +513,12 @@ hi BufferCurrentTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=N hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -" NERDTree +" NERDTree: hi! link NERDTreeFlags SpaceduckCyan hi! link FernRootText SpaceduckPurple -" COC -highlight default CocHighlightText guibg=#1b1c36 +" COC: +highlight default CocHighlightText guibg=s:palette.cursor[0] hi! link CocErrorSign SpaceduckRed hi! link CocInfoSign SpaceduckYellow hi! link CocWarningSign SpaceduckOrange @@ -519,43 +527,31 @@ hi! link CocWarningSign SpaceduckOrange "hi SDComment guifg=#5F6799 hi SDYellow guifg=#fccc5d hi SDPink guifg=#c586c0 - hi SDStolen guifg=#936ad9 hi SDTeal guifg=#1abc9c hi SDLight guifg=#9cdcfe - hi SDComment guifg=#677AE6 hi SDComment2 guifg=#455199 - hi SDRed guifg=#F25244 -hi link TSKeyword SDStolen +hi link TSKeyword SpaceduckOrange hi link TSProperty SpaceduckMagenta hi link TSConstructor SpaceduckPurple hi link TSParameter SpaceduckForeground hi link TSTypeBuiltIn SpaceduckYellow - -hi link CocErrorHighlight SDRed - -hi link TSComment SDComment - +hi link CocErrorHighlight SpaceduckRed +hi link TSComment SpaceduckDarkPurple hi link TSTag SpaceduckPurple - hi link TSType SpaceduckMagenta - -hi link TSPunctBracket SpaceduckDarkPurple2 +hi link TSPunctBracket SpaceduckDarkPurple hi link TSPunctDelimiter SpaceduckForeground -hi link TSPunctSpecial SpaceduckDarkPurple2 -hi link TSTagDelimiter SpaceduckDarkPurple2 - +hi link TSPunctSpecial SpaceduckDarkPurple +hi link TSTagDelimiter SpaceduckDarkPurple hi link TSConstBuiltin SpaceduckYellow hi link TSVariableBuiltin SpaceduckYellow - hi link TSString SpaceduckCyan -hi link TSBoolean SDYellow - +hi link TSBoolean SpaceduckYellow hi link TSConstant SpaceduckMagenta - hi link TSNone SpaceduckForeground hi link TSTitle SpaceduckForeground @@ -563,31 +559,45 @@ hi link TSTitle SpaceduckForeground " }}} -" TODO: Need to update this with colors from above +" TODO: Check to see if this works correctly? " Terminal colors VIM / NeoVIM {{{ " Neovim uses different terminal colors apart from Vim if has('nvim') - let g:terminal_color_foreground = "#ecf0c1" - let g:terminal_color_background = "#0f111b" - let g:terminal_color_0 = "#000000" - let g:terminal_color_1 = "#e33400" "red - let g:terminal_color_2 = "#5ccc96" "green - let g:terminal_color_3 = "#b3a1e6" "light purple - let g:terminal_color_4 = "#00a3cc" - let g:terminal_color_5 = "#ce6f8f" - let g:terminal_color_6 = "#7a5ccc" - let g:terminal_color_7 = "#686f9a" - let g:terminal_color_8 = "#686f9a" - let g:terminal_color_9 = "#e33400" - let g:terminal_color_10 = "#5ccc96" - let g:terminal_color_11 = "#b3a1e6" - let g:terminal_color_12 = "#00a3cc" - let g:terminal_color_13 = "#ce6f8f" - let g:terminal_color_14 = "#7a5ccc" - let g:terminal_color_15 = "#ecf0c1" + let g:terminal_color_foreground = s:palette['foreground'][0] + let g:terminal_color_background = s:palette['background'][0] + let g:terminal_color_0 = s:palette['black'][0] + let g:terminal_color_1 = s:palette['red'][0] + let g:terminal_color_2 = s:palette['green'][0] + let g:terminal_color_3 = s:palette['lightpurple'][0] + let g:terminal_color_4 = s:palette['cyan'][0] + let g:terminal_color_5 = s:palette['magenta'][0] + let g:terminal_color_6 = s:palette['purple'][0] + let g:terminal_color_7 = s:palette['darkpurple'][0] + let g:terminal_color_8 = s:palette['darkpurple'][0] + let g:terminal_color_9 = s:palette['red'][0] + let g:terminal_color_10 = s:palette['green'][0] + let g:terminal_color_11 = s:palette['lightpurple'][0] + let g:terminal_color_12 = s:palette['cyan'][0] + let g:terminal_color_13 = s:palette['magenta'][0] + let g:terminal_color_14 = s:palette['purple'][0] + let g:terminal_color_15 = s:palette['foreground'][0] else let g:terminal_ansi_colors = [ - \ '#000000', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#686f9a', - \ '#686f9a', '#e33400', '#5ccc96', '#b3a1e6', '#00a3cc', '#ce6f8f', '#7a5ccc', '#ecf0c1'] + \ s:palette['black'][0], + \ s:palette['red'][0], + \ s:palette['green'][0], + \ s:palette['lightpurple'][0], + \ s:palette['cyan'][0], + \ s:palette['magenta'][0], + \ s:palette['purple'][0], + \ s:palette['darkpurple'], + \ s:palette['darkpurple'][0], + \ s:palette['red'][0], + \ s:palette['green'][0], + \ s:palette['lightpurple'][0], + \ s:palette['cyan'][0], + \ s:palette['magenta'][0], + \ s:palette['purple'][0], + \ s:palette.['foreground'][0] ] endif " }}} From 60079efccaa4650a98803765c3a159a3f30785b9 Mon Sep 17 00:00:00 2001 From: Nargonath Date: Sat, 26 Jun 2021 19:29:37 +0200 Subject: [PATCH 37/47] fix: use hi function for color from palette and remove syntax error --- colors/spaceduck.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index beec5e3..5e27a3d 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -518,7 +518,7 @@ hi! link NERDTreeFlags SpaceduckCyan hi! link FernRootText SpaceduckPurple " COC: -highlight default CocHighlightText guibg=s:palette.cursor[0] +call s:hi('CocHighlightText', s:palette.none, s:palette.cursor) hi! link CocErrorSign SpaceduckRed hi! link CocInfoSign SpaceduckYellow hi! link CocWarningSign SpaceduckOrange @@ -598,6 +598,7 @@ else \ s:palette['cyan'][0], \ s:palette['magenta'][0], \ s:palette['purple'][0], - \ s:palette.['foreground'][0] ] + \ s:palette['foreground'][0] + \ ] endif " }}} From 467d85e80d1338591fa5dde62fdd7b1b5c3e43fe Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 27 Jun 2021 00:27:08 -0600 Subject: [PATCH 38/47] add: updates to changelog for v0.1.0 --- CHANGELOG.MD | 42 +++++++++++++++++++++++++++++++++++------- colors/spaceduck.vim | 15 --------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 59b6497..007c8ff 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -4,16 +4,44 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] +- Light, medium contrast variant themes. +- Support for user config for bold and italic text. +- Full TreeSitter support. +- Lua version of color scheme for neovim. +- Better diff view colors. + + +## [0.1.0, Unreleased] - 2020-06-TBD -## [0.1.0] - 2020-06-20 ### Added - This CHANGELOG file to hopefully serve as an evolving example of a standardized open source project CHANGELOG. -- CNAME file to enable GitHub Pages custom domain -- README now contains answers to common questions about CHANGELOGs -- Good examples and basic guidelines, including proper date formatting. -- Counter-examples: "What makes unicorns cry?" +- New organization: [Spaceduck Theme](https://github.com/spaceduck-theme) + to track all ports. +- Hot new violet color: #5c6dcc + +### Changed +- Changed color names for more semantic consistency. + Ie: Went from 'purple1', 'purple2' to 'purple', 'dark purple', etc. +- Color corrected most colors to focus on 16bit color harmony. + (a huge departure from consistency with the 256 version): + - Red: #e33400 -> #f25244 + - Orange: #e39400 -> #f2b45c + - Yellow: #f2ce00 -> #f2e15c + - Purple: #7a5ccc -> #946cd9 + - Cyan: #00a3cc -> #59C2FF + - Magenta: #ce6f8f -> #cc7893 + - DarkPurple: #686f9a -> #535f97 + - Selection: #1b1c36 -> #30365F + + +### Removed +- No longer using estilo as a dependency to manage colors, instead using viml dictionary like other modern color schemes. + + +### Fixed +- Brighter comment color. Yes you can see actually see them now. #30365F -> #535f97 - - + diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 5e27a3d..e41009f 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -29,19 +29,6 @@ let g:colors_name="spaceduck" " Testing... " Treesitter cleanup -" TODO: Add to changelog {{ -"lavender is now light purple -"purple2 is now purple -"darkpurple is now selection -"darkpurple2 is now darkpurple -"turquoise is now violet -"light_blue got removed -"deep_space is now background -"cream is now fg -"comment is using darkpurple -"oldcomment is using newColor? Violet? -" }} - " PALETTE: {{{ let s:palette = { \ 'red': ['#f25244', '203'], @@ -53,9 +40,7 @@ let s:palette = { \ 'darkpurple': ['#535f97', '236'], \ 'cyan': ['#59c2ff', '75'], \ 'magenta': ['#cc7893', '174'], - \ \ 'violet': ['#5c6dcc', '62'], - \ 'lightorange': ['#f29d61', '215'], \ \ 'background': ['#0f111b', '233'], \ 'foreground': ['#ecf0c1', '255'], From 30ec8d01adc64882184a06cbf6171d3dbdadf24d Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 27 Jun 2021 07:15:11 -0600 Subject: [PATCH 39/47] fix: remove light orange. good catch @euglevi. I need to stop drinking when doing this --- colors/spaceduck.vim | 1 - 1 file changed, 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index e41009f..effa6e8 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -87,7 +87,6 @@ if &background == 'dark' call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) call s:hi('SpaceduckViolet', s:palette.violet, s:palette.none) - call s:hi('SpaceduckLightOrange', s:palette.lightorange, s:palette.none) call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) From a92be8a57cb154a4b7c1835d03ed48cbf6378d9e Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 27 Jun 2021 15:14:43 -0600 Subject: [PATCH 40/47] fix: update lualine colors to new palette --- lua/lualine/themes/spaceduck.lua | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lua/lualine/themes/spaceduck.lua b/lua/lualine/themes/spaceduck.lua index 689da7c..90fd546 100644 --- a/lua/lualine/themes/spaceduck.lua +++ b/lua/lualine/themes/spaceduck.lua @@ -1,47 +1,47 @@ local spaceduck = {} local colors = { - black = '#0f111b', - white = '#ecf0c1', - red = '#e33400', - green = '#5ccc96', - blue = '#00a3cc', - purple = '#7a5ccc', - yellow = '#f2ce00', - gray = '#686f9a', - darkgray = '#30365F', - lightgray = '#c1c3cc' + background = '#0f111b', + foreground = '#ecf0c1', + red = '#f25244', + green = '#5ccc96', + cyan = '#59c2ff', + purple = '#936ad9', + yellow = '#f2e15c', + darkpurple = '#535f97', + selection = '#30365F', + lightgrey = '#c1c3cc' } spaceduck.normal = { -- gui parameter is optional and behaves the same way as in vim's highlight command - a = {bg = colors.gray, fg = colors.black, gui = 'bold'}, - b = {bg = colors.darkgray, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.darkpurple, fg = colors.background, gui = 'bold'}, + b = {bg = colors.selection, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } spaceduck.insert = { - a = {bg = colors.green, fg = colors.black, gui = 'bold'}, - b = {bg = colors.darkgray, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.green, fg = colors.background, gui = 'bold'}, + b = {bg = colors.selection, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } spaceduck.visual = { - a = {bg = colors.yellow, fg = colors.black, gui = 'bold'}, - b = {bg = colors.darkgray, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.yellow, fg = colors.background, gui = 'bold'}, + b = {bg = colors.selection, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } spaceduck.replace = { - a = {bg = colors.purple, fg = colors.black, gui = 'bold'}, - b = {bg = colors.darkgray, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.purple, fg = colors.background, gui = 'bold'}, + b = {bg = colors.selection, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } spaceduck.command = { - a = {bg = colors.blue, fg = colors.black, gui = 'bold'}, - b = {bg = colors.darkgray, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.cyan, fg = colors.background, gui = 'bold'}, + b = {bg = colors.selection, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } -- you can assign one colorscheme to another, if a colorscheme is @@ -49,9 +49,9 @@ spaceduck.command = { spaceduck.terminal = spaceduck.normal spaceduck.inactive = { - a = {bg = colors.black, fg = colors.lightgray, gui = 'bold'}, - b = {bg = colors.black, fg = colors.lightgray}, - c = {bg = colors.black, fg = colors.lightgray} + a = {bg = colors.background, fg = colors.lightgrey, gui = 'bold'}, + b = {bg = colors.background, fg = colors.lightgrey}, + c = {bg = colors.background, fg = colors.lightgrey} } -- lualine.theme = spaceduck From 7b22445bfb720feb7e23ff987f7255fde5b34aa1 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sun, 27 Jun 2021 21:57:04 -0600 Subject: [PATCH 41/47] change: lighter dark purple and violet and red --- CHANGELOG.MD | 16 +- colors/spaceduck.vim | 356 +++++++++++++++++-------------- lua/lualine/themes/spaceduck.lua | 2 +- 3 files changed, 207 insertions(+), 167 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 007c8ff..ea5dec5 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -9,7 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support for user config for bold and italic text. - Full TreeSitter support. - Lua version of color scheme for neovim. -- Better diff view colors. +- Better vimdiff colors. +- Popular plugin support: + - Vimwiki + - Startify + - Whichkey + - Easymotion + - Galaxyline ## [0.1.0, Unreleased] - 2020-06-TBD @@ -18,9 +24,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - This CHANGELOG file to hopefully serve as an evolving example of a standardized open source project CHANGELOG. -- New organization: [Spaceduck Theme](https://github.com/spaceduck-theme) +- New organization created: [Spaceduck Theme](https://github.com/spaceduck-theme) to track all ports. -- Hot new violet color: #5c6dcc +- Hot new violet color: #5c65cc ### Changed - Changed color names for more semantic consistency. @@ -33,7 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Purple: #7a5ccc -> #946cd9 - Cyan: #00a3cc -> #59C2FF - Magenta: #ce6f8f -> #cc7893 - - DarkPurple: #686f9a -> #535f97 + - DarkPurple: #686f9a -> #5966a1 - Selection: #1b1c36 -> #30365F @@ -42,6 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Brighter comment color. Yes you can see actually see them now. #30365F -> #535f97 +- Brighter comment color. Contrast ratio: of 3.43:1 still not full AA compliant but it's brighter. #30365F -> #5966a1 diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index effa6e8..54a9622 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -24,29 +24,26 @@ let g:colors_name="spaceduck" "TODO: 0.1 release " Clean up syntax groups locations -" Barbar color groups " Fix readme " Testing... -" Treesitter cleanup " PALETTE: {{{ let s:palette = { - \ 'red': ['#f25244', '203'], + \ 'red': ['#f54f40', '203'], \ 'orange': ['#f2b45c', '215'], \ 'green': ['#5ccc96', '78'], \ 'yellow': ['#f2e15c', '221'], \ 'lightpurple': ['#b3a1e6', '146'], \ 'purple': ['#936ad9', '98'], - \ 'darkpurple': ['#535f97', '236'], + \ 'darkpurple': ['#5966a1', '61'], \ 'cyan': ['#59c2ff', '75'], \ 'magenta': ['#cc7893', '174'], - \ 'violet': ['#5c6dcc', '62'], + \ 'violet': ['#5c67e6', '62'], \ \ 'background': ['#0f111b', '233'], \ 'foreground': ['#ecf0c1', '255'], \ 'selection': ['#30365f', '237'], \ 'cursor': ['#1b1c36', '234'], - \ 'comment': ['#535f97', '236'], \ \ 'grey': ['#818596', '102'], \ 'lightgrey': ['#c1c3cc', '102'], @@ -83,17 +80,16 @@ if &background == 'dark' call s:hi('SpaceduckLightPurple', s:palette.lightpurple, s:palette.none) call s:hi('SpaceduckPurple', s:palette.purple, s:palette.none) call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) - call s:hi('SpaceduckSelection', s:palette.selection, s:palette.none) call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) call s:hi('SpaceduckViolet', s:palette.violet, s:palette.none) - - call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) - call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) - call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) call s:hi('SpaceduckLightGrey', s:palette.lightgrey, s:palette.none) + call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) + call s:hi('SpaceduckBackground', s:palette.background, s:palette.none) + call s:hi('SpaceduckCursor', s:palette.cursor, s:palette.none) + call s:hi('SpaceduckSelection', s:palette.selection, s:palette.none) let s:palette.bg = s:palette.background let s:palette.fg = s:palette.foreground @@ -113,7 +109,6 @@ if exists('g:spaceduck_dev_light_theme') call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) - call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) let s:palette.bg = s:palette.foreground let s:palette.fg = s:palette.background @@ -136,17 +131,17 @@ call s:hi('EndOfBuffer', s:palette.selection, s:palette.none call s:hi('FoldColumn', s:palette.selection, s:palette.none ) call s:hi('Folded', s:palette.darkpurple, s:palette.none ) " TODO: better incsearch & Search -call s:hi('IncSearch', s:palette.black, s:palette.darkpurple, 'underline') -call s:hi('LineNr', s:palette.selection, s:palette.background ) +call s:hi('IncSearch', s:palette.white, s:palette.cursor, 'underline') +call s:hi('LineNr', s:palette.selection, s:palette.background ) call s:hi('MatchParen', s:palette.white, s:palette.darkpurple ) call s:hi('Pmenu', s:palette.fg, s:palette.cursor ) call s:hi('PmenuSbar', s:palette.none, s:palette.selection ) -call s:hi('PmenuSel', s:palette.lightgrey, s:palette.selection ) +call s:hi('PmenuSel', s:palette.white, s:palette.selection ) call s:hi('PmenuThumb', s:palette.none, s:palette.darkpurple ) call s:hi('QuickFixLine', s:palette.fg, s:palette.cursor ) -call s:hi('Search', s:palette.black, s:palette.violet ) +call s:hi('Search', s:palette.white, s:palette.selection, ) call s:hi('SignColumn', s:palette.orange, s:palette.bg ) call s:hi('SpecialKey', s:palette.orange, s:palette.bg ) call s:hi('SpellBad', s:palette.red, s:palette.none, 'underline') @@ -159,15 +154,15 @@ call s:hi('StatusLineTermNC', s:palette.bg, s:palette.darkpurple, 'reve call s:hi('TabLine', s:palette.bg, s:palette.grey ) call s:hi('TabLineFill', s:palette.grey, s:palette.black ) call s:hi('TabLineSel', s:palette.lightgrey, s:palette.background ) -call s:hi('VertSplit', s:palette.darkpurple, s:palette.none ) +call s:hi('VertSplit', s:palette.selection, s:palette.none ) call s:hi('Visual', s:palette.none, s:palette.selection ) call s:hi('WarningMsg', s:palette.orange, s:palette.background ) call s:hi('WildMenu', s:palette.black, s:palette.lightgrey ) " SYNTAX: Predefined syntax groups {{{ -hi! link Comment SpaceduckComment hi! link Boolean SpaceduckYellow hi! link Character SpaceduckYellow +hi! link Comment SpaceduckDarkPurple hi! link Conditional SpaceduckGreen hi! link Constant SpaceduckYellow hi! link Debug SpaceduckLightPurple @@ -190,11 +185,11 @@ hi! link PreProc SpaceduckLightPurple hi! link Repeat SpaceduckGreen hi! link Special SpaceduckLightPurple hi! link SpecialChar SpaceduckOrange +hi! link SpecialComment Comment hi! link Statement SpaceduckGreen hi! link StorageClass SpaceduckLightPurple hi! link String SpaceduckCyan hi! link Structure SpaceduckCyan -hi! link SpecialComment Comment hi! link Tag SpaceduckLightPurple hi! link Type SpaceduckMagenta hi! link Typedef SpaceduckCyan @@ -221,119 +216,117 @@ hi! link NonText EndOfBuffer hi! link TermCursor Cursor " C / C++ {{{ -hi link cFormat Title -hi link cCppOutIf1 Normal -hi link cCppOutIf2 Normal -hi link cBracket Title +hi link cFormat Title +hi link cCppOutIf1 Normal +hi link cCppOutIf2 Normal +hi link cBracket Title " }}} " Fortran {{{ -hi link fortranType Tag -hi link fortranStructure Structure +hi link fortranType Tag +hi link fortranStructure Structure hi link fortranStorageClass StorageClass -hi link fortranUnitHeader Title +hi link fortranUnitHeader Title " }}} " Haskell {{{ -hi link haskellType Tag -hi link haskellIdentifier Label -hi link haskellKeyword Boolean -hi link haskellDecl Boolean +hi link haskellType Tag +hi link haskellIdentifier Label +hi link haskellKeyword Boolean +hi link haskellDecl Boolean " }}} " Java {{{ -hi link javaClassDecl Structure -hi link javaTypeDef Keyword +hi link javaClassDecl Structure +hi link javaTypeDef Keyword " }}} " HTML {{{ -hi link htmlTagName Function -hi link htmlEndTag Conditional -hi link htmlArg SpaceduckMagenta -hi link htmlSpecialTagName Type -hi! link htmlTag SpaceduckDarkPurple -hi! link htmlEndTag SpaceduckDarkPurple -hi! link htmlTitle SpaceduckPurple -hi! link htmlH1 SpaceduckPurple +hi link htmlTagName Function +hi link htmlEndTag Conditional +hi link htmlArg SpaceduckMagenta +hi link htmlSpecialTagName Type +hi! link htmlTag SpaceduckDarkPurple +hi! link htmlEndTag SpaceduckDarkPurple " }}} " CSS {{{ -hi link cssBraces Normal -hi! link cssSelectorOp SpaceduckViolet -hi link cssAtKeyword SpaceduckLightPurple -hi link cssBoxProp SpaceduckViolet -hi link cssBackgroundProp SpaceduckMagenta -hi link cssTextProp SpaceduckMagenta -hi link cssTagName SpaceduckGreen -hi link cssPseudoClassId SpaceduckMagenta -hi link cssClassName SpaceduckViolet +hi link cssBraces Normal +hi! link cssSelectorOp SpaceduckViolet +hi link cssAtKeyword SpaceduckLightPurple +hi link cssBoxProp SpaceduckViolet +hi link cssBackgroundProp SpaceduckMagenta +hi link cssTextProp SpaceduckMagenta +hi link cssTagName SpaceduckGreen +hi link cssPseudoClassId SpaceduckMagenta +hi link cssClassName SpaceduckViolet " }}} " php {{{ -hi link phpFunction Function -hi link phpKeyword Function -hi link phpMethod Function -hi link phpClass SpaceduckYellow -hi link phpType SpaceduckPurple -hi link phpIdentifier SpaceduckForeground -hi link phpVarSelector SpaceduckDarkPurple -hi link phpParent SpaceduckForeground -hi link phpSuperglobals SpaceduckMagenta -hi link Delimiter SpaceduckLightPurple -hi link phpStringSingle String -hi link phpStringDouble String +hi link phpFunction Function +hi link phpKeyword Function +hi link phpMethod Function +hi link phpClass SpaceduckYellow +hi link phpType SpaceduckPurple +hi link phpIdentifier SpaceduckForeground +hi link phpVarSelector SpaceduckDarkPurple +hi link phpParent SpaceduckForeground +hi link phpSuperglobals SpaceduckMagenta +hi link Delimiter SpaceduckLightPurple +hi link phpStringSingle String +hi link phpStringDouble String " }}} " JavaScript {{{ -hi link jsStorageClass Title -hi link jsFunction Function -hi link jsFuncName Special -hi link jsOperator Operator -hi link jsNull Constant -hi link jsGlobalObjects Constant -hi link jsFuncCall Function -hi link jsOperatorKeyword Operator -hi link jsExceptions Error -hi link jsObjectProp Tag -hi link jsTernaryIfOperator Title +"hi link jsStorageClass Title +"hi link jsFunction Function +"hi link jsFuncName Special +"hi link jsOperator Operator +"hi link jsNull Constant +"hi link jsGlobalObjects Constant +"hi link jsFuncCall Function +"hi link jsOperatorKeyword Operator +"hi link jsExceptions Error +"hi link jsObjectProp Tag +"hi link jsTernaryIfOperator Title "hi! link jsTemplateBraces SpaceduckPurple -hi link jsTemplateExpression String -hi! link jsArrowFunction SpaceduckYellow -hi! link jsFuncArgs SpaceduckMagenta +"hi link jsTemplateExpression String +"hi! link jsArrowFunction SpaceduckYellow +"hi! link jsFuncArgs SpaceduckMagenta "hi! link jsFuncParens SpaceduckPurple -hi! link jsDestructuringBraces SpaceduckDarkPurple -hi! link jsObjectBraces SpaceduckDarkPurple -hi! link jsModuleBraces SpaceduckDarkPurpl2 -hi! link jsBrackets SpaceduckDarkPurple -hi! link jsTemplateExpression SpaceduckMagenta - -hi link jsxTagName HTMLTagName -hi link jsxClosePunct jsxOpenPunct -hi link jsxCloseString jsxClosePunct -hi! link jsxOpenPunct SpaceduckDarkPurple -hi! link jsxComponentName SpaceduckPurple -hi! link jsxTag SpaceduckLightPurple - -hi link jsAsyncKeyword SpaceduckLightPurple -hi link jsForAwait SpaceduckLightPurple -hi link jsAsyncKeyword SpaceduckOrange -hi link jsForAwait SpaceduckOrange - -hi link jsClassKeyword SpaceduckPurple -hi link jsClassDefinition SpaceduckYellow -hi link jsClassDefinition SpaceduckLightPurple -hi link jsClassFuncName SpaceduckGreen -hi link jsObjectProp SpaceduckMagenta -hi link jsObjectKey SpaceduckViolet -hi link jsThis SpaceduckYellow -hi link jsFunction SpaceduckLightPurple -hi link jsFuncName SpaceduckGreen - -hi link jsParensCatch SpaceduckLightPurple -hi link jsParenCatch SpaceduckMagenta - -hi link jsonQuote Label -hi link jsoncBraces SpaceduckDarkPurple +"hi! link jsDestructuringBraces SpaceduckDarkPurple +"hi! link jsObjectBraces SpaceduckDarkPurple +"hi! link jsModuleBraces SpaceduckDarkPurpl2 +"hi! link jsBrackets SpaceduckDarkPurple +"hi! link jsTemplateExpression SpaceduckMagenta + +"hi link jsxTagName HTMLTagName +"hi link jsxClosePunct jsxOpenPunct +"hi link jsxCloseString jsxClosePunct +"hi! link jsxOpenPunct SpaceduckDarkPurple +"hi! link jsxComponentName SpaceduckPurple +"hi! link jsxTag SpaceduckLightPurple + +"hi link jsAsyncKeyword SpaceduckLightPurple +"hi link jsForAwait SpaceduckLightPurple +"hi link jsAsyncKeyword SpaceduckOrange +"hi link jsForAwait SpaceduckOrange + +"hi link jsClassKeyword SpaceduckViolet +"hi link jsClassDefinition SpaceduckYellow +"hi link jsClassDefinition SpaceduckLightPurple +"hi link jsClassFuncName SpaceduckGreen +"hi link jsObjectProp SpaceduckMagenta +"hi link jsObjectKey SpaceduckViolet +"hi link jsThis SpaceduckYellow +"hi link jsFunction SpaceduckLightPurple +"hi link jsFuncName SpaceduckGreen + +"hi link jsParensCatch SpaceduckLightPurple +"hi link jsParenCatch SpaceduckMagenta + +"hi link jsonQuote Label +"hi link jsoncBraces SpaceduckDarkPurple " }}} " Others {{{ @@ -463,39 +456,43 @@ hi! link graphqlStructure Define hi link yamlKeyValueDelimiter Normal hi link yamlBlockMappingKey Function " }}} -" -" VIM {{{ + +" VIML {{{ hi link vimGroupName Normal hi! link vimLet SpaceduckPurple2 hi! link vimVar SpaceduckForeground hi link vimScriptDelim SpaceduckMagenta " }}} -" Plugins {{{ +" PLUGINS {{{ + +" Vista hi link vistaTag Conditional hi link vistaIcon Identifier hi link vistaColon Normal hi link vistaScope Constant hi link vistaKind Conditional -hi Sneak guifg=#000000 ctermfg=0 guibg=#f2ce00 ctermbg=220 gui=NONE cterm=NONE + +" Vim Sneak +call s:hi('Sneak', s:palette.background, s:palette.yellow) " TODO: Update this with variables -hi BufferCurrent guifg=#ecf0c1 ctermfg=251 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisible guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactive guifg=#535F97 ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferTabpageFill guifg=#0f111b ctermfg=233 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferCurrentIndex guifg=#5ccc96 ctermfg=78 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisibleIndex guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactiveIndex guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferCurrentMod guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisibleMod guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactiveMod guifg=#e39400 ctermfg=172 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferCurrentSign guifg=#5ccc96 ctermfg=78 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisibleSign guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactiveSign guifg=#30365F ctermfg=237 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferCurrentTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferVisibleTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE -hi BufferInactiveTarget guifg=#ce6f8f ctermfg=168 guibg=#0f111b ctermbg=233 gui=NONE cterm=NONE +hi link BufferCurrent SpaceduckForeground +hi link BufferVisible SpaceduckDarkPurple +hi link BufferInactive SpaceduckDarkPurple +hi link BufferTabpageFill SpaceduckBackground +hi link BufferCurrentIndex SpaceduckGreen +hi link BufferVisibleIndex SpaceduckSelection +hi link BufferInactiveIndex SpaceduckSelection +hi link BufferCurrentMod SpaceduckOrange +hi link BufferVisibleMod SpaceduckOrange +hi link BufferInactiveMod SpaceduckOrange +hi link BufferCurrentSign SpaceduckGreen +hi link BufferVisibleSign SpaceduckSelection +hi link BufferInactiveSign SpaceduckSelection +hi link BufferCurrentTarget SpaceduckMagenta +hi link BufferVisibleTarget SpaceduckMagenta +hi link BufferInactiveTarget SpaceduckMagenta " NERDTree: hi! link NERDTreeFlags SpaceduckCyan @@ -503,41 +500,78 @@ hi! link FernRootText SpaceduckPurple " COC: call s:hi('CocHighlightText', s:palette.none, s:palette.cursor) -hi! link CocErrorSign SpaceduckRed -hi! link CocInfoSign SpaceduckYellow -hi! link CocWarningSign SpaceduckOrange +hi! link CocErrorSign SpaceduckRed +hi! link CocInfoSign SpaceduckYellow +hi! link CocWarningSign SpaceduckOrange +hi! link CocErrorHighlight SpaceduckRed + +" COC Explorer TODO: Need to test +hi link CocExplorerIndentLine SpaceduckCursor +hi link CocExplorerBufferRoot SpaceduckCyan +hi link CocExplorerFileRoot SpaceduckCyan +hi link CocExplorerBufferFullPath SpaceduckDarkPurple +hi link CocExplorerFileFullPath SpaceduckDarkPurple +hi link CocExplorerBufferReadonly SpaceduckMagenta +hi link CocExplorerBufferModified SpaceduckMagenta +hi link CocExplorerBufferNameVisible SpaceduckGreen +hi link CocExplorerFileReadonly SpaceduckMagenta +hi link CocExplorerFileModified SpaceduckMagenta +hi link CocExplorerFileHidden SpaceduckDarkPurple +hi link CocExplorerHelpLine SpaceduckMagenta " TreeSitter: -"hi SDComment guifg=#5F6799 -hi SDYellow guifg=#fccc5d -hi SDPink guifg=#c586c0 -hi SDStolen guifg=#936ad9 -hi SDTeal guifg=#1abc9c -hi SDLight guifg=#9cdcfe -hi SDComment guifg=#677AE6 -hi SDComment2 guifg=#455199 -hi SDRed guifg=#F25244 - -hi link TSKeyword SpaceduckOrange -hi link TSProperty SpaceduckMagenta -hi link TSConstructor SpaceduckPurple -hi link TSParameter SpaceduckForeground -hi link TSTypeBuiltIn SpaceduckYellow -hi link CocErrorHighlight SpaceduckRed -hi link TSComment SpaceduckDarkPurple -hi link TSTag SpaceduckPurple -hi link TSType SpaceduckMagenta -hi link TSPunctBracket SpaceduckDarkPurple -hi link TSPunctDelimiter SpaceduckForeground -hi link TSPunctSpecial SpaceduckDarkPurple -hi link TSTagDelimiter SpaceduckDarkPurple -hi link TSConstBuiltin SpaceduckYellow -hi link TSVariableBuiltin SpaceduckYellow -hi link TSString SpaceduckCyan -hi link TSBoolean SpaceduckYellow -hi link TSConstant SpaceduckMagenta -hi link TSNone SpaceduckForeground -hi link TSTitle SpaceduckForeground + +" TODO: UNTESTED Treesitter +hi link TSAnnotation SpaceduckMagenta +hi link TSAttribute SpaceduckMagenta +hi link TSBoolean SpaceduckYellow +hi link TSCharacter SpaceduckYellow +hi link TSComment SpaceduckDarkPurple +hi link TSConditional SpaceduckGreen +hi link TSConstBuiltin SpaceduckYellow +hi link TSConstMacro SpaceduckPurple +hi link TSConstant SpaceduckMagenta +hi link TSConstructor SpaceduckPurple +hi link TSEmphasis SpaceduckForeground +hi link TSError SpaceduckRed +hi link TSException SpaceduckOrange +hi link TSField SpaceduckOrange +hi link TSFloat SpaceduckYellow +hi link TSFuncBuiltin SpaceduckGreen +hi link TSFuncMacro SpaceduckPurple +hi link TSFunction SpaceduckGreen +hi link TSInclude SpaceduckLightPurple +hi link TSKeyword SpaceduckOrange +hi link TSKeywordOperator SpaceduckForeground +hi link TSLabel SpaceduckOrange +hi link TSLiteral SpaceduckForeground +hi link TSMethod SpaceduckGreen +hi link TSNamespace SpaceduckPurple +hi link TSNone SpaceduckForeground +hi link TSNumber SpaceduckForeground +hi link TSOperator SpaceduckForeground +hi link TSParameter SpaceduckForeground +hi link TSParameter SpaceduckForeground +hi link TSParameterReference SpaceduckForeground +hi link TSProperty SpaceduckMagenta +hi link TSPunctBracket SpaceduckDarkPurple +hi link TSPunctDelimiter SpaceduckForeground +hi link TSPunctSpecial SpaceduckDarkPurple +hi link TSRepeat SpaceduckGreen +hi link TSString SpaceduckCyan +hi link TSStringEscape SpaceduckCyan +hi link TSStringRegex SpaceduckOrange +hi link TSStrong SpaceduckForeground +hi link TSStructure SpaceduckPurple +hi link TSTag SpaceduckPurple +hi link TSTagDelimiter SpaceduckDarkPurple +hi link TSText SpaceduckForeground +hi link TSType SpaceduckMagenta +hi link TSTypeBuiltIn SpaceduckYellow +hi link TSURI SpaceduckForeground +hi link TSUnderline SpaceduckForeground +hi link TSVariable SpaceduckLightPurple +hi link TSVariableBuiltin SpaceduckPurple " }}} diff --git a/lua/lualine/themes/spaceduck.lua b/lua/lualine/themes/spaceduck.lua index 90fd546..371466c 100644 --- a/lua/lualine/themes/spaceduck.lua +++ b/lua/lualine/themes/spaceduck.lua @@ -8,7 +8,7 @@ local colors = { cyan = '#59c2ff', purple = '#936ad9', yellow = '#f2e15c', - darkpurple = '#535f97', + darkpurple = '#5966a1', selection = '#30365F', lightgrey = '#c1c3cc' } From f1a59d3a7f73b7cf9731c1c8dec9348dff4051fb Mon Sep 17 00:00:00 2001 From: Jinho Date: Mon, 28 Jun 2021 13:06:31 +0900 Subject: [PATCH 42/47] feat: add some Treesitter syntax --- colors/spaceduck.vim | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 2300565..9d2e11b 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -515,6 +515,10 @@ hi! link CocErrorSign SpaceduckRed hi! link CocInfoSign SpaceduckYellow hi! link CocWarningSign SpaceduckOrange +" }}} + +" }}} + " TreeSitter: "hi SDComment guifg=#5F6799 hi SDYellow guifg=#fccc5d @@ -531,9 +535,10 @@ hi SDRed guifg=#F25244 hi link TSKeyword SDStolen hi link TSProperty SpaceduckMagenta -hi link TSConstructor SpaceduckPurple +hi link TSConstructor SpaceduckLightPurple hi link TSParameter SpaceduckForeground hi link TSTypeBuiltIn SpaceduckYellow +hi link TSOperator SpaceduckMagenta hi link CocErrorHighlight SDRed @@ -541,12 +546,12 @@ hi link TSComment SDComment hi link TSTag SpaceduckPurple -hi link TSType SpaceduckMagenta +hi link TSType SpaceduckLightPurple -hi link TSPunctBracket SpaceduckDarkPurple2 +hi link TSPunctBracket SpaceduckForeground hi link TSPunctDelimiter SpaceduckForeground -hi link TSPunctSpecial SpaceduckDarkPurple2 -hi link TSTagDelimiter SpaceduckDarkPurple2 +hi link TSPunctSpecial SpaceduckForeground +hi link TSTagDelimiter SpaceduckDarkPurple hi link TSConstBuiltin SpaceduckYellow hi link TSVariableBuiltin SpaceduckYellow @@ -559,11 +564,8 @@ hi link TSConstant SpaceduckMagenta hi link TSNone SpaceduckForeground hi link TSTitle SpaceduckForeground -" }}} - -" }}} - " TODO: Need to update this with colors from above + " Terminal colors VIM / NeoVIM {{{ " Neovim uses different terminal colors apart from Vim if has('nvim') From 187011426328cc0eebd2805a909697ad1a8586dc Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 3 Jul 2021 11:09:58 +0900 Subject: [PATCH 43/47] feat: experimenting with colors and TreeSitter --- colors/spaceduck.vim | 87 +++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 34 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 30c51f4..74932bd 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -27,26 +27,32 @@ let g:colors_name="spaceduck" " Fix readme " Testing... + " \ 'yellow': ['#f2e661', '221'], " PALETTE: {{{ let s:palette = { \ 'red': ['#f54f40', '203'], \ 'orange': ['#f2b45c', '215'], + \ 'orange2': ['#e78a4e', '215'], \ 'green': ['#5ccc96', '78'], - \ 'yellow': ['#f2e15c', '221'], + \ 'green2': ["#00C9A7", '144'], + \ 'yellow': ['#ffdc5e', '221'], \ 'lightpurple': ['#b3a1e6', '146'], \ 'purple': ['#936ad9', '98'], \ 'darkpurple': ['#5966a1', '61'], \ 'cyan': ['#59c2ff', '75'], + \ 'lightblue': ['#30ccd0', '75'], \ 'magenta': ['#cc7893', '174'], \ 'violet': ['#5c67e6', '62'], \ + \ 'pink': ['#D4A5D0', '255'], + \ \ 'background': ['#0f111b', '233'], \ 'foreground': ['#ecf0c1', '255'], \ 'selection': ['#30365f', '237'], \ 'cursor': ['#1b1c36', '234'], \ \ 'grey': ['#818596', '102'], - \ 'lightgrey': ['#c1c3cc', '102'], + \ 'lightgrey': ['#6d7391', '102'], \ 'white': ['#edeef2', '255'], \ 'black': ['#000000', '0'], \ @@ -75,17 +81,24 @@ endfunction if &background == 'dark' call s:hi('SpaceduckRed', s:palette.red, s:palette.none) call s:hi('SpaceduckOrange', s:palette.orange, s:palette.none) + call s:hi('SpaceduckOrange2', s:palette.orange2, s:palette.none) call s:hi('SpaceduckGreen', s:palette.green, s:palette.none) + call s:hi('SpaceduckGreen2', s:palette.green2, s:palette.none) call s:hi('SpaceduckYellow', s:palette.yellow, s:palette.none) call s:hi('SpaceduckLightPurple', s:palette.lightpurple, s:palette.none) call s:hi('SpaceduckPurple', s:palette.purple, s:palette.none) call s:hi('SpaceduckDarkPurple', s:palette.darkpurple, s:palette.none) call s:hi('SpaceduckCyan', s:palette.cyan, s:palette.none) call s:hi('SpaceduckMagenta', s:palette.magenta, s:palette.none) + + call s:hi('SpaceduckMagentaBold', s:palette.magenta, s:palette.none, 'bold') call s:hi('SpaceduckViolet', s:palette.violet, s:palette.none) call s:hi('SpaceduckGrey', s:palette.grey, s:palette.none) call s:hi('SpaceduckLightGrey', s:palette.lightgrey, s:palette.none) + call s:hi('SpaceduckPink', s:palette.pink, s:palette.none) + call s:hi('SpaceduckLightBlue', s:palette.lightblue, s:palette.none) + call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) call s:hi('SpaceduckBackground', s:palette.background, s:palette.none) call s:hi('SpaceduckCursor', s:palette.cursor, s:palette.none) @@ -526,56 +539,62 @@ hi link CocExplorerHelpLine SpaceduckMagenta " TreeSitter: " TODO: UNTESTED Treesitter -hi link TSAnnotation SpaceduckMagenta -hi link TSAttribute SpaceduckMagenta +hi link TSAnnotation SpaceduckForeground +hi link TSAttribute SpaceduckForeground hi link TSBoolean SpaceduckYellow -hi link TSCharacter SpaceduckYellow +hi link TSCharacter SpaceduckForeground hi link TSComment SpaceduckDarkPurple hi link TSConditional SpaceduckGreen -hi link TSConstBuiltin SpaceduckYellow -hi link TSConstMacro SpaceduckPurple -hi link TSConstant SpaceduckMagenta -hi link TSConstructor SpaceduckPurple +hi link TSConstBuiltin SpaceduckCyan +hi link TSConstMacro SpaceduckForeground +hi link TSConstant SpaceduckForeground + +hi link TSConstructor SpaceduckPink + hi link TSEmphasis SpaceduckForeground -hi link TSError SpaceduckRed -hi link TSException SpaceduckOrange -hi link TSField SpaceduckOrange -hi link TSFloat SpaceduckYellow +hi link TSError SpaceduckForeground +hi link TSException SpaceduckMagentaBold +hi link TSField SpaceduckForeground +hi link TSFloat SpaceduckForeground hi link TSFuncBuiltin SpaceduckGreen -hi link TSFuncMacro SpaceduckPurple +hi link TSFuncMacro SpaceduckForeground + hi link TSFunction SpaceduckGreen -hi link TSInclude SpaceduckLightPurple -hi link TSKeyword SpaceduckOrange -hi link TSKeywordOperator SpaceduckForeground -hi link TSLabel SpaceduckOrange +hi link TSMethod TSFunction + +hi link TSInclude SpaceduckMagenta + +hi link TSKeyword SpaceduckMagentaBold +hi link TSKeywordOperator SpaceduckMagenta + +hi link TSLabel SpaceduckForeground hi link TSLiteral SpaceduckForeground -hi link TSMethod SpaceduckGreen -hi link TSNamespace SpaceduckPurple +hi link TSNamespace SpaceduckForeground hi link TSNone SpaceduckForeground -hi link TSNumber SpaceduckForeground -hi link TSOperator SpaceduckForeground +hi link TSNumber SpaceduckYellow +hi link TSOperator SpaceduckOrange hi link TSParameter SpaceduckForeground hi link TSParameter SpaceduckForeground hi link TSParameterReference SpaceduckForeground -hi link TSProperty SpaceduckMagenta -hi link TSPunctBracket SpaceduckDarkPurple +hi link TSProperty SpaceduckLightPurple +hi link TSPunctBracket SpaceduckLightGrey hi link TSPunctDelimiter SpaceduckForeground -hi link TSPunctSpecial SpaceduckDarkPurple -hi link TSRepeat SpaceduckGreen +hi link TSPunctSpecial SpaceduckForeground +hi link TSRepeat SpaceduckForeground hi link TSString SpaceduckCyan -hi link TSStringEscape SpaceduckCyan -hi link TSStringRegex SpaceduckOrange +hi link TSStringEscape SpaceduckGreen +hi link TSStringRegex SpaceduckForeground hi link TSStrong SpaceduckForeground -hi link TSStructure SpaceduckPurple -hi link TSTag SpaceduckPurple +hi link TSStructure SpaceduckForeground +hi link TSTag SpaceduckPink hi link TSTagDelimiter SpaceduckDarkPurple hi link TSText SpaceduckForeground -hi link TSType SpaceduckMagenta -hi link TSTypeBuiltIn SpaceduckYellow +hi link TSType SpaceduckYellow +hi link TSTypeBuiltIn SpaceduckForeground hi link TSURI SpaceduckForeground hi link TSUnderline SpaceduckForeground -hi link TSVariable SpaceduckLightPurple -hi link TSVariableBuiltin SpaceduckPurple +hi link TSVariable SpaceduckForeground +hi link TSVariableBuiltin SpaceduckLightPurple " }}} From 64abfd0804b179642d6b12a5c6ad717ad0eae57b Mon Sep 17 00:00:00 2001 From: Jinho Date: Sat, 3 Jul 2021 12:00:03 +0900 Subject: [PATCH 44/47] fix: merge issues from pr/49 --- colors/spaceduck.vim | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index bbe08c8..9f6d3ad 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -13,7 +13,6 @@ " Version: 0.1.0 " License: MIT -======= "TODO: 0.1 release " Clean up syntax groups locations " Fix readme @@ -54,6 +53,7 @@ if !exists('g:spaceduck_colorterm') endif "}}}2 + " Script Helpers: {{{2 let s:attrs = { \ 'bold': g:spaceduck_bold == 1 ? 'bold' : 0, @@ -164,10 +164,9 @@ if &background == 'dark' call s:h('SpaceduckOrangeBold', s:palette.orange, s:palette.none, [s:attrs.bold]) call s:h('SpaceduckGreenBold', s:palette.green, s:palette.none, [s:attrs.bold]) call s:h('SpaceduckYellowBold', s:palette.yellow, s:palette.none, [s:attrs.bold]) - call s:h('SpaceduckPurpleBold', s:palette.lavender, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckPurpleBold', s:palette.purple, s:palette.none, [s:attrs.bold]) call s:h('SpaceduckDarkPurpleBold', s:palette.darkpurple, s:palette.none, [s:attrs.bold]) - call s:h('SpaceduckPurple2Bold', s:palette.purple2, s:palette.none, [s:attrs.bold]) - call s:h('SpaceduckDarkPurple2Bold', s:palette.darkpurple2, s:palette.none, [s:attrs.bold]) + call s:h('SpaceduckLightPurpleBold', s:palette.lightpurple, s:palette.none, [s:attrs.bold]) call s:h('SpaceduckCyanBold', s:palette.cyan, s:palette.none, [s:attrs.bold]) call s:h('SpaceduckMagentaBold', s:palette.magenta, s:palette.none, [s:attrs.bold]) @@ -175,19 +174,17 @@ if &background == 'dark' call s:h('SpaceduckOrangeItalic', s:palette.orange, s:palette.none, [s:attrs.italic]) call s:h('SpaceduckGreenItalic', s:palette.green, s:palette.none, [s:attrs.italic]) call s:h('SpaceduckYellowItalic', s:palette.yellow, s:palette.none, [s:attrs.italic]) - call s:h('SpaceduckPurpleItalic', s:palette.lavender, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckPurpleItalic', s:palette.purple, s:palette.none, [s:attrs.italic]) call s:h('SpaceduckDarkPurpleItalic', s:palette.darkpurple, s:palette.none, [s:attrs.italic]) - call s:h('SpaceduckPurple2Italic', s:palette.purple2, s:palette.none, [s:attrs.italic]) - call s:h('SpaceduckDarkPurple2Italic', s:palette.darkpurple2, s:palette.none, [s:attrs.italic]) + call s:h('SpaceduckLightPurpleItalic', s:palette.lightpurple, s:palette.none, [s:attrs.italic]) call s:h('SpaceduckCyanItalic', s:palette.cyan, s:palette.none, [s:attrs.italic]) call s:h('SpaceduckMagentaItalic', s:palette.magenta, s:palette.none, [s:attrs.italic]) - call s:h('SpaceduckCommentItalic', s:palette.comment, s:palette.none, [s:attrs.italic]) call s:hi('SpaceduckForeground', s:palette.foreground, s:palette.none) call s:hi('SpaceduckBackground', s:palette.background, s:palette.none) call s:hi('SpaceduckCursor', s:palette.cursor, s:palette.none) call s:hi('SpaceduckSelection', s:palette.selection, s:palette.none) - call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) + " call s:hi('SpaceduckComment', s:palette.comment, s:palette.none) let s:palette.bg = s:palette.background let s:palette.fg = s:palette.foreground From c6dcfc680e63d368e82588e5578fa8c07e15bca4 Mon Sep 17 00:00:00 2001 From: Ingo Skupin Date: Thu, 29 Jul 2021 00:14:10 +0200 Subject: [PATCH 45/47] add missing list field selector for terminal_ansi_colors --- colors/spaceduck.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 9f6d3ad..1808ab4 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -714,7 +714,7 @@ else \ s:palette['cyan'][0], \ s:palette['magenta'][0], \ s:palette['purple'][0], - \ s:palette['darkpurple'], + \ s:palette['darkpurple'][0], \ s:palette['darkpurple'][0], \ s:palette['red'][0], \ s:palette['green'][0], From d1b3c96d81bc51b8c1328cebf5bf08429f264189 Mon Sep 17 00:00:00 2001 From: jclsn Date: Sat, 16 Sep 2023 21:36:25 +0200 Subject: [PATCH 46/47] fix: Add missing key in dictionary and insertion of ^^^ in airline (#67) * fix: Add missing key in dictionary Redefintions of foreground and background were missing * Fix insertion of ^^^ in airline when having multiple splits The above issue occurred when using this plugin https://github.com/Roy-Orbison/airline-colour-splits/issues/1 --- colors/spaceduck.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 1808ab4..969ed63 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -211,6 +211,10 @@ endif " }}} " Syntax Highlighting {{{ +" +let s:palette.fg = s:palette.foreground +let s:palette.bg = s:palette.background + call s:hi('Normal', s:palette.fg, s:palette.bg ) call s:hi('ColorColumn', s:palette.none, s:palette.cursor ) call s:hi('CursorLine', s:palette.none, s:palette.cursor ) @@ -244,7 +248,7 @@ call s:hi('SpellLocal', s:palette.green, s:palette.none, 'unde call s:hi('SpellRare', s:palette.yellow, s:palette.none, 'underline') call s:hi('StatusLine', s:palette.cursor, s:palette.foreground, 'reverse' ) -call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'reverse' ) +call s:hi('StatusLineNC', s:palette.bg, s:palette.grey, 'NONE' ) call s:hi('StatusLineTermNC', s:palette.bg, s:palette.darkpurple, 'reverse' ) call s:hi('TabLine', s:palette.bg, s:palette.grey ) From e217c9740184f1e8d50f8a3c38e363dc79dac2a7 Mon Sep 17 00:00:00 2001 From: jclsn Date: Sat, 9 Nov 2024 06:26:30 +0100 Subject: [PATCH 47/47] Add highlight groups for new vim9 lsp (#68) https://github.com/yegappan/lsp --- colors/spaceduck.vim | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/colors/spaceduck.vim b/colors/spaceduck.vim index 969ed63..b575ae7 100644 --- a/colors/spaceduck.vim +++ b/colors/spaceduck.vim @@ -623,6 +623,20 @@ hi link CocExplorerHelpLine SpaceduckMagenta " }}} +" Vim9 Lsp +hi! link LspDiagInlineError SpaceduckRed +hi! link LspDiagVirtualTextError SpaceduckRed +hi! link LspDiagSignErrorText SpaceduckRed +hi! link LspDiagInlineWarning SpaceduckOrange +hi! link LspDiagVirtualTextWarning SpaceduckOrange +hi! link LspDiagSignWarningText SpaceduckOrange +hi! link LspDiagInlineInfo SpaceduckYellow +hi! link LspDiagVirtualTextInfo SpaceduckYellow +hi! link LspDiagSignInfoText SpaceduckYellow +hi! link LspDiagInlineHint SpaceduckYellow +hi! link LspDiagVirtualTextHint SpaceduckYellow +hi! link LspDiagSignHintText SpaceduckYellow + " TreeSitter: " TODO: UNTESTED Treesitter