修改配置方式，删除多余的wlogout配置

modules/home/hyprland/conf/waybar/config.jsonc

@@ -47,7 +47,7 @@
   "custom/power": {
     "format": "{}",
     "exec": "echo ; echo  logout",
-    "on-click": "~/.config/hypr/scripts/logoutlaunch.sh 2",
+    "on-click": "wlogout",
     "interval": 86400, // once every day
     "tooltip": true
   },
@@ -98,15 +98,34 @@
 
   "clock": {
     "format": "{:%Y/%m/%d %H:%M}",
-    "format-alt": "{:%I:%M%p 周%u}",
-    "tooltip-format": "<tt><big>{calendar}</big></tt>",
-    "locale": "zh_CN.UTF-8"
+    "format-alt": "{:L%A, %B %d %Y (%R)} ",
+    "timezones": ["Asia/Shanghai"],
+    "calendar": {
+      "mode": "year",
+      "mode-mon-col": 3,
+      "weeks-pos": "right",
+      "on-scroll": 1,
+      "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>"
+      }
+    },
+    "actions": {
+      "on-click-right": "mode",
+      "on-scroll-up": "shift_up",
+      "on-scroll-down": "shift_down"
+    },
+    "tooltip-format": "<span size='9pt' font='WenQuanYi Zen Hei Mono'><tt>{calendar}</tt></span>",
+    "locale": "en_US.UTF-8"
   },
 
   "wlr/taskbar": {
     "format": "{icon}",
     "icon-size": 14,
-    "icon-theme": "papirus-icon-theme",
+    "icon-theme": "Papirus-Dark",
     "spacing": 0,
     "tooltip-format": "{title}",
     "on-click": "activate",

modules/home/hyprland/conf/waybar/style.css

@@ -120,7 +120,7 @@ tooltip {
   color: @main-color;
   background: @main-bg;
   opacity: 1;
-  margin: 4px 0px 4px 0px;
+  margin: 2px 0px 2px 0px;
   padding-left: 4px;
   padding-right: 4px;
 }