mirror of
https://github.com/anotherhadi/ilovetui.git
synced 2026-10-05 10:58:26 +02:00
+7
-5
@@ -20,9 +20,10 @@ type colorsYAML struct {
|
||||
}
|
||||
|
||||
type configYAML struct {
|
||||
Colors colorsYAML `yaml:"colors"`
|
||||
NerdFonts bool `yaml:"nerd_fonts"`
|
||||
Border string `yaml:"border"`
|
||||
Colors colorsYAML `yaml:"colors"`
|
||||
NerdFonts bool `yaml:"nerd_fonts"`
|
||||
Border string `yaml:"border"`
|
||||
LayoutBorder string `yaml:"layout_border"`
|
||||
}
|
||||
|
||||
func pickString(base, user string) string {
|
||||
@@ -36,8 +37,9 @@ func mergeConfig(base, user configYAML) configYAML {
|
||||
return configYAML{
|
||||
Colors: mergeColors(base.Colors, user.Colors),
|
||||
|
||||
NerdFonts: base.NerdFonts || user.NerdFonts,
|
||||
Border: pickString(base.Border, user.Border),
|
||||
NerdFonts: base.NerdFonts || user.NerdFonts,
|
||||
Border: pickString(base.Border, user.Border),
|
||||
LayoutBorder: pickString(base.LayoutBorder, user.LayoutBorder),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user