Merge branch 'dev' into remove-ad-and-allow-window-swallowing

Author: kRHYME7

CHANGELOG.md

@@ -4,13 +4,13 @@ All notable changes to `HyDE` will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to _Modified_ [CalVer](https://calver.org/). See [Versioning](https://github.com/HyDE-Project/HyDE/blob/master/RELEASE_POLICY.md#versioning-yymq) For more info
 
-## v25.8.1 (Unreleased)
+## v25.8.2
 
 Big CHANGE in HyDE! We are now using `uwsm` for session management and app2unit for application management.
 
-**PLEASE run install.sh again to upgrade and install missing dependencies!!!**
+**PLEASE run install.sh again to upgrade and install missing dependencies and REBOOT!**
 
-Upon opening in you SDDM, Please choose `Hyprland (UWSM Managed)` as your session. Or else you will handle the session yourself!
+In SDDM, please choose `Hyprland (UWSM Managed)` as your session. Or else you will handle the session yourself!
 
 ### Changed
 
@@ -27,12 +27,14 @@ Upon opening in you SDDM, Please choose `Hyprland (UWSM Managed)` as your sessio
 - Package: UWSM as dependency for HyDE.
 - Core: app2unit.sh and xdg-terminal-exec as as static dependencies. These tools are not widely available and are not part of the core dependencies.
 - The ~/.config/xdg-terminals.list file is now used to determine which terminal to use.
+- Wallbash: Added spotify flatpak support
 
 ### Fixed
 
 - Waybar: Some fixes for modules
 - Waybar: gpuinfo throws errors eg broken pipe
-- LibL Clean up variables that are using HYDE*, we will try to use the XDG\_* variables instead.
+- Lib: Clean up variables that are using HYDE*, we will try to use the XDG\_* variables instead.
+- Core: Fixed some issues with the theming script stack.
 
 ## v25.7.3
 

Configs/.config/hyde/wallbash/scripts/spotify.sh

@@ -28,8 +28,8 @@ configure_spicetify() {
     spotify_conf=$(spicetify -c)
 
     sed -i -e "/^prefs_path/ s+=.*$+= $HOME/.config/spotify/prefs+g" \
-           -e "/^spotify_path/ s+=.*$+= $spotify_path+g" \
-           -e "/^spotify_launch_flags/ s+=.*$+= $spotify_flags+g" "$spotify_conf"
+        -e "/^spotify_path/ s+=.*$+= $spotify_path+g" \
+        -e "/^spotify_launch_flags/ s+=.*$+= $spotify_flags+g" "$spotify_conf"
 
     spicetify_themes_dir="$HOME/.config/spicetify/Themes"
     if [ ! -d "${spicetify_themes_dir}/Sleek" ]; then
@@ -45,12 +45,12 @@ configure_spicetify() {
 }
 
 # Main script
-    cacheDir="${cacheDir:-$XDG_CACHE_HOME/hyde}"
-    shareDir=${XDG_DATA_HOME:-$HOME/.local/share}
+cacheDir="${cacheDir:-$XDG_CACHE_HOME/hyde}"
+shareDir=${XDG_DATA_HOME:-$HOME/.local/share}
 
-    if [ -n "${SPOTIFY_PATH}" ]; then
-        spotify_path="${SPOTIFY_PATH}"
-        cat <<EOF
+if [ -n "${SPOTIFY_PATH}" ]; then
+    spotify_path="${SPOTIFY_PATH}"
+    cat <<EOF
 [warning]   using custom spotify path
             ensure to have proper permissions for ${SPOTIFY_PATH}
             run:
@@ -59,19 +59,24 @@ configure_spicetify() {
 
             note: run with 'sudo' if only needed.
 EOF
-    elif [ -f "${shareDir}/spotify-launcher/install/usr/bin/spotify" ]; then
-        spotify_path="${shareDir}/spotify-launcher/install/usr/bin/spotify"
-    elif [ -d /opt/spotify ]; then
-        spotify_path='/opt/spotify'
-    elif [ -d /var/lib/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify ]; then
-        spotify_path='/var/lib/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify'
-    fi
-    if [ ! -w "${spotify_path}" ] || [ ! -w "${spotify_path}/Apps" ]; then
-        notify_and_set_permissions "${spotify_path}"
-    fi
 
-if (pkg_installed spotify && pkg_installed spicetify-cli) || [ -n "$spotify_path" ]; then
+elif [ -d "${XDG_DATA_HOME}/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify" ]; then
+    spotify_path="${XDG_DATA_HOME}/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify"
+elif [ -d /var/lib/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify ]; then
+    spotify_path='/var/lib/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify'
+elif [ -f "${shareDir}/spotify-launcher/install/usr/bin/spotify" ]; then
+    spotify_path="${shareDir}/spotify-launcher/install/usr/share/spotify"
+elif [ -d /opt/spotify ]; then
+    spotify_path='/opt/spotify'
+fi
 
+if [ ! -w "${spotify_path}" ] || [ ! -w "${spotify_path}/Apps" ]; then
+    notify_and_set_permissions "${spotify_path}"
+else
+    printf "[info]     using spotify path: %s\n" "${spotify_path}"
+fi
+
+if (pkg_installed spotify && pkg_installed spicetify-cli) || [ -n "$spotify_path" ]; then
 
     if [ "$(spicetify config | awk '{if ($1=="color_scheme") print $2}')" != "Wallbash" ] || [[ "${*}" == *"--reset"* ]]; then
         configure_spicetify "$spotify_path" "$cacheDir"