From 99464bed6ee684948a0c40f8a8b22a74392efc07 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 29 May 2023 15:59:55 -0400 Subject: [PATCH] feat: add date widget --- eww/actions/actions.scss | 8 +++----- eww/date/date.scss | 5 +++-- eww/date/date.yuck | 6 +++--- waybar/config | 5 +++-- waybar/scripts/date-toggle.sh | 8 ++++++++ waybar/scripts/quick-toggle.sh | 1 + 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100755 waybar/scripts/date-toggle.sh diff --git a/eww/actions/actions.scss b/eww/actions/actions.scss index b3a9047a..d6d960e5 100644 --- a/eww/actions/actions.scss +++ b/eww/actions/actions.scss @@ -1,8 +1,7 @@ .actions { background-color: $bg; color: $fg; - //font-family: Product Sans; - font-family: Ubuntu Mono; + font-family: Product Sans; border-radius: 30px; border: 5px solid $contrastbg; padding: 10px 18px; @@ -10,7 +9,7 @@ .controlsbox { background-color: $contrastbg; - border-radius: 7px; + border-radius: 15px; padding: 7px 12px; .vol-slider { @@ -81,8 +80,7 @@ font-size: 14px; } .username { - //font-family: Product Sans; - font-family: Ubuntu Mono; + font-family: Product Sans; } .useractions { .logout { diff --git a/eww/date/date.scss b/eww/date/date.scss index 991cc169..def1a52e 100644 --- a/eww/date/date.scss +++ b/eww/date/date.scss @@ -1,7 +1,8 @@ .date { background-color: $bg; color: $fg; - border-radius: 4px; + border-radius: 30px; + border: 5px solid $contrastbg; } .timebox { @@ -68,4 +69,4 @@ calendar.highlight { calendar:indeterminate { color: $lightblack; -} \ No newline at end of file +} diff --git a/eww/date/date.yuck b/eww/date/date.yuck index 1617ea04..8facf57f 100644 --- a/eww/date/date.yuck +++ b/eww/date/date.yuck @@ -48,10 +48,10 @@ (defwindow date :monitor 0 - :geometry (geometry :x "6px" - :y "-44px" + :geometry (geometry :x "70px" + :y "4px" :width "0px" ; automatically generated :height "0px" ; automatically generated - :anchor "left bottom") + :anchor "top right") :wm-ignore true (date)) diff --git a/waybar/config b/waybar/config index ddaacc3a..963a7cfd 100644 --- a/waybar/config +++ b/waybar/config @@ -23,8 +23,9 @@ "spacing": 5 }, "clock": { - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" + "on-click": "$HOME/.config/waybar/scripts/date-toggle.sh", + //"tooltip-format": "{:%Y %B}\n{calendar}", + //"format-alt": "{:%Y-%m-%d}" }, "cpu": { "format": "{usage}% ", diff --git a/waybar/scripts/date-toggle.sh b/waybar/scripts/date-toggle.sh new file mode 100755 index 00000000..34a3f39b --- /dev/null +++ b/waybar/scripts/date-toggle.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ $(eww state | grep calendar_month) ]]; then + eww close date && eww close closer +else + eww close-all + eww open date && eww open closer +fi diff --git a/waybar/scripts/quick-toggle.sh b/waybar/scripts/quick-toggle.sh index 84577e81..82dd7d16 100755 --- a/waybar/scripts/quick-toggle.sh +++ b/waybar/scripts/quick-toggle.sh @@ -3,5 +3,6 @@ if [[ $(eww state | grep br_icon) ]]; then eww close actions && eww close closer else + eww close-all eww open actions && eww open closer fi