diff --git a/stow/.config/matugen/templates/sketchybar.sh b/stow/.config/matugen/templates/sketchybar.sh index ba777f8..c795bb3 100644 --- a/stow/.config/matugen/templates/sketchybar.sh +++ b/stow/.config/matugen/templates/sketchybar.sh @@ -1,7 +1,16 @@ export PRIMARY_COLOUR="0xFF{{colors.primary.default.hex_stripped}}" +export PRIMARY_CONTAINER_COLOUR="0xFF{{colors.primary_container.default.hex_stripped}}" +export ON_PRIMARY_CONTAINER_COLOUR="0xFF{{colors.on_primary_container.default.hex_stripped}}" + export SECONDARY_COLOUR="0xFF{{colors.secondary.default.hex_stripped}}" +export SECONDARY_CONTAINER_COLOUR="0xFF{{colors.secondary_container.default.hex_stripped}}" +export ON_SECONDARY_CONTAINER_COLOUR="0xFF{{colors.on_secondary_container.default.hex_stripped}}" + +export TERTIARY_COLOUR="0xFF{{colors.tertiary.default.hex_stripped}}" +export TERTIARY_CONTAINER_COLOUR="0xFF{{colors.tertiary_container.default.hex_stripped}}" +export ON_TERTIARY_CONTAINER_COLOUR="0xFF{{colors.on_tertiary_container.default.hex_stripped}}" + export BACKGROUND_COLOUR=0xFF"{{colors.background.default.hex_stripped}}" export FONT="{{ font }}" export MONOSPACE_FONT="{{ monospace_font }}" - export ROUNDING="{{ rounding }}" diff --git a/stow/.config/sketchybar/plugins/space.sh b/stow/.config/sketchybar/plugins/space.sh index 5381e9f..7614cf3 100755 --- a/stow/.config/sketchybar/plugins/space.sh +++ b/stow/.config/sketchybar/plugins/space.sh @@ -4,7 +4,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source $SCRIPT_DIR/../colours.sh if [ $SELECTED = 'true' ]; then - sketchybar --set $NAME background.color=$PRIMARY_COLOUR label.color=$BACKGROUND_COLOUR label.padding_left=15 label.padding_right=15 + sketchybar --set $NAME background.color=$PRIMARY_CONTAINER_COLOUR label.color=$ON_PRIMARY_CONTAINER_COLOUR label.padding_left=15 label.padding_right=15 else sketchybar --set $NAME background.color=$BACKGROUND_COLOUR label.color=$PRIMARY_COLOUR label.padding_left=7 label.padding_right=7 fi