Compare commits

..

No commits in common. "main" and "v1.6" have entirely different histories.
main ... v1.6

4 changed files with 72 additions and 79 deletions

View File

@ -38,7 +38,7 @@ You can tweak Spacegray by enabling the following disabled options:
If you use Vim 8 or better, simply copy and paste: If you use Vim 8 or better, simply copy and paste:
git clone https://git.sr.ht/~ackyshake/spacegray.vim ~/.vim/pack/vendor/start/Spacegray git clone git://github.com/ajh17/Spacegray.vim ~/.vim/pack/vendor/start/Spacegray
Then in your ~/.vimrc, add this line: Then in your ~/.vimrc, add this line:
@ -88,8 +88,7 @@ gnome-terminal should then immediately reflect Spacegray colors.
### Xcode ### Xcode
Use Xcode? Try out Use Xcode? Try out [Spacegray-Xcode](https://github.com/ajh17/spacegray-xcode).
[Spacegray-Xcode](https://git.sr.ht/~ackyshake/spacegray-xcode).
### Xresources ### Xresources

View File

@ -1,5 +1,5 @@
" Spacegray.vim -- Vim colorscheme " Spacegray.vim -- Vim colorscheme
" Maintainer: Akshay Hegde (https://git.sr.ht/~ackyshake/) " Maintainer: Akshay Hegde (github.com/ajh17)
" Version: 1.5 " Version: 1.5
" Description: A colorscheme loosely modeled after the spacegray theme for Xcode " Description: A colorscheme loosely modeled after the spacegray theme for Xcode
" Note: This colorscheme is 256color and up only " Note: This colorscheme is 256color and up only
@ -8,7 +8,7 @@
" Setup {{{1 " Setup {{{1
hi clear hi clear
if has('gui_running') && &background !=# 'dark' if has("gui_running") && &background !=# 'dark'
set background=dark set background=dark
endif endif
@ -33,7 +33,7 @@ let g:colors_name = 'spacegray'
" Colorscheme definitions {{{1 " Colorscheme definitions {{{1
if g:spacegray_low_contrast if g:spacegray_low_contrast
hi Normal ctermbg=235 ctermfg=250 guibg=#242424 guifg=#B3B8C4 cterm=NONE gui=NONE hi Normal ctermbg=235 ctermfg=250 guibg=#262626 guifg=#B3B8C4 cterm=NONE gui=NONE
else else
hi Normal ctermbg=233 ctermfg=250 guibg=#111314 guifg=#B3B8C4 cterm=NONE gui=NONE hi Normal ctermbg=233 ctermfg=250 guibg=#111314 guifg=#B3B8C4 cterm=NONE gui=NONE
endif endif
@ -53,7 +53,6 @@ hi Identifier ctermbg=NONE ctermfg=179 guibg=NONE guifg=#E5C078 cte
hi PreProc ctermbg=NONE ctermfg=109 guibg=NONE guifg=#85A7A5 cterm=NONE gui=NONE hi PreProc ctermbg=NONE ctermfg=109 guibg=NONE guifg=#85A7A5 cterm=NONE gui=NONE
hi Special ctermbg=NONE ctermfg=103 guibg=NONE guifg=#7D8FA3 cterm=NONE gui=NONE hi Special ctermbg=NONE ctermfg=103 guibg=NONE guifg=#7D8FA3 cterm=NONE gui=NONE
hi SpecialKey ctermbg=NONE ctermfg=59 guibg=NONE guifg=#4C5966 cterm=NONE gui=NONE hi SpecialKey ctermbg=NONE ctermfg=59 guibg=NONE guifg=#4C5966 cterm=NONE gui=NONE
hi SpecialComment ctermbg=NONE ctermfg=242 guibg=NONE guifg=#657785 cterm=bold gui=bold
hi Statement ctermbg=NONE ctermfg=13 guibg=NONE guifg=#A57A9E cterm=NONE gui=NONE hi Statement ctermbg=NONE ctermfg=13 guibg=NONE guifg=#A57A9E cterm=NONE gui=NONE
hi String ctermbg=NONE ctermfg=107 guibg=NONE guifg=#95B47B cterm=NONE gui=NONE hi String ctermbg=NONE ctermfg=107 guibg=NONE guifg=#95B47B cterm=NONE gui=NONE
hi Type ctermbg=NONE ctermfg=179 guibg=NONE guifg=#E5C078 cterm=NONE gui=NONE hi Type ctermbg=NONE ctermfg=179 guibg=NONE guifg=#E5C078 cterm=NONE gui=NONE
@ -93,37 +92,29 @@ hi WildMenu ctermbg=110 ctermfg=235 guibg=#8FAFD7 guifg=#141617 cte
if g:spacegray_low_contrast if g:spacegray_low_contrast
hi StatusLine ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE hi StatusLine ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi StatusLineTerm ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE hi StatusLineTerm ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi TablineSel ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi TablineFill ctermbg=236 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
if g:spacegray_use_italics if g:spacegray_use_italics
hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
hi Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
else else
hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
hi Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
endif endif
else else
hi StatusLine ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE hi StatusLine ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi StatusLineTerm ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE hi StatusLineTerm ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi TablineSel ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
hi TablineFill ctermbg=235 ctermfg=249 guibg=#303537 guifg=#B3B8C4 cterm=NONE gui=NONE
if g:spacegray_use_italics if g:spacegray_use_italics
hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
hi Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
else else
hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE hi StatusLineNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE hi StatusLineTermNC ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
hi Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
endif endif
endif endif
hi Underlined ctermbg=NONE ctermfg=66 guibg=NONE guifg=#5F8787 cterm=NONE gui=NONE hi Underlined ctermbg=NONE ctermfg=66 guibg=NONE guifg=#5F8787 cterm=NONE gui=NONE
hi Ignore ctermbg=NONE ctermfg=250 guibg=NONE guifg=#BCBCBC cterm=NONE gui=NONE hi Ignore ctermbg=NONE ctermfg=250 guibg=NONE guifg=#BCBCBC cterm=NONE gui=NONE
hi Visual ctermbg=233 ctermfg=4 guibg=#111314 guifg=#6E9CAF cterm=reverse gui=reverse hi Visual ctermbg=236 ctermfg=NONE guibg=#404040 guifg=NONE cterm=NONE gui=NONE
hi VisualNOS ctermbg=8 ctermfg=NONE guibg=NONE guifg=NONE cterm=bold gui=bold hi VisualNOS ctermbg=8 ctermfg=NONE guibg=NONE guifg=NONE cterm=bold gui=bold
hi FoldColumn ctermbg=NONE ctermfg=242 guibg=#1C1C1C guifg=#6C6C6C cterm=NONE gui=NONE hi FoldColumn ctermbg=NONE ctermfg=242 guibg=#1C1C1C guifg=#6C6C6C cterm=NONE gui=NONE
@ -138,6 +129,10 @@ else
hi Search ctermbg=2 ctermfg=232 guibg=#919652 guifg=#141617 cterm=NONE gui=NONE hi Search ctermbg=2 ctermfg=232 guibg=#919652 guifg=#141617 cterm=NONE gui=NONE
endif endif
hi TabLine ctermbg=232 ctermfg=249 guibg=#141617 guifg=#B3B8C4 cterm=NONE gui=NONE
hi TabLineFill ctermbg=235 ctermfg=239 guibg=#303537 guifg=#303537 cterm=NONE gui=NONE
hi TabLineSel ctermbg=145 ctermfg=0 guibg=#7D8FA3 guifg=#111314 cterm=NONE gui=NONE
hi Directory ctermbg=NONE ctermfg=24 guibg=NONE guifg=#5FAFAF cterm=NONE gui=NONE hi Directory ctermbg=NONE ctermfg=24 guibg=NONE guifg=#5FAFAF cterm=NONE gui=NONE
hi MatchParen ctermbg=NONE ctermfg=11 guibg=NONE guifg=#E5C078 cterm=bold gui=bold hi MatchParen ctermbg=NONE ctermfg=11 guibg=NONE guifg=#E5C078 cterm=bold gui=bold
@ -147,55 +142,55 @@ hi SpellCap ctermbg=17 ctermfg=12 guibg=#00005F guifg=#81A2BE cte
hi SpellLocal ctermbg=24 ctermfg=14 guibg=#005F5F guifg=#8ABEB7 cterm=NONE gui=NONE hi SpellLocal ctermbg=24 ctermfg=14 guibg=#005F5F guifg=#8ABEB7 cterm=NONE gui=NONE
" Highlights {{{1 " Highlights {{{1
highlight link Boolean Constant hi link Boolean Constant
highlight link Character Constant hi link Character Constant
highlight link Number Constant hi link Number Constant
highlight link Float Number hi link Float Number
highlight link Define Preproc hi link Define Preproc
highlight link Include Preproc hi link Include Preproc
highlight link Macro Preproc hi link Macro Preproc
highlight link PreCondit PreProc hi link PreCondit PreProc
highlight link Conditional Statement hi link Conditional Statement
highlight link Exception Statement hi link Exception Statement
highlight link HelpCommand Statement hi link HelpCommand Statement
highlight link HelpExample Statement hi link HelpExample Statement
highlight link Keyword Statement hi link Keyword Statement
highlight link Label Statement hi link Label Statement
highlight link Operator Statement hi link Operator Statement
highlight link Repeat Statement hi link Repeat Statement
highlight link StorageClass Type hi link StorageClass Type
highlight link Structure Type hi link Structure Type
highlight link Typedef Type hi link Typedef Type
highlight link Debug Special hi link Debug Special
highlight link Delimiter Special hi link Delimiter Special
highlight link SpecialChar Special hi link SpecialChar Special
highlight link Tag Special hi link SpecialComment Special
hi link Tag Special
highlight link Terminal Normal hi link Terminal Normal
" HTML " HTML
highlight link htmlEndTag htmlTagName hi link htmlEndTag htmlTagName
highlight link htmlLink Function hi link htmlLink Function
highlight link htmlSpecialTagName htmlTagName hi link htmlSpecialTagName htmlTagName
highlight link htmlTag htmlTagName hi link htmlTag htmlTagName
" Rails " Rails
highlight link rubyRailsARAssociationMethod Statement hi link rubyRailsARAssociationMethod Statement
highlight link rubyRailsARValidationMethod Statement hi link rubyRailsARValidationMethod Statement
highlight link rubyRailsARMethod Statement hi link rubyRailsARMethod Statement
highlight link rubyRailsARCallbackMethod Statement hi link rubyRailsARCallbackMethod Statement
highlight link rubyRailsARClassMethod Statement hi link rubyRailsARClassMethod Statement
" Diff " Diff
highlight link diffAdded String hi link diffAdded String
highlight link diffRemoved Function hi link diffRemoved Function
if (has('terminal') && has('termguicolors')) || has('gui_running')
let g:terminal_ansi_colors = [ let g:terminal_ansi_colors = [
\ '#3A3E42', \ '#3A3E42',
\ '#BF6262', \ '#BF6262',
@ -214,4 +209,3 @@ if (has('terminal') && has('termguicolors')) || has('gui_running')
\ '#9F7AA5', \ '#9F7AA5',
\ '#E3E8E3' \ '#E3E8E3'
\ ] \ ]
endif

View File

@ -176,13 +176,13 @@
<key>Alpha Component</key> <key>Alpha Component</key>
<real>1</real> <real>1</real>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.76862746477127075</real> <real>0.45203596353530884</real>
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Green Component</key> <key>Green Component</key>
<real>0.72156864404678345</real> <real>0.46329140663146973</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.70196080207824707</real> <real>0.45172828435897827</real>
</dict> </dict>
<key>Ansi 8 Color</key> <key>Ansi 8 Color</key>
<dict> <dict>

View File

@ -176,13 +176,13 @@
<key>Alpha Component</key> <key>Alpha Component</key>
<real>1</real> <real>1</real>
<key>Blue Component</key> <key>Blue Component</key>
<real>0.76862746477127075</real> <real>0.4499812126159668</real>
<key>Color Space</key> <key>Color Space</key>
<string>sRGB</string> <string>sRGB</string>
<key>Green Component</key> <key>Green Component</key>
<real>0.72156864404678345</real> <real>0.46326470375061035</real>
<key>Red Component</key> <key>Red Component</key>
<real>0.70196080207824707</real> <real>0.44823145866394043</real>
</dict> </dict>
<key>Ansi 8 Color</key> <key>Ansi 8 Color</key>
<dict> <dict>