diff --git a/ahrc-laptop/eww/eww.yuck b/ahrc-laptop/eww/eww.yuck index 6d20f75..0d88b93 100644 --- a/ahrc-laptop/eww/eww.yuck +++ b/ahrc-laptop/eww/eww.yuck @@ -25,32 +25,35 @@ }') (defvar battery-icon '{ - "Discharging": { - "0": "󰂎", - "10": "󰁺", - "20": "󰁻", - "30": "󰁼", - "40": "󰁽", - "50": "󰁾", - "60": "󰁿", - "70": "󰂀", - "80": "󰂁", - "90": "󰂂", - "100": "󰁹" - }, - "Charging": { - "0": "󰢟", - "10": "󰢜", - "20": "󰂆", - "30": "󰂇", - "40": "󰂈", - "50": "󰢝", - "60": "󰂉", - "70": "󰢞", - "80": "󰂊", - "90": "󰂋", - "100": "󰂅" - } + "Discharging": [ + "󰁹", + "󰂂", + "󰂁", + "󰂀", + "󰁿", + "󰁾", + "󰁽", + "󰁼", + "󰁻", + "󰁺", + "󰂎" + ], + "Charging": [ + "󰂅", + "󰂋", + "󰂊", + "󰢞", + "󰂉", + "󰢝", + "󰂈", + "󰂇", + "󰂆", + "󰢜", + "󰢟" + ], + "Full": [ + "󱟢" + ] }') (defwidget workspaces [] @@ -108,26 +111,26 @@ (defwidget battery [] (label :text "${EWW_BATTERY.BAT0.capacity == 100 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["100"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][0]}" : EWW_BATTERY.BAT0.capacity >= 90 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["90"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][1]}" : EWW_BATTERY.BAT0.capacity >= 80 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["80"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][2]}" : EWW_BATTERY.BAT0.capacity >= 70 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["70"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][3]}" : EWW_BATTERY.BAT0.capacity >= 60 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["60"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][4]}" : EWW_BATTERY.BAT0.capacity >= 50 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["50"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][5]}" : EWW_BATTERY.BAT0.capacity >= 40 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["40"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][6]}" : EWW_BATTERY.BAT0.capacity >= 30 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["30"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][7]}" : EWW_BATTERY.BAT0.capacity >= 20 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["20"]}" + ? "${battery-icon[EWW_BATTERY.BAT0.status][8]}" : EWW_BATTERY.BAT0.capacity >= 10 - ? "${battery-icon[EWW_BATTERY.BAT0.status]["10"]}" - : "${battery-icon[EWW_BATTERY.BAT0.status]["0"]}"} ${EWW_BATTERY.BAT0.capacity}%" + ? "${battery-icon[EWW_BATTERY.BAT0.status][9]}" + : "${battery-icon[EWW_BATTERY.BAT0.status][10]}"} ${EWW_BATTERY.BAT0.capacity}%" ) )