bb41a28 · helix · git.iko.soy

git.iko.soy/helix

theme: Use inheritance for gruvbox themes (#6295)

These gruvbox variants were introduced before theme inheritance and only differ by a few colors. This change cleans up the duplicated theming with theme inheritance.

commitbb41a283e61e4d6ec7b13909771d0a9e5a759a15 authorMichael Davis <mcarsondavis@gmail.com> dateMon 13 Mar 2023, 20:56 (4 years ago) parentb558ce7

2 files changed+3−171

compare with master

unifiedsplit

runtime/themes/gruvbox_dark_hard.toml+2−95 runtime/themes/gruvbox_light.toml+1−76

runtime/themes/gruvbox_dark_hard.toml+2−95

@@ -2,107 +2,14 @@

22# Author : Jakub Bartodziej <kubabartodziej@gmail.com>

33# The theme uses the gruvbox dark palette with hard contrast: github.com/morhetz/gruvbox

5−"attribute" = "aqua1"

6−"keyword" = { fg = "red1" }

7−"keyword.directive" = "red0"

8−"namespace" = "aqua1"

9−"punctuation" = "orange1"

10−"punctuation.delimiter" = "orange1"

11−"operator" = "purple1"

12−"special" = "purple0"

13−"variable.other.member" = "blue1"

14−"variable" = "fg1"

15−"variable.builtin" = "orange1"

16−"variable.parameter" = "fg2"

17−"type" = "yellow1"

18−"type.builtin" = "yellow1"

19−"constructor" = { fg = "purple1", modifiers = ["bold"] }

20−"function" = { fg = "green1", modifiers = ["bold"] }

21−"function.macro" = "aqua1"

22−"function.builtin" = "yellow1"

23−"tag" = "red1"

24−"comment" = { fg = "gray1", modifiers = ["italic"] }

25−"constant" = { fg = "purple1" }

26−"constant.builtin" = { fg = "purple1", modifiers = ["bold"] }

27−"string" = "green1"

28−"constant.numeric" = "purple1"

29−"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] }

30−"label" = "aqua1"

31−"module" = "aqua1"

5+inherits = "gruvbox"

326

33−"diff.plus" = "green1"

34−"diff.delta" = "orange1"

35−"diff.minus" = "red1"

36−

37−"warning" = "orange1"

38−"error" = "red1"

39−"info" = "aqua1"

40−"hint" = "blue1"

41−

42−"diagnostic.error" = { underline = { style = "curl", color = "red0" } }

43−"diagnostic.warning" = { underline = { style = "curl", color = "orange1" } }

44−"diagnostic.info" = { underline = { style = "curl", color = "aqua1" } }

45−"diagnostic.hint" = { underline = { style = "curl", color = "blue1" } }

46−

47−"ui.background" = { bg = "bg0" }

48−"ui.linenr" = { fg = "bg4" }

49−"ui.linenr.selected" = { fg = "yellow1" }

50−"ui.cursorline" = { bg = "bg1" }

51−"ui.statusline" = { fg = "fg1", bg = "bg2" }

52−"ui.statusline.normal" = { fg = "fg1", bg = "bg2" }

53−"ui.statusline.insert" = { fg = "fg1", bg = "blue0" }

54−"ui.statusline.select" = { fg = "fg1", bg = "orange0" }

55−"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }

56−"ui.popup" = { bg = "bg1" }

57−"ui.window" = { bg = "bg1" }

58−"ui.help" = { bg = "bg1", fg = "fg1" }

59−"ui.text" = { fg = "fg1" }

60−"ui.text.focus" = { fg = "fg1" }

617"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }

628"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }

639"ui.cursor.primary" = { modifiers = ["reversed"] }

6410"ui.cursor.match" = { bg = "bg2" }

65−"ui.menu" = { fg = "fg1", bg = "bg2" }

66−"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }

67−"ui.virtual.whitespace" = "bg2"

68−"ui.virtual.ruler" = { bg = "bg1" }

69−"ui.virtual.inlay-hint" = { fg = "gray1" }

7011

71−"markup.heading" = "aqua1"

72−"markup.bold" = { modifiers = ["bold"] }

73−"markup.italic" = { modifiers = ["italic"] }

74−"markup.strikethrough" = { modifiers = ["crossed_out"] }

75−"markup.link.url" = { fg = "green1", modifiers = ["underlined"] }

76−"markup.link.text" = "red1"

77−"markup.raw" = "red1"

12+"diagnostic.error" = { underline = { color = "red0", style = "curl"} }

7813

7914[palette]

8015bg0 = "#1d2021" # main background

81−bg1 = "#3c3836"

82−bg2 = "#504945"

83−bg3 = "#665c54"

84−bg4 = "#7c6f64"

85−

86−fg0 = "#fbf1c7"

87−fg1 = "#ebdbb2" # main foreground

88−fg2 = "#d5c4a1"

89−fg3 = "#bdae93"

90−fg4 = "#a89984" # gray0

91−

92−gray0 = "#a89984"

93−gray1 = "#928374"

94−

95−red0 = "#cc241d" # neutral

96−red1 = "#fb4934" # bright

97−green0 = "#98971a"

98−green1 = "#b8bb26"

99−yellow0 = "#d79921"

100−yellow1 = "#fabd2f"

101−blue0 = "#458588"

102−blue1 = "#83a598"

103−purple0 = "#b16286"

104−purple1 = "#d3869b"

105−aqua0 = "#689d6a"

106−aqua1 = "#8ec07c"

107−orange0 = "#d65d0e"

108−orange1 = "#fe8019"

runtime/themes/gruvbox_light.toml+1−76

@@ -2,79 +2,12 @@

22# Author : Jakub Bartodziej <kubabartodziej@gmail.com>

33# The theme uses the gruvbox light palette with standard contrast: github.com/morhetz/gruvbox

5−"attribute" = "aqua1"

6−"keyword" = { fg = "red1" }

7−"keyword.directive" = "red0"

8−"namespace" = "aqua1"

9−"punctuation" = "orange1"

10−"punctuation.delimiter" = "orange1"

11−"operator" = "purple1"

12−"special" = "purple0"

13−"variable.other.member" = "blue1"

14−"variable" = "fg1"

15−"variable.builtin" = "orange1"

16−"variable.parameter" = "fg2"

17−"type" = "yellow1"

18−"type.builtin" = "yellow1"

19−"constructor" = { fg = "purple1", modifiers = ["bold"] }

20−"function" = { fg = "green1", modifiers = ["bold"] }

21−"function.macro" = "aqua1"

22−"function.builtin" = "yellow1"

23−"tag" = "red1"

24−"comment" = { fg = "gray1", modifiers = ["italic"] }

25−"constant" = { fg = "purple1" }

26−"constant.builtin" = { fg = "purple1", modifiers = ["bold"] }

27−"string" = "green1"

28−"constant.numeric" = "purple1"

29−"constant.character.escape" = { fg = "fg2", modifiers = ["bold"] }

30−"label" = "aqua1"

31−"module" = "aqua1"

5+inherits = "gruvbox"

326

33−"diff.plus" = "green1"

34−"diff.delta" = "orange1"

35−"diff.minus" = "red1"

36−

37−"warning" = "orange1"

38−"error" = "red1"

39−"info" = "aqua1"

40−"hint" = "blue1"

41−

42−"ui.background" = { bg = "bg0" }

43−"ui.linenr" = { fg = "bg4" }

44−"ui.linenr.selected" = { fg = "yellow1" }

45−"ui.cursorline" = { bg = "bg1" }

46−"ui.statusline" = { fg = "fg1", bg = "bg2" }

47−"ui.statusline.normal" = { fg = "fg1", bg = "bg2" }

48−"ui.statusline.insert" = { fg = "fg1", bg = "blue0" }

49−"ui.statusline.select" = { fg = "fg1", bg = "orange0" }

50−"ui.statusline.inactive" = { fg = "fg4", bg = "bg1" }

51−"ui.popup" = { bg = "bg1" }

52−"ui.window" = { bg = "bg1" }

53−"ui.help" = { bg = "bg1", fg = "fg1" }

54−"ui.text" = { fg = "fg1" }

55−"ui.text.focus" = { fg = "fg1" }

567"ui.selection" = { bg = "bg3", modifiers = ["reversed"] }

578"ui.selection.primary" = { bg = "bg4", modifiers = ["reversed"] }

589"ui.cursor.primary" = { modifiers = ["reversed"] }

5910"ui.cursor.match" = { bg = "bg2" }

60−"ui.menu" = { fg = "fg1", bg = "bg2" }

61−"ui.menu.selected" = { fg = "bg2", bg = "blue1", modifiers = ["bold"] }

62−"ui.virtual.whitespace" = "bg2"

63−"ui.virtual.ruler" = { bg = "bg1" }

64−"ui.virtual.inlay-hint" = { fg = "gray1" }

65−

66−"diagnostic.warning" = { underline = { color = "orange1", style = "curl" } }

67−"diagnostic.error" = { underline = { color = "red1", style = "curl" } }

68−"diagnostic.info" = { underline = { color = "aqua1", style = "curl" } }

69−"diagnostic.hint" = { underline = { color = "blue1", style = "curl" } }

70−

71−"markup.heading" = "aqua1"

72−"markup.bold" = { modifiers = ["bold"] }

73−"markup.italic" = { modifiers = ["italic"] }

74−"markup.strikethrough" = { modifiers = ["crossed_out"] }

75−"markup.link.url" = { fg = "green1", modifiers = ["underlined"] }

76−"markup.link.text" = "red1"

77−"markup.raw" = "red1"

7811

7912[palette]

8013bg0 = "#fbf1c7" # main background

@@ -90,19 +23,11 @@ fg3 = "#665c54"

9023fg4 = "#7c6f64" # gray0

9124

9225gray0 = "#7c6f64"

93−gray1 = "#928374"

9426

95−red0 = "#cc241d" # neutral

9627red1 = "#9d0006" # bright

97−green0 = "#98971a"

9828green1 = "#79740e"

99−yellow0 = "#d79921"

10029yellow1 = "#b57614"

101−blue0 = "#458588"

10230blue1 = "#076678"

103−purple0 = "#b16286"

10431purple1 = "#8f3f71"

105−aqua0 = "#689d6a"

10632aqua1 = "#427b58"

107−orange0 = "#d65d0e"

10833orange1 = "#af3a03"