b65ab9e feat(config): add bar.accent to pick which theme color highlights use · neferbar

M README.md +2 -0


@@ -53,6 +53,7 @@ Add one `[[module]]` block per script. Save the file and the bar updates immedia
53	53		\| `bar.scale` \| `1.0` \| Extra zoom on top of the monitor scale. \|
54	54		\| `bar.output` \| any \| A monitor name such as `HDMI-A-1`. Needs a restart. \|
55	55		\| `bar.theme` \| `auto` \| `auto` reads the colors of the terminal you use. Or the path of a theme file (see Colors). \|
	56	+	\| `bar.accent` \| `4` \| Which of the theme's 16 colors (0-15) the highlights use. 4 is the ANSI blue; try 2 (green), 6 (cyan) or 5 (magenta) to match your theme. \|
56	57		\| `bar.background`, `bar.foreground` \| from the theme \| `#rrggbb`. Set them to override the theme. \|
57	58
58	59		If the font is not installed, neferbar warns and falls back to another font, and icons may be missing.

@@ -84,6 +85,7 @@ Scripts get the colors as environment variables, each `#rrggbb`, so a script nev
84	85		\| Variable \| Color \|
85	86		\|---\|---\|
86	87		\| `NEFERBAR_BACKGROUND`, `NEFERBAR_FOREGROUND` \| the bar's own background and text \|
	88	+	\| `NEFERBAR_ACCENT` \| the highlight color, the theme color that `bar.accent` picks \|
87	89		\| `NEFERBAR_COLOR0` .. `NEFERBAR_COLOR15` \| the theme's 16 ANSI colors \|
88	90
89	91		The 16 ANSI codes a script prints (`\033[31m` red, `\033[44m` blue background and so on) use the theme as well.


@@ -53,6 +53,7 @@ Add one `[[module]]` block per script. Save the file and the bar updates immedia
53	\| `bar.scale` \| `1.0` \| Extra zoom on top of the monitor scale. \|	53		\| `bar.scale` \| `1.0` \| Extra zoom on top of the monitor scale. \|
54	\| `bar.output` \| any \| A monitor name such as `HDMI-A-1`. Needs a restart. \|	54		\| `bar.output` \| any \| A monitor name such as `HDMI-A-1`. Needs a restart. \|
55	\| `bar.theme` \| `auto` \| `auto` reads the colors of the terminal you use. Or the path of a theme file (see Colors). \|	55		\| `bar.theme` \| `auto` \| `auto` reads the colors of the terminal you use. Or the path of a theme file (see Colors). \|
		56	+	\| `bar.accent` \| `4` \| Which of the theme's 16 colors (0-15) the highlights use. 4 is the ANSI blue; try 2 (green), 6 (cyan) or 5 (magenta) to match your theme. \|
56	\| `bar.background`, `bar.foreground` \| from the theme \| `#rrggbb`. Set them to override the theme. \|	57		\| `bar.background`, `bar.foreground` \| from the theme \| `#rrggbb`. Set them to override the theme. \|
57		58
58	If the font is not installed, neferbar warns and falls back to another font, and icons may be missing.	59		If the font is not installed, neferbar warns and falls back to another font, and icons may be missing.

@@ -84,6 +85,7 @@ Scripts get the colors as environment variables, each `#rrggbb`, so a script nev
84	\| Variable \| Color \|	85		\| Variable \| Color \|
85	\|---\|---\|	86		\|---\|---\|
86	\| `NEFERBAR_BACKGROUND`, `NEFERBAR_FOREGROUND` \| the bar's own background and text \|	87		\| `NEFERBAR_BACKGROUND`, `NEFERBAR_FOREGROUND` \| the bar's own background and text \|
		88	+	\| `NEFERBAR_ACCENT` \| the highlight color, the theme color that `bar.accent` picks \|
87	\| `NEFERBAR_COLOR0` .. `NEFERBAR_COLOR15` \| the theme's 16 ANSI colors \|	89		\| `NEFERBAR_COLOR0` .. `NEFERBAR_COLOR15` \| the theme's 16 ANSI colors \|
88		90
89	The 16 ANSI codes a script prints (`\033[31m` red, `\033[44m` blue background and so on) use the theme as well.	91		The 16 ANSI codes a script prints (`\033[31m` red, `\033[44m` blue background and so on) use the theme as well.

