Skip to content

Commit 3d8e886

Browse files
author
Christopher Green
committed
Moves highlight groups into include
1 parent c45f309 commit 3d8e886

File tree

4 files changed

+97
-172
lines changed

4 files changed

+97
-172
lines changed

‎_theme.colortemplate

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
; vim: ft=colortemplate fdm=marker cc=22 et ts=2 sw=2
2+
3+
; Group Foreground Background Attributes
4+
ColorColumn fg_main bg_main
5+
Conceal yellow_faint none
6+
Cursor bg_main rust
7+
CursorColumn none bg_hl_line
8+
CursorLine none bg_hl_line
9+
CursorLineNr fg_active bg_active
10+
DiffAdd fg_added bg_added
11+
DiffChange fg_changed bg_changed
12+
DiffDelete fg_removed bg_removed
13+
DiffText fg_changed bg_changed
14+
Directory blue none
15+
EndOfBuffer bg_main none
16+
ErrorMsg fg_main bg_red_intense
17+
FoldColumn fg_inactive bg_inactive
18+
Folded green_faint bg_dim italic
19+
IncSearch fg_main bg_yellow_intense t=reverse g=standout
20+
LineNr fg_dim bg_dim
21+
MatchParen fg_main bg_paren_match
22+
ModeMsg fg_dim none
23+
MoreMsg blue none
24+
NonText fg_dim none
25+
Pmenu fg_active bg_active
26+
PmenuSbar bg_main fg_dim
27+
PmenuSel fg_main bg_dim reverse
28+
PmenuThumb fg_main bg_main
29+
Question blue none
30+
Search fg_main bg_green_intense
31+
SignColumn fg_dim bg_dim
32+
SpecialKey fg_dim none
33+
SpellBad red_intense none s=red_intense
34+
SpellCap yellow_intense none s=yellow_intense
35+
SpellLocal blue_faint none s=blue_faint
36+
SpellRare green_faint none s=green_faint
37+
StatusLine fg_status_line_active bg_status_line_active
38+
StatusLineNC fg_status_line_inactive bg_status_line_inactive
39+
TabLine fg_tab_other bg_tab_other
40+
TabLineFill fg_dim bg_tab_bar
41+
TabLineSel fg_main bg_tab_current
42+
Title fg_alt none
43+
VertSplit border border
44+
Visual bg_main fg_alt
45+
VisualNOS fg_main magenta_faint
46+
WarningMsg red_faint none
47+
WildMenu bg_main yellow_warmer
48+
; Other conventional group names (see `:help group-name`)
49+
Comment fg_dim none italic
50+
Constant magenta_warmer none
51+
Error fg_main bg_red_intense reverse
52+
Identifier cyan none
53+
Ignore fg_main none
54+
PreProc red_cooler none
55+
Special cyan_cooler none
56+
Statement magenta_cooler none
57+
Todo magenta none bold
58+
Type cyan_cooler none
59+
Underlined fg_alt none
60+
String blue none
61+
Quote cyan_faint none
62+
; See `:help CursorIM`
63+
CursorIM fg_main bg_main
64+
; See `:help window-toolbar`
65+
ToolbarLine fg_dim border
66+
ToolbarButton bg_main border_highlight bold
67+
; Language and plugins
68+
jsObjectKey magenta_warmer none
69+
jsObjectValue magenta_faint none
70+
jsObjectProp green_faint none
71+
jsTemplateExpression cyan_cooler none
72+
jsModuleKeyword green_faint none
73+
javaScriptParens cyan_warmer none
74+
jsTemplateBraces yellow_cooler none
75+
jsDestructuringBraces yellow_cooler none
76+
jsBrackets yellow_cooler none
77+
jsBraces yellow_cooler none
78+
jsParens yellow_cooler none
79+
jsFuncParens yellow_cooler none
80+
jsClassBraces yellow_cooler none
81+
jsFuncBraces yellow_cooler none
82+
jsObjectBraces yellow_cooler none
83+
jsRepeatBraces yellow_cooler none
84+
jsIfElseBraces yellow_cooler none
85+
jsTryCatchBraces yellow_cooler none
86+
jsVariableDef magenta_warmer none
87+
NERDTreeFile cyan_cooler none

‎colors/modus.vim

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
" Maintainer: Christopher Green <[email protected]>
55
" Website: https://saguaro.space
66
" License: MIT License
7-
" Last Change: 2024 Oct 11
7+
" Last Change: 2024 Oct 13
88

99
" Generated by Colortemplate v2.2.3
1010

