diff --git a/README.md b/README.md index 8b365c0..32815b8 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ This feature is only enabled in Niri. Swww also manages wallpapers of the Hyprla The most suitable primary color (or so-called flavor) will be chosen from the [Catppuccin Mocha](https://catppuccin.com/palette/) palette and applied to various apps automatically after changing wallpaper. And also: -- [wallpaper-chooser](https://github.com/Uyanide/Wallpaper_Chooser) to select wallpaper, which implements an Image Carousel with Qt Widgets. +- [wallpaper-carousel](https://github.com/Uyanide/Wallpaper_Carousel) to select wallpaper, which implements an Image Carousel with Qt Widgets. - [backgrounds collection](https://github.com/Uyanide/backgrounds) for personal use. ## Rofi diff --git a/config/niri/config.kdl b/config/niri/config.kdl index 51bb333..014003c 100644 --- a/config/niri/config.kdl +++ b/config/niri/config.kdl @@ -165,7 +165,7 @@ environment { // Themes QT_QPA_PLATFORM "wayland" QT_QPA_PLATFORMTHEME "kde" - QT_STYLE_OVERRIDE "Kvantum" + QT_STYLE_OVERRIDE "Breeze" // Nvidia LIBVA_DRIVER_NAME "nvidia" @@ -233,7 +233,7 @@ window-rule { match app-id="org.kde.kalk" match app-id="org.gnome.NautilusPreviewer" match app-id="coin" - match app-id="wallpaper-chooser" + match app-id="wallpaper-carousel" match app-id="be.alexandervanhee.gradia" match title="^(图片查看器)(.*)$" // QQ open-floating true @@ -292,14 +292,14 @@ binds { // Apps Mod+C { spawn-sh "code --password-store=gnome-libsecret"; } Mod+E { spawn-sh "nautilus --new-window"; } - Mod+W { spawn "zen"; } + Mod+W { spawn-sh "zen || zen-browser"; } Mod+X { spawn "gnome-text-editor" "--new-window"; } Mod+B { spawn-sh "pkill -x -n btop || ghostty -e btop"; } Mod+T { spawn "kitty"; } Mod+Return { spawn "kitty"; } Mod+Shift+T { spawn "ghostty"; } Mod+Shift+Return { spawn "ghostty"; } - Mod+Shift+W { spawn "wallpaper-chooser"; } + Mod+Shift+W { spawn "wallpaper-carousel"; } Mod+P { spawn-sh "pkill -x -n pwvucontrol || pwvucontrol"; } // Quickshell diff --git a/config/quickshell/Services/IpService.qml b/config/quickshell/Services/IpService.qml index d62c92e..f1a4595 100644 --- a/config/quickshell/Services/IpService.qml +++ b/config/quickshell/Services/IpService.qml @@ -157,6 +157,9 @@ Singleton { if (!geoURLToken) Logger.warn("IpService", "No token found for geoIP service, assuming none is required"); + if (geoURLToken[geoURLToken.length - 1] === "\n") + geoURLToken = geoURLToken.slice(0, -1); + fetchIP(); fetchTimer.start(); } diff --git a/config/quickshell/Services/NukeKded6.qml b/config/quickshell/Services/NukeKded6.qml index 00bc34d..7669e3e 100644 --- a/config/quickshell/Services/NukeKded6.qml +++ b/config/quickshell/Services/NukeKded6.qml @@ -11,7 +11,7 @@ Singleton { id: process running: true - command: ["kquitapp6", "kded6"] + command: ["sh", "-c", "which kquitapp6 && kquitapp6 kded6"] onExited: (code, status) => { if (code !== 0) Logger.warn("NukeKded6", `Failed to kill kded6: ${code}`); diff --git a/memo/logi-mouse-suspend.txt b/memo/logi-mouse-suspend.txt index da28fe1..c7ca35d 100644 --- a/memo/logi-mouse-suspend.txt +++ b/memo/logi-mouse-suspend.txt @@ -5,7 +5,6 @@ 环境: hyprland (kde 下无此问题) - hybrid (独显直连没有测试) 结论: 罗技 Bolt 接收器导致的 diff --git a/scripts/config-switch b/scripts/config-switch index e9a10eb..2427a22 100755 --- a/scripts/config-switch +++ b/scripts/config-switch @@ -18,7 +18,7 @@ for item in "kitty" "ghostty" "wlogout"; do fi done - if [ "$desktop" = "niri" ]; then + if [ "$desktop" = "niri" ] || [ "$desktop" = "GNOME" ]; then ln -sv "$(realpath --relative-to="$HOME/.config" "$path/../config/$item-niri")" "$HOME/.config/$item" else ln -sv "$(realpath --relative-to="$HOME/.config" "$path/../config/$item")" "$HOME/.config/$item"