diff --git a/modules/hm/waybar.nix b/modules/hm/waybar.nix
index a5cf2a6..207f041 100644
--- a/modules/hm/waybar.nix
+++ b/modules/hm/waybar.nix
@@ -41,7 +41,7 @@ in
           "keyboard-state"
           "backlight"
           "battery"
-          "battery#bat2"
+          # "battery#bat2"
           "clock"
           "custom/notification"
           "tray"
@@ -59,8 +59,8 @@ in
           return-type = "json";
           # exec-if = "which swaync-client";
           exec = "${swaync-client} -swb";
-          on-click = "sleep 0.1 && ${swaync-client} -t -sw";
-          on-click-right = "sleep 0.1 && ${swaync-client} -d -sw";
+          on-click = "${swaync-client} -t -sw";
+          on-click-right = "${swaync-client} -d -sw";
           escape = true;
         };
 
@@ -74,10 +74,14 @@ in
           "format" = "{icon}";
           "format-icons" = { "activated" = ""; "deactivated" = ""; };
         };
-        "tray" = { "spacing" = 10; };
-        "clock" = {
-          "tooltip-format" = "<big>{=%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
-          "format-alt" = "{=%Y-%m-%d}";
+        tray.spacing = 10;
+        clock = {
+          on-click = "mode";
+          tooltip = true;
+          # tooltip-format = "<big>{%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          # format = "{:%H:%M}";
+          # format = "{%H:%M}";
+          # format-alt = "{:%Y-%m-%d %H:%M}";
         };
         "cpu" = {
           "format" = "{usage}% ";
@@ -112,7 +116,7 @@ in
           # "format-full"= "";
           "format-icons" = [ "" "" "" "" "" ];
         };
-        "battery#bat2" = { "bat" = "BAT2"; };
+        # "battery#bat2" = { "bat" = "BAT2"; };
         "network" = {
           # "interface"= "wlp2*"; # (Optional) To force the use of this interface
           "format-wifi" = "{essid} ({signalStrength}%) ";