From a2cdf57a2b26619f26ebde6b6443d8df4d51e9f4 Mon Sep 17 00:00:00 2001
From: Uyanide <pywang0608@foxmail.com>
Date: Sun, 7 Sep 2025 04:17:57 +0200
Subject: [PATCH] just forget gtk theming for now

---
 .scripts/change-colortheme.py |  4 +++-
 eww/Lyrics/eww.scss           |  4 ++--
 eww/Lyrics/eww.yuck           |  2 +-
 eww/Main/eww.scss             |  2 +-
 waybar/style.css              | 10 +++++-----
 waybar/style.css.template     | 10 +++++-----
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.scripts/change-colortheme.py b/.scripts/change-colortheme.py
index cc6c8f2..3e24612 100755
--- a/.scripts/change-colortheme.py
+++ b/.scripts/change-colortheme.py
@@ -6,6 +6,7 @@
 
 - nwg-look:     edit $HOME/.local/share/nwg-look/gsettings
                 nwg-look -a
+                nwg-look & manually confirm
 
 - eww:          edit $HOME/.config/eww/eww.scss
                 eww reload
@@ -132,6 +133,7 @@ def _change_nwglook(_, flavor):
         file.write('\n'.join(lines))
 
     os.system('nwg-look -a')
+    os.system('nwg-look')
 
 
 def _change_eww(palette: dict[str, str], flavor: str):
@@ -208,7 +210,7 @@ def _change_fuzzel(palette: dict[str, str], flavor: str):
 
 apply_theme_funcs: dict[str, Callable[[dict[str, str], str], None]] = {
     'kvantum': _change_kvantum,
-    'nwg-look': _change_nwglook,
+    # 'nwg-look': _change_nwglook,
     'eww': _change_eww,
     'hypr': _change_hypr,
     'rofi': _change_rofi,
diff --git a/eww/Lyrics/eww.scss b/eww/Lyrics/eww.scss
index be3d8cc..092fe5d 100644
--- a/eww/Lyrics/eww.scss
+++ b/eww/Lyrics/eww.scss
@@ -5,7 +5,7 @@
 
 .lyrics-window {
   background-color: $bg;
-  border-radius: 16px;
+  border-radius: 14px;
   border: 2px solid $border;
 }
 
@@ -40,7 +40,7 @@
   color: $fg;
   font-size: 15px;
   font-family: 'Maple Mono NF CN', 'Maple Mono CN', monospace;
-  min-height: 31px;
+  min-height: 28px;
 }
 
 .control-box {
diff --git a/eww/Lyrics/eww.yuck b/eww/Lyrics/eww.yuck
index 0719b3d..f645d12 100644
--- a/eww/Lyrics/eww.yuck
+++ b/eww/Lyrics/eww.yuck
@@ -90,6 +90,6 @@
     :windowtype "normal"
     :wm-ignore true
     :monitor 0
-    :geometry (geometry :x 1100 :y -51)
+    :geometry (geometry :x 1100 :y -48)
     (lyrics-single)
 )
\ No newline at end of file
diff --git a/eww/Main/eww.scss b/eww/Main/eww.scss
index 431032f..8720efe 100644
--- a/eww/Main/eww.scss
+++ b/eww/Main/eww.scss
@@ -6,7 +6,7 @@
 .main-window {
   background-color: $bg;
   font-family: 'Sour Gummy', 'MesloLGM Nerd Font Mono', 'Noto Sans';
-  border-radius: 20px;
+  border-radius: 14px;
   border: 2px solid $border;
 }
 
diff --git a/waybar/style.css b/waybar/style.css
index b727d6e..7f32744 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -47,7 +47,7 @@ tooltip {
 #custom-power {
   background-color: alpha(@base, 0.6);
   border-radius: 14px;
-  padding: 3px 10px;
+  padding: 1px 10px;
 }
 
 #custom-rofi,
@@ -82,8 +82,8 @@ tooltip {
 }
 
 #workspaceactions {
-  padding-left: 3px;
-  padding-right: 3px;
+  padding-left: 1px;
+  padding-right: 1px;
   border: 2px solid @flavor;
 }
 
@@ -178,7 +178,7 @@ window#waybar.empty #window {
 }
 
 #clock {
-  color: @flavor
+  color: @flavor;
 }
 
 @keyframes blink {
@@ -211,4 +211,4 @@ window#waybar.empty #window {
 #tray > .needs-attention {
   -gtk-icon-effect: highlight;
   background-color: #eb4d4b;
-}
\ No newline at end of file
+}
diff --git a/waybar/style.css.template b/waybar/style.css.template
index 381ffa0..22a2120 100644
--- a/waybar/style.css.template
+++ b/waybar/style.css.template
@@ -47,7 +47,7 @@ tooltip {
 #custom-power {
   background-color: alpha(@base, 0.6);
   border-radius: 14px;
-  padding: 3px 10px;
+  padding: 1px 10px;
 }
 
 #custom-rofi,
@@ -82,8 +82,8 @@ tooltip {
 }
 
 #workspaceactions {
-  padding-left: 3px;
-  padding-right: 3px;
+  padding-left: 1px;
+  padding-right: 1px;
   border: 2px solid @flavor;
 }
 
@@ -178,7 +178,7 @@ window#waybar.empty #window {
 }
 
 #clock {
-  color: @flavor
+  color: @flavor;
 }
 
 @keyframes blink {
@@ -211,4 +211,4 @@ window#waybar.empty #window {
 #tray > .needs-attention {
   -gtk-icon-effect: highlight;
   background-color: #eb4d4b;
-}
\ No newline at end of file
+}