M examples/bundle/config.toml +1 -0


@@ -10,6 +10,7 @@
10	10		font = "JetBrainsMono Nerd Font Mono" # any "Mono" Nerd Font
11	11		size = 14
12	12		theme = "auto" # the colors of the terminal in $TERMINAL, or the path of a theme file
	13	+	accent = 4 # which theme color (0-15) highlights use: 4 is blue, 2 green, 6 cyan
13	14
14	15		[[module]]
15	16		name = "workspaces"


@@ -10,6 +10,7 @@
10	font = "JetBrainsMono Nerd Font Mono" # any "Mono" Nerd Font	10		font = "JetBrainsMono Nerd Font Mono" # any "Mono" Nerd Font
11	size = 14	11		size = 14
12	theme = "auto" # the colors of the terminal in $TERMINAL, or the path of a theme file	12		theme = "auto" # the colors of the terminal in $TERMINAL, or the path of a theme file
		13	+	accent = 4 # which theme color (0-15) highlights use: 4 is blue, 2 green, 6 cyan
13		14
14	[[module]]	15		[[module]]
15	name = "workspaces"	16		name = "workspaces"

M examples/bundle/lib.sh +4 -1


@@ -4,11 +4,14 @@
4	4		# hard-codes one:
5	5		# NEFERBAR_BACKGROUND the bar's own background
6	6		# NEFERBAR_FOREGROUND the bar's text color
	7	+	# NEFERBAR_ACCENT the highlight color: bar.accent in the config picks
	8	+	# which of the 16 theme colors it is
7	9		# NEFERBAR_COLOR0..15 the theme's 16 ANSI colors
8	10
9	11		: "${NEFERBAR_BACKGROUND:=#26263a}" "${NEFERBAR_FOREGROUND:=#cdd6f4}"
10	12		: "${NEFERBAR_COLOR0:=#45475a}" "${NEFERBAR_COLOR2:=#a6e3a1}" "${NEFERBAR_COLOR3:=#f9e2af}"
11	13		: "${NEFERBAR_COLOR4:=#89b4fa}" "${NEFERBAR_COLOR15:=#a6adc8}"
	14	+	: "${NEFERBAR_ACCENT:=$NEFERBAR_COLOR4}"
12	15
13	16		RESET=$'\e[0m' BOLD=$'\e[1m'
14	17

@@ -43,7 +46,7 @@ fade() {
43	46		}
44	47
45	48		BAR=$NEFERBAR_BACKGROUND
46		-	ACCENT=$NEFERBAR_COLOR4
	49	+	ACCENT=$NEFERBAR_ACCENT
47	50		DIM=$(mix "$BAR" "$NEFERBAR_FOREGROUND" 45)
48	51
49	52		# ink "#accent" -> the text color for a block of that color: the theme's black

 # hard-codes one:
 #   NEFERBAR_BACKGROUND  the bar's own background
 #   NEFERBAR_FOREGROUND  the bar's text color
+#   NEFERBAR_ACCENT      the highlight color: bar.accent in the config picks
+#                        which of the 16 theme colors it is
 #   NEFERBAR_COLOR0..15  the theme's 16 ANSI colors
 : "${NEFERBAR_BACKGROUND:=#26263a}" "${NEFERBAR_FOREGROUND:=#cdd6f4}"
 : "${NEFERBAR_COLOR0:=#45475a}" "${NEFERBAR_COLOR2:=#a6e3a1}" "${NEFERBAR_COLOR3:=#f9e2af}"
 : "${NEFERBAR_COLOR4:=#89b4fa}" "${NEFERBAR_COLOR15:=#a6adc8}"
+: "${NEFERBAR_ACCENT:=$NEFERBAR_COLOR4}"
 RESET=$'\e[0m' BOLD=$'\e[1m'
 }
 BAR=$NEFERBAR_BACKGROUND
-ACCENT=$NEFERBAR_COLOR4
+ACCENT=$NEFERBAR_ACCENT
 DIM=$(mix "$BAR" "$NEFERBAR_FOREGROUND" 45)
 # ink "#accent" -> the text color for a block of that color: the theme's black

