frobar: Use frogarized (dark) colors

Wanted to refactor things first, but hmmm, no sweet consistency has
priority.
This commit is contained in:
Geoffrey Frogeye 2024-02-10 13:30:11 +01:00
parent f65f6853ee
commit 6e176fe61b
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
3 changed files with 30 additions and 32 deletions

View file

@ -8,9 +8,9 @@ def run():
Bar.init() Bar.init()
Updater.init() Updater.init()
WORKSPACE_THEME = 0 WORKSPACE_THEME = 8
FOCUS_THEME = 3 FOCUS_THEME = 2
URGENT_THEME = 1 URGENT_THEME = 0
CUSTOM_SUFFIXES = "▲■" CUSTOM_SUFFIXES = "▲■"
customNames = dict() customNames = dict()
@ -35,17 +35,17 @@ def run():
# TODO Computer modes # TODO Computer modes
SYSTEM_THEME = 2 SYSTEM_THEME = 3
DANGER_THEME = FOCUS_THEME DANGER_THEME = 1
CRITICAL_THEME = URGENT_THEME CRITICAL_THEME = 0
Bar.addSectionAll(CpuProvider(), BarGroupType.RIGHT) Bar.addSectionAll(CpuProvider(), BarGroupType.RIGHT)
Bar.addSectionAll(RamProvider(), BarGroupType.RIGHT) Bar.addSectionAll(RamProvider(), BarGroupType.RIGHT)
Bar.addSectionAll(TemperatureProvider(), BarGroupType.RIGHT) Bar.addSectionAll(TemperatureProvider(), BarGroupType.RIGHT)
Bar.addSectionAll(BatteryProvider(), BarGroupType.RIGHT) Bar.addSectionAll(BatteryProvider(), BarGroupType.RIGHT)
# Peripherals # Peripherals
PERIPHERAL_THEME = 5 PERIPHERAL_THEME = 6
NETWORK_THEME = 4 NETWORK_THEME = 5
# TODO Disk space provider # TODO Disk space provider
# TODO Screen (connected, autorandr configuration, bbswitch) provider # TODO Screen (connected, autorandr configuration, bbswitch) provider
Bar.addSectionAll(PulseaudioProvider(theme=PERIPHERAL_THEME), BarGroupType.RIGHT) Bar.addSectionAll(PulseaudioProvider(theme=PERIPHERAL_THEME), BarGroupType.RIGHT)
@ -53,12 +53,12 @@ def run():
Bar.addSectionAll(NetworkProvider(theme=NETWORK_THEME), BarGroupType.RIGHT) Bar.addSectionAll(NetworkProvider(theme=NETWORK_THEME), BarGroupType.RIGHT)
# Personal # Personal
PERSONAL_THEME = 0 PERSONAL_THEME = 7
# Bar.addSectionAll(KeystoreProvider(theme=PERSONAL_THEME), BarGroupType.RIGHT) # Bar.addSectionAll(KeystoreProvider(theme=PERSONAL_THEME), BarGroupType.RIGHT)
# Bar.addSectionAll(NotmuchUnreadProvider(dir='~/.mail/', theme=PERSONAL_THEME), BarGroupType.RIGHT) # Bar.addSectionAll(NotmuchUnreadProvider(dir='~/.mail/', theme=PERSONAL_THEME), BarGroupType.RIGHT)
# Bar.addSectionAll(TodoProvider(dir='~/.vdirsyncer/currentCalendars/', theme=PERSONAL_THEME), BarGroupType.RIGHT) # Bar.addSectionAll(TodoProvider(dir='~/.vdirsyncer/currentCalendars/', theme=PERSONAL_THEME), BarGroupType.RIGHT)
TIME_THEME = 6 TIME_THEME = 4
Bar.addSectionAll(TimeProvider(theme=TIME_THEME), BarGroupType.RIGHT) Bar.addSectionAll(TimeProvider(theme=TIME_THEME), BarGroupType.RIGHT)
# Bar.run() # Bar.run()

View file

@ -313,29 +313,26 @@ class SectionThread(threading.Thread):
class Section: class Section:
# TODO Update all of that to base16 # TODO Update all of that to base16
# COLORS = ['#272822', '#383830', '#49483e', '#75715e', '#a59f85', '#f8f8f2',
# '#f5f4f1', '#f9f8f5', '#f92672', '#fd971f', '#f4bf75', '#a6e22e',
# '#a1efe4', '#66d9ef', '#ae81ff', '#cc6633']
COLORS = [ COLORS = [
"#181818", "#092c0e",
"#AB4642", "#143718",
"#A1B56C", "#5a7058",
"#F7CA88", "#677d64",
"#7CAFC2", "#89947f",
"#BA8BAF", "#99a08d",
"#86C1B9", "#fae2e3",
"#D8D8D8", "#fff0f1",
"#585858", "#e0332e",
"#AB4642", "#cf4b15",
"#A1B56C", "#bb8801",
"#F7CA88", "#8d9800",
"#7CAFC2", "#1fa198",
"#BA8BAF", "#008dd1",
"#86C1B9", "#5c73c4",
"#F8F8F8", "#d43982",
] ]
FGCOLOR = "#F8F8F2" FGCOLOR = "#fff0f1"
BGCOLOR = "#272822" BGCOLOR = "#092c0e"
THEMES = list() THEMES = list()
EMPTY = (FGCOLOR, BGCOLOR) EMPTY = (FGCOLOR, BGCOLOR)
@ -353,6 +350,7 @@ class Section:
def init(): def init():
for t in range(8, 16): for t in range(8, 16):
Section.THEMES.append((Section.COLORS[0], Section.COLORS[t])) Section.THEMES.append((Section.COLORS[0], Section.COLORS[t]))
Section.THEMES.append((Section.COLORS[0], Section.COLORS[3]))
Section.updateThread.start() Section.updateThread.start()

View file

@ -66,7 +66,7 @@ class AlertLevel(enum.Enum):
class AlertingSection(StatefulSection): class AlertingSection(StatefulSection):
# TODO EASE Correct settings for themes # TODO EASE Correct settings for themes
THEMES = {AlertLevel.NORMAL: 2, AlertLevel.WARNING: 3, AlertLevel.DANGER: 1} THEMES = {AlertLevel.NORMAL: 3, AlertLevel.WARNING: 1, AlertLevel.DANGER: 0}
PERSISTENT = True PERSISTENT = True
def getLevel(self, quantity): def getLevel(self, quantity):