diff --git a/colorschemes/solarized.go b/colorschemes/solarized.go index 3ce9997f..59683101 100644 --- a/colorschemes/solarized.go +++ b/colorschemes/solarized.go @@ -1,10 +1,13 @@ package colorschemes +// This is a neutral version of the Solarized 256-color palette. The exception +// is that the one grey color uses the average of base0 and base00, which are +// already middle of the road. var Solarized = Colorscheme{ - Fg: 250, + Fg: -1, Bg: -1, - BorderLabel: 250, + BorderLabel: -1, BorderLine: 37, CPULines: []int{61, 33, 37, 64, 125, 160, 166, 136}, @@ -18,7 +21,7 @@ var Solarized = Colorscheme{ Sparkline: 33, - DiskBar: 245, + DiskBar: 243, TempLow: 64, TempHigh: 160, diff --git a/colorschemes/solarized16-dark.go b/colorschemes/solarized16-dark.go new file mode 100644 index 00000000..f8cdab77 --- /dev/null +++ b/colorschemes/solarized16-dark.go @@ -0,0 +1,27 @@ +package colorschemes + +// This scheme assumes the terminal already uses Solarized. Only DiskBar is +// different between dark/light. +var Solarized16Dark = Colorscheme{ + Fg: -1, + Bg: -1, + + BorderLabel: -1, + BorderLine: 6, + + CPULines: []int{13, 4, 6, 2, 5, 1, 9, 3}, + + BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3}, + + MainMem: 5, + SwapMem: 9, + + ProcCursor: 4, + + Sparkline: 4, + + DiskBar: 12, // base0 + + TempLow: 2, + TempHigh: 1, +} diff --git a/colorschemes/solarized16-light.go b/colorschemes/solarized16-light.go new file mode 100644 index 00000000..8426a950 --- /dev/null +++ b/colorschemes/solarized16-light.go @@ -0,0 +1,27 @@ +package colorschemes + +// This scheme assumes the terminal already uses Solarized. Only DiskBar is +// different between dark/light. +var Solarized16Light = Colorscheme{ + Fg: -1, + Bg: -1, + + BorderLabel: -1, + BorderLine: 6, + + CPULines: []int{13, 4, 6, 2, 5, 1, 9, 3}, + + BattLines: []int{13, 4, 6, 2, 5, 1, 9, 3}, + + MainMem: 5, + SwapMem: 9, + + ProcCursor: 4, + + Sparkline: 4, + + DiskBar: 11, // base00 + + TempLow: 2, + TempHigh: 1, +} diff --git a/main.go b/main.go index c29b9a08..9c2284f3 100644 --- a/main.go +++ b/main.go @@ -129,6 +129,10 @@ func handleColorscheme(cs string) error { colorscheme = colorschemes.Default case "solarized": colorscheme = colorschemes.Solarized + case "solarized16-light": + colorscheme = colorschemes.Solarized16Light + case "solarized16-dark": + colorscheme = colorschemes.Solarized16Dark case "monokai": colorscheme = colorschemes.Monokai case "vice":