Compare commits

...

9 Commits
v1.6 ... main

Author SHA1 Message Date
Akshay Hegde c5aea11aa1
iTerm2: Fix filename typo (spcegray_low_contrast => spacegray_low_contrast) 2025-04-15 22:29:49 -07:00
Akshay Hegde 727fee9716
Prefer complete names 2025-04-15 22:24:47 -07:00
Akshay Hegde 79148da18a
Update repository URLs 2023-02-24 19:04:33 -08:00
Akshay Hegde c699ca10ed
Don't require 'termguicolors' to be enabled to set terminal ansi colors 2021-07-05 20:50:11 -07:00
Akshay Hegde 0aa4e5c973
Use a base color for Visual selections
This sidesteps an issue after patch 8.2.2797 which means Search
highlight group overrides the Visual highlight group.

Additionally, this commit brings Spacegray's Visual selection
highlighting more in line with default Vim colorschemes, which also
use a background color (instead of no background color which allowed
Spacegray before this commit to show other highlight groups when Visual
selection was active).
2021-06-15 03:45:36 -07:00
Akshay Hegde cf56624d12
Use similar colors for both TabLine and StatusLine highlight groups 2021-06-13 20:24:13 -07:00
Akshay Hegde 1a4fc46953
Embolden SpecialComment highlight group 2021-06-13 20:00:04 -07:00
Akshay Hegde 1652c648b6
Don't expose terminal_ansi_colors unless certain conditions are met 2021-06-13 19:59:01 -07:00
Akshay Hegde 012ff0065e
Darken Normal low-contrast background to match terminal background 2021-01-01 17:15:01 -08:00
3 changed files with 73 additions and 66 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:
git clone git://github.com/ajh17/Spacegray.vim ~/.vim/pack/vendor/start/Spacegray
git clone https://git.sr.ht/~ackyshake/spacegray.vim ~/.vim/pack/vendor/start/Spacegray
Then in your ~/.vimrc, add this line:
@ -88,7 +88,8 @@ gnome-terminal should then immediately reflect Spacegray colors.
### Xcode
Use Xcode? Try out [Spacegray-Xcode](https://github.com/ajh17/spacegray-xcode).
Use Xcode? Try out
[Spacegray-Xcode](https://git.sr.ht/~ackyshake/spacegray-xcode).
### Xresources

View File

@ -1,5 +1,5 @@
" Spacegray.vim -- Vim colorscheme
" Maintainer: Akshay Hegde (github.com/ajh17)
" Maintainer: Akshay Hegde (https://git.sr.ht/~ackyshake/)
" Version: 1.5
" Description: A colorscheme loosely modeled after the spacegray theme for Xcode
" Note: This colorscheme is 256color and up only
@ -8,7 +8,7 @@
" Setup {{{1
hi clear
if has("gui_running") && &background !=# 'dark'
if has('gui_running') && &background !=# 'dark'
set background=dark
endif
@ -33,7 +33,7 @@ let g:colors_name = 'spacegray'
" Colorscheme definitions {{{1
if g:spacegray_low_contrast
hi Normal ctermbg=235 ctermfg=250 guibg=#262626 guifg=#B3B8C4 cterm=NONE gui=NONE
hi Normal ctermbg=235 ctermfg=250 guibg=#242424 guifg=#B3B8C4 cterm=NONE gui=NONE
else
hi Normal ctermbg=233 ctermfg=250 guibg=#111314 guifg=#B3B8C4 cterm=NONE gui=NONE
endif
@ -53,6 +53,7 @@ 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 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 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 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
@ -92,29 +93,37 @@ hi WildMenu ctermbg=110 ctermfg=235 guibg=#8FAFD7 guifg=#141617 cte
if g:spacegray_low_contrast
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 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
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 Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
else
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 Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
endif
else
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 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
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 Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=italic gui=italic
else
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 Tabline ctermbg=232 ctermfg=239 guibg=#1C1F20 guifg=#7C7F88 cterm=NONE gui=NONE
endif
endif
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 Visual ctermbg=236 ctermfg=NONE guibg=#404040 guifg=NONE cterm=NONE gui=NONE
hi Visual ctermbg=233 ctermfg=4 guibg=#111314 guifg=#6E9CAF cterm=reverse gui=reverse
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
@ -129,10 +138,6 @@ else
hi Search ctermbg=2 ctermfg=232 guibg=#919652 guifg=#141617 cterm=NONE gui=NONE
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 MatchParen ctermbg=NONE ctermfg=11 guibg=NONE guifg=#E5C078 cterm=bold gui=bold
@ -142,56 +147,56 @@ 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
" Highlights {{{1
hi link Boolean Constant
hi link Character Constant
hi link Number Constant
highlight link Boolean Constant
highlight link Character Constant
highlight link Number Constant
hi link Float Number
highlight link Float Number
hi link Define Preproc
hi link Include Preproc
hi link Macro Preproc
hi link PreCondit PreProc
highlight link Define Preproc
highlight link Include Preproc
highlight link Macro Preproc
highlight link PreCondit PreProc
hi link Conditional Statement
hi link Exception Statement
hi link HelpCommand Statement
hi link HelpExample Statement
hi link Keyword Statement
hi link Label Statement
hi link Operator Statement
hi link Repeat Statement
highlight link Conditional Statement
highlight link Exception Statement
highlight link HelpCommand Statement
highlight link HelpExample Statement
highlight link Keyword Statement
highlight link Label Statement
highlight link Operator Statement
highlight link Repeat Statement
hi link StorageClass Type
hi link Structure Type
hi link Typedef Type
highlight link StorageClass Type
highlight link Structure Type
highlight link Typedef Type
hi link Debug Special
hi link Delimiter Special
hi link SpecialChar Special
hi link SpecialComment Special
hi link Tag Special
highlight link Debug Special
highlight link Delimiter Special
highlight link SpecialChar Special
highlight link Tag Special
hi link Terminal Normal
highlight link Terminal Normal
" HTML
hi link htmlEndTag htmlTagName
hi link htmlLink Function
hi link htmlSpecialTagName htmlTagName
hi link htmlTag htmlTagName
highlight link htmlEndTag htmlTagName
highlight link htmlLink Function
highlight link htmlSpecialTagName htmlTagName
highlight link htmlTag htmlTagName
" Rails
hi link rubyRailsARAssociationMethod Statement
hi link rubyRailsARValidationMethod Statement
hi link rubyRailsARMethod Statement
hi link rubyRailsARCallbackMethod Statement
hi link rubyRailsARClassMethod Statement
highlight link rubyRailsARAssociationMethod Statement
highlight link rubyRailsARValidationMethod Statement
highlight link rubyRailsARMethod Statement
highlight link rubyRailsARCallbackMethod Statement
highlight link rubyRailsARClassMethod Statement
" Diff
hi link diffAdded String
hi link diffRemoved Function
highlight link diffAdded String
highlight link diffRemoved Function
let g:terminal_ansi_colors = [
if (has('terminal') && has('termguicolors')) || has('gui_running')
let g:terminal_ansi_colors = [
\ '#3A3E42',
\ '#BF6262',
\ '#A2A565',
@ -209,3 +214,4 @@ let g:terminal_ansi_colors = [
\ '#9F7AA5',
\ '#E3E8E3'
\ ]
endif