diff --git a/config/nwg-look/.config/gtk-3.0/settings.ini b/config/nwg-look/.config/gtk-3.0/settings.ini index 4831780..72a1ec7 100644 --- a/config/nwg-look/.config/gtk-3.0/settings.ini +++ b/config/nwg-look/.config/gtk-3.0/settings.ini @@ -1,26 +1,26 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-button-images=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true +gtk-toolbar-style=3 +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=0 +gtk-menu-images=0 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-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=1 +gtk-cursor-blink=true +gtk-cursor-blink-time=1000 +gtk-decoration-layout=icon:minimize,maximize,close +gtk-enable-animations=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 diff --git a/config/nwg-look/.config/gtk-4.0/settings.ini b/config/nwg-look/.config/gtk-4.0/settings.ini index 4139029..af17726 100644 --- a/config/nwg-look/.config/gtk-4.0/settings.ini +++ b/config/nwg-look/.config/gtk-4.0/settings.ini @@ -1,14 +1,7 @@ [Settings] -gtk-application-prefer-dark-theme=true -gtk-cursor-blink=true -gtk-cursor-blink-time=1000 +gtk-theme-name=catppuccin-mocha-blue-standard+default +gtk-icon-theme-name=Papirus +gtk-font-name=Sarasa UI SC 10 gtk-cursor-theme-name=Bibata-Modern-Ice gtk-cursor-theme-size=24 -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 +gtk-application-prefer-dark-theme=1 diff --git a/config/quickshell/.config/quickshell/Services/LyricsService.qml b/config/quickshell/.config/quickshell/Services/LyricsService.qml index 0e63e65..75ebdd9 100644 --- a/config/quickshell/.config/quickshell/Services/LyricsService.qml +++ b/config/quickshell/.config/quickshell/Services/LyricsService.qml @@ -19,6 +19,13 @@ Singleton { // Player state // this property will be updated regardless of shouldRun for simplicity property int internalPosition: 0 + readonly property var playerBlacklist: [ + "mpv", + "firefox", + "zen", + "chromium", + "chrome" + ] // Reference counting property var _registered: ({ }) @@ -63,6 +70,14 @@ Singleton { root.isFetchingLyrics = false; return ; } else { + // lyricsProcess.request(MediaService.currentPlayer.dbusName); + for (const player of root.playerBlacklist) { + if (MediaService.currentPlayer.dbusName.toLowerCase().includes(player)) { + Logger.d("Lyrics", "Player is blacklisted, skipping lyrics fetch:", MediaService.currentPlayer.dbusName); + root.isFetchingLyrics = false; + return ; + } + } lyricsProcess.request(MediaService.currentPlayer.dbusName); } } @@ -96,6 +111,14 @@ Singleton { newLyrics.sort((a, b) => { return a.time - b.time; }); + + // Special case when first lyric dosen't start at 0:00 + if (newLyrics.length > 0 && newLyrics[0].time > 0) { + newLyrics.unshift({ + "time": 0, + "line": "" + }); + } root.lyrics.clear(); root.lyrics.append(newLyrics); root.isFetchingLyrics = false; @@ -129,7 +152,6 @@ Singleton { } if (root.currentIndex !== bestMatch) root.currentIndex = bestMatch; - } function increaseOffset() {