From a7162e530247bd68f5f85eb9a129bbadb90a29ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Wed, 17 Sep 2025 23:48:44 +0200
Subject: [PATCH] refactor(waybar): used modules for the two bars

---
 .config/waybar/bars/bar-1.jsonc               |  4 +--
 .config/waybar/bars/bar-2.jsonc               |  4 +--
 .config/waybar/modules/clock-2.jsonc          | 28 -------------------
 .../modules/{clock-1.jsonc => clock.jsonc}    | 26 +++++++++++++++++
 4 files changed, 30 insertions(+), 32 deletions(-)
 delete mode 100644 .config/waybar/modules/clock-2.jsonc
 rename .config/waybar/modules/{clock-1.jsonc => clock.jsonc} (51%)

diff --git a/.config/waybar/bars/bar-1.jsonc b/.config/waybar/bars/bar-1.jsonc
index c1976077..ac65547d 100644
--- a/.config/waybar/bars/bar-1.jsonc
+++ b/.config/waybar/bars/bar-1.jsonc
@@ -3,16 +3,16 @@
     "~/.config/waybar/modules/custom-music.jsonc",
     "~/.config/waybar/modules/custom-notifications.jsonc",
     "~/.config/waybar/modules/hyprland-workspaces.jsonc",
-    "~/.config/waybar/modules/clock-1.jsonc",
     "~/.config/waybar/modules/hyprland-language.jsonc",
     "~/.config/waybar/modules/tray.jsonc",
+    "~/.config/waybar/modules/network.jsonc",
   ],
   "modules-left": ["hyprland/workspaces"],
   "modules-center": ["custom/music"],
   "modules-right": [
     "tray",
     "hyprland/language",
-    "clock#cl1",
+    "network",
     "custom/notifications",
   ],
 }
diff --git a/.config/waybar/bars/bar-2.jsonc b/.config/waybar/bars/bar-2.jsonc
index fae5e31e..9ae17a7f 100644
--- a/.config/waybar/bars/bar-2.jsonc
+++ b/.config/waybar/bars/bar-2.jsonc
@@ -6,15 +6,15 @@
     "~/.config/waybar/modules/temperature-gpu.jsonc",
     "~/.config/waybar/modules/temperature-cpu.jsonc",
     "~/.config/waybar/modules/hyprland-workspaces.jsonc",
-    "~/.config/waybar/modules/network.jsonc",
+    "~/.config/waybar/modules/clock.jsonc",
   ],
   "modules-left": ["hyprland/workspaces"],
   "modules-right": [
-    "network",
     "memory",
     "cpu",
     "temperature#cpu",
     "custom/gpu-usage",
     "temperature#gpu",
+    "clock#cl1",
   ],
 }
diff --git a/.config/waybar/modules/clock-2.jsonc b/.config/waybar/modules/clock-2.jsonc
deleted file mode 100644
index 27a6d705..00000000
--- a/.config/waybar/modules/clock-2.jsonc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "clock#cl2": {
-    "tooltip-format": "<tt><small>{calendar}</small></tt>",
-    "calendar": {
-      "mode": "year",
-      "mode-mon-col": 3,
-      "weeks-pos": "right",
-      "on-scroll": 1,
-      "on-click-right": "mode",
-      "format": {
-        "months": "<span color='#eed49f'><b>{}</b></span>",
-        "days": "<span color='#cad3f5'><b>{}</b></span>",
-        "weeks": "<span color='#8aadf4'><b>W{}</b></span>",
-        "weekdays": "<span color='#8bd5ca'><b>{}</b></span>",
-        "today": "<span color='#ed8796'><b><u>{}</u></b></span>",
-      },
-    },
-    "format": "{:%H:%M   - %A, %B %d, %Y  }",
-    "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",
-    },
-    "on-click-middle": "thunderbird -calendar && hyprctl dispatch workspace 23",
-  },
-}
diff --git a/.config/waybar/modules/clock-1.jsonc b/.config/waybar/modules/clock.jsonc
similarity index 51%
rename from .config/waybar/modules/clock-1.jsonc
rename to .config/waybar/modules/clock.jsonc
index 5cfcdf17..e803522e 100644
--- a/.config/waybar/modules/clock-1.jsonc
+++ b/.config/waybar/modules/clock.jsonc
@@ -27,4 +27,30 @@
     },
     "on-click-middle": "thunderbird -calendar && hyprctl dispatch workspace 23",
   },
+  "clock#cl2": {
+    "tooltip-format": "<tt><small>{calendar}</small></tt>",
+    "calendar": {
+      "mode": "year",
+      "mode-mon-col": 3,
+      "weeks-pos": "right",
+      "on-scroll": 1,
+      "on-click-right": "mode",
+      "format": {
+        "months": "<span color='#eed49f'><b>{}</b></span>",
+        "days": "<span color='#cad3f5'><b>{}</b></span>",
+        "weeks": "<span color='#8aadf4'><b>W{}</b></span>",
+        "weekdays": "<span color='#8bd5ca'><b>{}</b></span>",
+        "today": "<span color='#ed8796'><b><u>{}</u></b></span>",
+      },
+    },
+    "format": "{:%H:%M   - %A, %B %d, %Y  }",
+    "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",
+    },
+    "on-click-middle": "thunderbird -calendar && hyprctl dispatch workspace 23",
+  },
 }