From 4334a6dfd05b1f3f4b39c82964cd8b0a7b20c2b3 Mon Sep 17 00:00:00 2001
From: Uyanide <pywang0608@foxmail.com>
Date: Thu, 26 Mar 2026 02:33:14 +0100
Subject: [PATCH] qs: use dbus name to fetch lyrics instead of pretty name

---
 config/nwg-look/.config/gtk-3.0/settings.ini  | 25 +++++++++++++------
 config/nwg-look/.config/gtk-4.0/settings.ini  | 15 ++++++++---
 .../quickshell/Services/LyricsService.qml     |  6 ++---
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini
index 47b5edf..4831780 100644
--- a/config/nwg-look/.config/gtk-3.0/settings.ini
+++ b/config/nwg-look/.config/gtk-3.0/settings.ini
@@ -1,17 +1,26 @@
 [Settings]
-gtk-theme-name=catppuccin-mocha-blue-standard+default
-gtk-icon-theme-name=Papirus
-gtk-font-name=Noto Sans  10
+gtk-application-prefer-dark-theme=true
+gtk-button-images=true
+gtk-cursor-blink=true
+gtk-cursor-blink-time=1000
 gtk-cursor-theme-name=Bibata-Modern-Ice
 gtk-cursor-theme-size=24
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
+gtk-decoration-layout=icon:minimize,maximize,close
+gtk-enable-animations=true
 gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=0
+gtk-font-name=Sarasa UI SC,  10
+gtk-icon-theme-name=Papirus
+gtk-menu-images=true
+gtk-modules=colorreload-gtk-module:appmenu-gtk-module
+gtk-primary-button-warps-slider=true
+gtk-shell-shows-menubar=1
+gtk-sound-theme-name=ocean
+gtk-theme-name=catppuccin-mocha-blue-standard+default
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-toolbar-style=3
 gtk-xft-antialias=1
+gtk-xft-dpi=122880
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintslight
 gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=1
diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini
index ae04bc1..4139029 100644
--- a/config/nwg-look/.config/gtk-4.0/settings.ini
+++ b/config/nwg-look/.config/gtk-4.0/settings.ini
@@ -1,7 +1,14 @@
 [Settings]
-gtk-theme-name=catppuccin-mocha-blue-standard+default
-gtk-icon-theme-name=Papirus
-gtk-font-name=Noto Sans  10
+gtk-application-prefer-dark-theme=true
+gtk-cursor-blink=true
+gtk-cursor-blink-time=1000
 gtk-cursor-theme-name=Bibata-Modern-Ice
 gtk-cursor-theme-size=24
-gtk-application-prefer-dark-theme=1
+gtk-decoration-layout=icon:minimize,maximize,close
+gtk-enable-animations=true
+gtk-font-name=Sarasa UI SC,  10
+gtk-icon-theme-name=Papirus
+gtk-primary-button-warps-slider=true
+gtk-sound-theme-name=ocean
+gtk-theme-name=catppuccin-mocha-blue-standard+default
+gtk-xft-dpi=122880
diff --git a/config/quickshell/.config/quickshell/Services/LyricsService.qml b/config/quickshell/.config/quickshell/Services/LyricsService.qml
index 58d2612..0e63e65 100644
--- a/config/quickshell/.config/quickshell/Services/LyricsService.qml
+++ b/config/quickshell/.config/quickshell/Services/LyricsService.qml
@@ -59,11 +59,11 @@ Singleton {
             return ;
 
         root.isFetchingLyrics = true;
-        if (!MediaService.currentPlayer?.identity) {
+        if (!MediaService.currentPlayer?.dbusName) {
             root.isFetchingLyrics = false;
             return ;
         } else {
-            lyricsProcess.request(MediaService.currentPlayer.identity.toLowerCase());
+            lyricsProcess.request(MediaService.currentPlayer.dbusName);
         }
     }
 
@@ -229,7 +229,7 @@ Singleton {
             }
             const player = this.queuedPlayer.toLowerCase();
             this.queuedPlayer = "";
-            this.command = ["lrcfetch", "fetch", "--player", player];
+            this.command = ["lrcfetch", "--player", player, "fetch"];
             this.running = true;
         }