From c94a89ca23e38d4c3de2af1c23c400bc108075e4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Wed, 12 Jul 2023 11:45:48 +0100
Subject: [PATCH] Waybar clock modules updates

---
 home/desktop/waybar/modules/clock.compact.nix | 22 +++++--------------
 home/desktop/waybar/modules/clock.nix         |  8 +++----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/home/desktop/waybar/modules/clock.compact.nix b/home/desktop/waybar/modules/clock.compact.nix
index 934724a8..06915502 100644
--- a/home/desktop/waybar/modules/clock.compact.nix
+++ b/home/desktop/waybar/modules/clock.compact.nix
@@ -1,19 +1,9 @@
-{
+let
+  clock = import ./clock.nix;
+in {
   format = "{:%R 󰅐 }";
   format-alt = "{:%A %Y-%m-%d 󰃭 }";
-  tooltip-format = "<tt>{calendar}</tt>";
-  calendar = {
-    mode = "year";
-    mode-mon-col = 3;
-    weeks-pos = "right";
-    on-scroll = 1;
-    on-click-right = "mode";
-    format = {
-      months = "<span color='#ffead3'><b>{}</b></span>";
-      days = "<span color='#ecc6d9'><b>{}</b></span>";
-      weeks = "<span color='#99ffdd'><b>W{}</b></span>";
-      weekdays = "<span color='#ffcc66'><b>{}</b></span>";
-      today = "<span color='#ff6699'><b><u>{}</u></b></span>";
-    };
-  };
+  tooltip-format = clock.tooltip-format;
+  calendar = clock.calendar;
+  actions = clock.actions;
 }
diff --git a/home/desktop/waybar/modules/clock.nix b/home/desktop/waybar/modules/clock.nix
index daae1ce5..6e9bf147 100644
--- a/home/desktop/waybar/modules/clock.nix
+++ b/home/desktop/waybar/modules/clock.nix
@@ -1,10 +1,10 @@
 {
   format = "{:%A %Y-%m-%d 󰃭 | %R 󰅐 }";
-  tooltip-format = "<tt>{calendar}</tt>";
+  tooltip-format = "<tt><small>{calendar}</small></tt>";
   calendar = {
-    mode = "year";
+    mode = "month";
     mode-mon-col = 3;
-    weeks-pos = "right";
+    weeks-pos = "left";
     on-scroll = 1;
     on-click-right = "mode";
     format = {
@@ -17,8 +17,6 @@
   };
   actions = {
     on-click-right = "mode";
-    on-click-forward = "tz_up";
-    on-click-backward = "tz_down";
     on-scroll-up = "shift_up";
     on-scroll-down = "shift_down";
   };