@@ -635,6 +635,7 @@ endif
635635
" Term colors: bg_main red green yellow blue magenta cyan fg_main
636636
" Term colors: bg_alt red_warmer green_warmer yellow_warmer
637637
" Term colors: blue_warmer magenta_warmer cyan_warmer fg_alt
638+
" Background: dark
638639
" Background: light
639640
" Color: bg_main #ffffff ~
640641
" Color: bg_dim #f2f2f2 ~
@@ -741,5 +742,6 @@ endif
741742
" Term colors: bg_main red green yellow blue magenta cyan fg_main
742743
" Term colors: bg_alt red_warmer green_warmer yellow_warmer
743744
" Term colors: blue_warmer magenta_warmer cyan_warmer fg_alt
745+
" Background: light
744746
" Background: any
745747
" vim: et ts=8 sw=2 sts=2

‎doc/modus.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*modus.txt* For Vim version 9.1 Last change: 2024 Oct 11
1+
*modus.txt* For Vim version 9.1 Last change: 2024 Oct 13
22

33

44
Modus color scheme by Christopher

‎modus.colortemplate

+6-170
Original file line numberDiff line numberDiff line change
@@ -304,93 +304,11 @@ Variant: gui 256
304304
Terminal fg_main bg_main
305305
#endif
306306

307-
; Group Foreground Background Attributes
308-
ColorColumn fg_main bg_main
309-
Conceal yellow_faint none
310-
Cursor bg_main rust
311-
CursorColumn none bg_hl_line
312-
CursorLine none bg_hl_line
313-
CursorLineNr fg_active bg_active
314-
DiffAdd fg_added bg_added
315-
DiffChange fg_changed bg_changed
316-
DiffDelete fg_removed bg_removed
317-
DiffText fg_changed bg_changed
318-
Directory blue none
319-
EndOfBuffer bg_main none
320-
ErrorMsg fg_main bg_red_intense
321-
FoldColumn fg_inactive bg_inactive
322-
Folded green_faint bg_dim italic
323-
IncSearch fg_main bg_yellow_intense t=reverse g=standout
324-
LineNr fg_dim bg_dim
325-
MatchParen fg_main bg_paren_match
326-
ModeMsg fg_dim none
327-
MoreMsg blue none
328-
NonText fg_dim none
329-
Pmenu fg_active bg_active
330-
PmenuSbar bg_main fg_dim
331-
PmenuSel fg_main bg_dim reverse
332-
PmenuThumb fg_main bg_main
333-
Question blue none
334-
Search fg_main bg_green_intense
335-
SignColumn fg_dim bg_dim
336-
SpecialKey fg_dim none
337-
SpellBad red_intense none s=red_intense
338-
SpellCap yellow_intense none s=yellow_intense
339-
SpellLocal blue_faint none s=blue_faint
340-
SpellRare green_faint none s=green_faint
341-
StatusLine fg_status_line_active bg_status_line_active
342-
StatusLineNC fg_status_line_inactive bg_status_line_inactive
343-
TabLine fg_tab_other bg_tab_other
344-
TabLineFill fg_dim bg_tab_bar
345-
TabLineSel fg_main bg_tab_current
346-
Title fg_alt none
347-
VertSplit border border
348-
Visual bg_main fg_alt
349-
VisualNOS fg_main magenta_faint
350-
WarningMsg red_faint none
351-
WildMenu bg_main yellow_warmer
352-
; Other conventional group names (see `:help group-name`)
353-
Comment fg_dim none italic
354-
Constant magenta_warmer none
355-
Error fg_main bg_red_intense reverse
356-
Identifier cyan none
357-
Ignore fg_main none
358-
PreProc red_cooler none
359-
Special cyan_cooler none
360-
Statement magenta_cooler none
361-
Todo magenta none bold
362-
Type cyan_cooler none
363-
Underlined fg_alt none
364-
String blue none
365-
Quote cyan_faint none
366-
; See `:help CursorIM`
367-
CursorIM fg_main bg_main
368-
; See `:help window-toolbar`
369-
ToolbarLine fg_dim border
370-
ToolbarButton bg_main border_highlight bold
371-
; Language and plugins
372-
jsObjectKey magenta_warmer none
373-
jsObjectValue magenta_faint none
374-
jsObjectProp green_faint none
375-
jsTemplateExpression cyan_cooler none
376-
jsModuleKeyword green_faint none
377-
javaScriptParens cyan_warmer none
378-
jsTemplateBraces yellow_cooler none
379-
jsDestructuringBraces yellow_cooler none
380-
jsBrackets yellow_cooler none
381-
jsBraces yellow_cooler none
382-
jsParens yellow_cooler none
383-
jsFuncParens yellow_cooler none
384-
jsClassBraces yellow_cooler none
385-
jsFuncBraces yellow_cooler none
386-
jsObjectBraces yellow_cooler none
387-
jsRepeatBraces yellow_cooler none
388-
jsIfElseBraces yellow_cooler none
389-
jsTryCatchBraces yellow_cooler none
390-
jsVariableDef magenta_warmer none
391-
NERDTreeFile cyan_cooler none
392307
; }}}
393308

