Merge branch 'main' into emacs

waybar/config

@@ -13,8 +13,7 @@
     "modules-right": [
         "tray",
         "idle_inhibitor", "keyboard-state",
-        "pulseaudio", "bluetooth", "network", "cpu", "memory", "temperature", "battery"
+        "pulseaudio", "bluetooth", "network", "cpu", "memory", "temperature", "battery", "clock"
-        //"clock"
     ],
     "wlr/workspaces": {
         "format": "{icon}", // {name}
@@ -93,11 +92,6 @@
         "icon-size": 21,
         "spacing": 10
     },
-    "clock": {
-        "format": "{: %H:%M  %d/%m}",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%a, %d %b %Y}"
-    },
     "cpu": {
         "align": 0,
         "interval": 2,
@@ -169,5 +163,10 @@
             "default": ["", "", ""]
         },
         "on-click": "pavucontrol"
+    },
+    "clock": {
+        "format": "{: %d/%m  %H:%M}",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%a, %d %b %Y}"
     }
 }