M internal/bar/bar.go +1 -1


@@ -171,7 +171,7 @@ func (b *Bar) setTheme(th theme.Theme) {
171	171		b.theme = th
172	172		b.fg, b.bg = barColors(b.cfg, th)
173	173		b.pal = th.Palette
174		-	b.env = th.EnvVars(b.bg, b.fg)
	174	+	b.env = th.EnvVars(b.bg, b.fg, b.cfg.Bar.Accent)
175	175		if b.lay != nil {
176	176		b.lay.SetColors(b.fg, b.bg, b.pal)
177	177		}


@@ -171,7 +171,7 @@ func (b *Bar) setTheme(th theme.Theme) {
171		b.theme = th	171		b.theme = th
172		b.fg, b.bg = barColors(b.cfg, th)	172		b.fg, b.bg = barColors(b.cfg, th)
173		b.pal = th.Palette	173		b.pal = th.Palette
174	-	b.env = th.EnvVars(b.bg, b.fg)	174	+	b.env = th.EnvVars(b.bg, b.fg, b.cfg.Bar.Accent)
175		if b.lay != nil {	175		if b.lay != nil {
176		b.lay.SetColors(b.fg, b.bg, b.pal)	176		b.lay.SetColors(b.fg, b.bg, b.pal)
177		}	177		}

M internal/config/config.go +7 -1


@@ -20,6 +20,9 @@ type Bar struct {
20	20		// Theme is "auto" (the colors of the terminal in use) or the path of a
21	21		// terminal theme or config file: kitty, foot, ghostty or alacritty.
22	22		Theme string `toml:"theme"`
	23	+	// Accent is the number (0-15) of the theme's ANSI color the bundled
	24	+	// scripts use for highlights. Scripts read it as $NEFERBAR_ACCENT.
	25	+	Accent int `toml:"accent"`
23	26		// Background and Foreground, as #rrggbb, override the theme's.
24	27		Background string `toml:"background"`
25	28		Foreground string `toml:"foreground"`

@@ -42,7 +45,7 @@ type Config struct {
42	45		func Default() Config {
43	46		return Config{Bar: Bar{
44	47		Font: "JetBrainsMono Nerd Font Mono", Size: 14, Scale: 1,
45		-	Theme: "auto",
	48	+	Theme: "auto", Accent: 4,
46	49		}}
47	50		}
48	51

@@ -93,6 +96,9 @@ func (c *Config) Validate() error {
93	96		return err
94	97		}
95	98		}
	99	+	if b.Accent < 0 \|\| b.Accent > 15 {
	100	+	return fmt.Errorf("config: bar.accent %d must be a color number from 0 to 15", b.Accent)
	101	+	}
96	102		if b.Theme == "" {
97	103		return fmt.Errorf("config: bar.theme is empty; use \"auto\" or the path of a theme file")
98	104		}

 	// Theme is "auto" (the colors of the terminal in use) or the path of a
 	// terminal theme or config file: kitty, foot, ghostty or alacritty.
 	Theme string `toml:"theme"`
+	// Accent is the number (0-15) of the theme's ANSI color the bundled
+	// scripts use for highlights. Scripts read it as $NEFERBAR_ACCENT.
+	Accent int `toml:"accent"`
 	// Background and Foreground, as #rrggbb, override the theme's.
 	Background string `toml:"background"`
 	Foreground string `toml:"foreground"`
 func Default() Config {
 	return Config{Bar: Bar{
 		Font: "JetBrainsMono Nerd Font Mono", Size: 14, Scale: 1,
-		Theme: "auto",
+		Theme: "auto", Accent: 4,
 	}}
 }
 			return err
 		}
 	}
+	if b.Accent < 0 || b.Accent > 15 {
+		return fmt.Errorf("config: bar.accent %d must be a color number from 0 to 15", b.Accent)
+	}
 	if b.Theme == "" {
 		return fmt.Errorf("config: bar.theme is empty; use \"auto\" or the path of a theme file")
 	}

M internal/config/config_test.go +13 -0


@@ -37,6 +37,8 @@ func TestLoadErrors(t *testing.T) {
37	37		"bad size": "[bar]\nsize = 1\n",
38	38		"bad scale": "[bar]\nscale = 20\n",
39	39		"bad color": "[bar]\nbackground = \"red\"\n",
	40	+	"accent low": "[bar]\naccent = -1\n",
	41	+	"accent high": "[bar]\naccent = 16\n",
40	42		"syntax error": "[bar\n",
41	43		} {
42	44		if _, err := Load(write(t, body), true); err == nil {

@@ -56,3 +58,14 @@ func TestMissingFile(t *testing.T) {
56	58		t.Fatal("explicit path missing must fail")
57	59		}
58	60		}
	61	+
	62	+	func TestAccentDefaultsToBlue(t *testing.T) {
	63	+	c, err := Load(write(t, "[bar]\nsize = 14\n"), true)
	64	+	if err != nil \|\| c.Bar.Accent != 4 {
	65	+	t.Fatalf("accent = %d, err %v; want the default 4", c.Bar.Accent, err)
	66	+	}
	67	+	c, err = Load(write(t, "[bar]\naccent = 2\n"), true)
	68	+	if err != nil \|\| c.Bar.Accent != 2 {
	69	+	t.Fatalf("accent = %d, err %v; want 2", c.Bar.Accent, err)
	70	+	}
	71	+	}


@@ -37,6 +37,8 @@ func TestLoadErrors(t *testing.T) {
37	"bad size": "[bar]\nsize = 1\n",	37		"bad size": "[bar]\nsize = 1\n",
38	"bad scale": "[bar]\nscale = 20\n",	38		"bad scale": "[bar]\nscale = 20\n",
39	"bad color": "[bar]\nbackground = \"red\"\n",	39		"bad color": "[bar]\nbackground = \"red\"\n",
		40	+	"accent low": "[bar]\naccent = -1\n",
		41	+	"accent high": "[bar]\naccent = 16\n",
40	"syntax error": "[bar\n",	42		"syntax error": "[bar\n",
41	} {	43		} {
42	if _, err := Load(write(t, body), true); err == nil {	44		if _, err := Load(write(t, body), true); err == nil {

@@ -56,3 +58,14 @@ func TestMissingFile(t *testing.T) {
56	t.Fatal("explicit path missing must fail")	58		t.Fatal("explicit path missing must fail")
57	}	59		}
58	}	60		}
		61	+
		62	+	func TestAccentDefaultsToBlue(t *testing.T) {
		63	+	c, err := Load(write(t, "[bar]\nsize = 14\n"), true)
		64	+	if err != nil \|\| c.Bar.Accent != 4 {
		65	+	t.Fatalf("accent = %d, err %v; want the default 4", c.Bar.Accent, err)
		66	+	}
		67	+	c, err = Load(write(t, "[bar]\naccent = 2\n"), true)
		68	+	if err != nil \|\| c.Bar.Accent != 2 {
		69	+	t.Fatalf("accent = %d, err %v; want 2", c.Bar.Accent, err)
		70	+	}
		71	+	}

M internal/theme/theme.go +6 -4


@@ -227,10 +227,12 @@ func Mix(a, b RGB, t float64) RGB {
227	227		func Hex(c RGB) string { return fmt.Sprintf("#%02x%02x%02x", c[0], c[1], c[2]) }
228	228
229	229		// EnvVars returns the colors as environment entries for scripts:
230		-	// NEFERBAR_BACKGROUND, NEFERBAR_FOREGROUND and NEFERBAR_COLOR0..15, each
231		-	// #rrggbb. bg and fg are the colors the bar really uses.
232		-	func (t Theme) EnvVars(bg, fg RGB) []string {
233		-	out := []string{"NEFERBAR_BACKGROUND=" + Hex(bg), "NEFERBAR_FOREGROUND=" + Hex(fg)}
	230	+	// NEFERBAR_BACKGROUND, NEFERBAR_FOREGROUND, NEFERBAR_ACCENT and
	231	+	// NEFERBAR_COLOR0..15, each #rrggbb. bg and fg are the colors the bar really
	232	+	// uses; accent is the number of the palette color chosen for highlights.
	233	+	func (t Theme) EnvVars(bg, fg RGB, accent int) []string {
	234	+	out := []string{"NEFERBAR_BACKGROUND=" + Hex(bg), "NEFERBAR_FOREGROUND=" + Hex(fg),
	235	+	"NEFERBAR_ACCENT=" + Hex(t.Palette[accent&15])}
234	236		for i, c := range t.Palette {
235	237		out = append(out, fmt.Sprintf("NEFERBAR_COLOR%d=%s", i, Hex(c)))
236	238		}

 func Hex(c RGB) string { return fmt.Sprintf("#%02x%02x%02x", c[0], c[1], c[2]) }
 // EnvVars returns the colors as environment entries for scripts:
-// NEFERBAR_BACKGROUND, NEFERBAR_FOREGROUND and NEFERBAR_COLOR0..15, each
+// NEFERBAR_BACKGROUND, NEFERBAR_FOREGROUND, NEFERBAR_ACCENT and
-// #rrggbb. bg and fg are the colors the bar really uses.
+// NEFERBAR_COLOR0..15, each #rrggbb. bg and fg are the colors the bar really
-func (t Theme) EnvVars(bg, fg RGB) []string {
+// uses; accent is the number of the palette color chosen for highlights.
-	out := []string{"NEFERBAR_BACKGROUND=" + Hex(bg), "NEFERBAR_FOREGROUND=" + Hex(fg)}
+func (t Theme) EnvVars(bg, fg RGB, accent int) []string {
+	out := []string{"NEFERBAR_BACKGROUND=" + Hex(bg), "NEFERBAR_FOREGROUND=" + Hex(fg),
+		"NEFERBAR_ACCENT=" + Hex(t.Palette[accent&15])}
 	for i, c := range t.Palette {
 		out = append(out, fmt.Sprintf("NEFERBAR_COLOR%d=%s", i, Hex(c)))
 	}

M internal/theme/theme_test.go +20 -0


@@ -233,3 +233,23 @@ func TestParseColorForms(t *testing.T) {
233	233		}
234	234		}
235	235		}
	236	+
	237	+	func TestEnvVarsCarryTheChosenAccent(t *testing.T) {
	238	+	th := Default()
	239	+	th.Palette[2] = RGB{0x7d, 0xb5, 0xb5}
	240	+	th.Palette[4] = RGB{0x6c, 0x9b, 0xd9}
	241	+	has := func(env []string, want string) bool {
	242	+	for _, e := range env {
	243	+	if e == want {
	244	+	return true
	245	+	}
	246	+	}
	247	+	return false
	248	+	}
	249	+	if env := th.EnvVars(RGB{}, RGB{}, 2); !has(env, "NEFERBAR_ACCENT=#7db5b5") {
	250	+	t.Errorf("accent 2 not exported as the teal: %v", env)
	251	+	}
	252	+	if env := th.EnvVars(RGB{}, RGB{}, 4); !has(env, "NEFERBAR_ACCENT=#6c9bd9") {
	253	+	t.Errorf("accent 4 not exported as the blue: %v", env)
	254	+	}
	255	+	}


@@ -233,3 +233,23 @@ func TestParseColorForms(t *testing.T) {
233	}	233		}
234	}	234		}
235	}	235		}
		236	+
		237	+	func TestEnvVarsCarryTheChosenAccent(t *testing.T) {
		238	+	th := Default()
		239	+	th.Palette[2] = RGB{0x7d, 0xb5, 0xb5}
		240	+	th.Palette[4] = RGB{0x6c, 0x9b, 0xd9}
		241	+	has := func(env []string, want string) bool {
		242	+	for _, e := range env {
		243	+	if e == want {
		244	+	return true
		245	+	}
		246	+	}
		247	+	return false
		248	+	}
		249	+	if env := th.EnvVars(RGB{}, RGB{}, 2); !has(env, "NEFERBAR_ACCENT=#7db5b5") {
		250	+	t.Errorf("accent 2 not exported as the teal: %v", env)
		251	+	}
		252	+	if env := th.EnvVars(RGB{}, RGB{}, 4); !has(env, "NEFERBAR_ACCENT=#6c9bd9") {
		253	+	t.Errorf("accent 4 not exported as the blue: %v", env)
		254	+	}
		255	+	}