309+
Background: dark
310+
Include: _theme.colortemplate
311+
394312
Background: light
395313

396314
; Color palette for light variant (Modus Operandi) {{{
@@ -629,93 +547,11 @@ Variant: gui 256
629547
Terminal fg_main bg_main
630548
#endif
631549

632-
; Group Foreground Background Attributes
633-
ColorColumn fg_main bg_main
634-
Conceal yellow_faint none
635-
Cursor bg_main rust
636-
CursorColumn none bg_hl_line
637-
CursorLine none bg_hl_line
638-
CursorLineNr fg_active bg_active
639-
DiffAdd fg_added bg_added
640-
DiffChange fg_changed bg_changed
641-
DiffDelete fg_removed bg_removed
642-
DiffText fg_changed bg_changed
643-
Directory blue none
644-
EndOfBuffer bg_main none
645-
ErrorMsg fg_main bg_red_intense
646-
FoldColumn fg_inactive bg_inactive
647-
Folded green_faint bg_dim italic
648-
IncSearch fg_main bg_yellow_intense t=reverse g=standout
649-
LineNr fg_dim bg_dim
650-
MatchParen fg_main bg_paren_match
651-
ModeMsg fg_dim none
652-
MoreMsg blue none
653-
NonText fg_dim none
654-
Pmenu fg_active bg_active
655-
PmenuSbar bg_main fg_dim
656-
PmenuSel fg_main bg_dim reverse
657-
PmenuThumb fg_main bg_main
658-
Question blue none
659-
Search fg_main bg_green_intense
660-
SignColumn fg_dim bg_dim
661-
SpecialKey fg_dim none
662-
SpellBad red_intense none s=red_intense
663-
SpellCap yellow_intense none s=yellow_intense
664-
SpellLocal blue_faint none s=blue_faint
665-
SpellRare green_faint none s=green_faint
666-
StatusLine fg_status_line_active bg_status_line_active
667-
StatusLineNC fg_status_line_inactive bg_status_line_inactive
668-
TabLine fg_tab_other bg_tab_other
669-
TabLineFill fg_dim bg_tab_bar
670-
TabLineSel fg_main bg_tab_current
671-
Title fg_alt none
672-
VertSplit border border
673-
Visual bg_main fg_alt
674-
VisualNOS fg_main magenta_faint
675-
WarningMsg red_faint none
676-
WildMenu bg_main yellow_warmer
677-
; Other conventional group names (see `:help group-name`)
678-
Comment fg_dim none italic
679-
Constant magenta_warmer none
680-
Error fg_main bg_red_intense reverse
681-
Identifier cyan none
682-
Ignore fg_main none
683-
PreProc red_cooler none
684-
Special cyan_cooler none
685-
Statement magenta_cooler none
686-
Todo magenta none bold
687-
Type cyan_cooler none
688-
Underlined fg_alt none
689-
String blue none
690-
Quote cyan_faint none
691-
; See `:help CursorIM`
692-
CursorIM fg_main bg_main
693-
; See `:help window-toolbar`
694-
ToolbarLine fg_dim border
695-
ToolbarButton bg_main border_highlight bold
696-
; Language and plugins
697-
jsObjectKey magenta_warmer none
698-
jsObjectValue magenta_faint none
699-
jsObjectProp green_faint none
700-
jsTemplateExpression cyan_cooler none
701-
jsModuleKeyword green_faint none
702-
javaScriptParens cyan_warmer none
703-
jsTemplateBraces yellow_cooler none
704-
jsDestructuringBraces yellow_cooler none
705-
jsBrackets yellow_cooler none
706-
jsBraces yellow_cooler none
707-
jsParens yellow_cooler none
708-
jsFuncParens yellow_cooler none
709-
jsClassBraces yellow_cooler none
710-
jsFuncBraces yellow_cooler none
711-
jsObjectBraces yellow_cooler none
712-
jsRepeatBraces yellow_cooler none
713-
jsIfElseBraces yellow_cooler none
714-
jsTryCatchBraces yellow_cooler none
715-
jsVariableDef magenta_warmer none
716-
NERDTreeFile cyan_cooler none
717550
; }}}
718551

552+
Background: light
553+
Include: _theme.colortemplate
554+
719555
Background: any
720556
Include: _bw.colortemplate
721557

0 commit comments

Comments
 (0)