From 924caa2851fa6d695bdfddb9c96c44d8b13958fa Mon Sep 17 00:00:00 2001
From: Uyanide <pywang0608@foxmail.com>
Date: Sun, 22 Jun 2025 10:17:10 +0200
Subject: [PATCH] eww: better layout

---
 README.md           | 2 +-
 eww/Main/eww.scss   | 5 +++--
 eww/Main/eww.yuck   | 4 ++--
 ghostty/config      | 2 +-
 kitty/kitty.conf    | 2 +-
 waybar/config.jsonc | 2 +-
 waybar/style.css    | 4 ++--
 wlogout/style.css   | 2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4c7fa9d..f5e775c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Gathered from internet, based on <s>I don't know who</s> (such config files had
 Not unified, combination of:
 
 -   MesloLGM Nerd Font (& Mono)
+-   Maple Mono Normal CN
 -   Font Awesome 6 Free
--   Maple Mono CN
 -   Noto Sans
 -   ...
diff --git a/eww/Main/eww.scss b/eww/Main/eww.scss
index c10ae5a..e99c60c 100644
--- a/eww/Main/eww.scss
+++ b/eww/Main/eww.scss
@@ -22,7 +22,7 @@
 .time {
     font-weight: bold;
     font-size: 80px;
-    margin-top: 20px;
+    margin-top: 24px;
 }
 
 .date {
@@ -53,6 +53,7 @@
 .weather-icon {
     font-family: 'MesloLGM Nerd Font';
     font-size: 60px;
+    margin-top: 5px;
 }
 
 .weather-updatetime {
@@ -235,7 +236,7 @@
 }
 
 .profile-stuff-box {
-    margin: 20px 20px 0px 20px;
+    margin: 20px 20px 20px 20px;
     background-color: $gray-alt;
     border-radius: 15px;
     padding: 15px 20px 15px 20px;
diff --git a/eww/Main/eww.yuck b/eww/Main/eww.yuck
index 9fc8370..165430e 100644
--- a/eww/Main/eww.yuck
+++ b/eww/Main/eww.yuck
@@ -46,7 +46,7 @@
       (label :class "weather-desc" :halign "start" :text weather-desc)
       (label :class "weather-temp" :halign "start" :text weather-temp)
       (label :class "weather-updatetime" :halign "start" :text weather-updatetime)
-        (label :class "weather-icon" :halign "end" :valign "end" :text weather-icon :style "color: ${weather-color}")))
+      (label :class "weather-icon" :halign "end" :valign "start" :text weather-icon :style "color: ${weather-color}")))
     (box :class "second-row" :orientation "h" :space-evenly "false"
       (box :class "stats-box" :space-evenly "false" :orientation "v" :spacing 8
         (label :class "stats-header" :halign "start" :text "Stats")
@@ -96,5 +96,5 @@
   :windowtype "normal"
   :wm-ignore true
   :monitor 0
-  :geometry (geometry :x 2 :y 0 :width 600 :height 895)
+  :geometry (geometry :x 2 :y 0)
   (main))
diff --git a/ghostty/config b/ghostty/config
index 2feaa7b..45da5ee 100644
--- a/ghostty/config
+++ b/ghostty/config
@@ -12,7 +12,7 @@ command = exec fish
 
 confirm-close-surface = false
 
-font-family = MeloLGM Nerd Font
+font-family = Maple Mono Normal NF CN
 font-size = 12
 
 cursor-style = bar
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 8520e7f..6ce132b 100755
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -23,7 +23,7 @@ window_padding_width    10
 background_opacity  0.75
 background_blur     16
 
-font_family Meslo LGM Nerd Font
+font_family Maple Mono Normal NF CN
 font_size 12
 
 tab_bat_style       powerline
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index c413c66..67afab4 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -84,7 +84,7 @@
         "tooltip": false,
         "format-icons": {
             "active": "",
-            "inactive": "󰒲"
+            "inactive": ""
         }
     },
 
diff --git a/waybar/style.css b/waybar/style.css
index e4fc1ec..6e996db 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,8 +1,8 @@
 @import 'mocha.css';
 
 * {
-    font-family: 'Font Awesome 6 Free', 'Maple Mono CN ExtraLight', 'Noto Sans', Arial, sans-serif;
-    font-size: 12px; /* Slightly smaller font size */
+    font-family: 'Font Awesome 6 Free', 'Maple Mono Normal NF CN ExtraLight', 'Noto Sans', Arial, sans-serif;
+    font-size: 12px;
     font-weight: 900;
     margin: 0;
     padding: 0;
diff --git a/wlogout/style.css b/wlogout/style.css
index ace7b7c..909b3d7 100644
--- a/wlogout/style.css
+++ b/wlogout/style.css
@@ -1,7 +1,7 @@
 * {
     background-image: none;
     font-size: 16px;
-    font-family: 'Font Awesome 6 Free', 'MesloLGM Nerd Font', 'Maple Mono CN ExtraLight', 'Noto Sans', Arial, sans-serif;
+    font-family: 'Font Awesome 6 Free', 'Noto Sans', Arial, sans-serif;
 }
 
 window {