Merge branch 'rc' into dev

Author: kRHYME7

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.3 (Unreleased)
+## v25.8.3
 
 ### Fixed
 
@@ -33,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - Added pyprland boilerplate, no configs for now
 - Hyprland: Graciously handle some of the issues hyprland config issues for unknown SHELL
 - Pyprland: Use nc or socat to communicate with pyprland instead of pure python
+- Pyprland: Add boilerplate config for pyprland
 
 ## v25.8.1
 

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

@@ -21,16 +21,16 @@ configure_spicetify() {
     local cache_dir=$2
     local spotify_flags='--ozone-platform=wayland'
     local spotify_conf
-
+    
     spicetify &>/dev/null
     mkdir -p ~/.config/spotify
     touch ~/.config/spotify/prefs
     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
         curl -L -o "${cache_dir}/landing/Spotify_Sleek.tar.gz" "https://github.com/HyDE-Project/HyDE/raw/master/Source/arcs/Spotify_Sleek.tar.gz"
@@ -59,29 +59,31 @@ if [ -n "${SPOTIFY_PATH}" ]; then
 
             note: run with 'sudo' if only needed.
 EOF
-
-elif [ -d "${XDG_DATA_HOME}/flatpak/app/com.spotify.Client/x86_64/stable/active/files/extra/share/spotify" ]; 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
+    print_log -sec "Spotify" " User Flatpak"
+    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
+    print_log -sec "Spotify" " System Flatpak"
+    elif [ -f "${shareDir}/spotify-launcher/install/usr/bin/spotify" ]; then
     spotify_path="${shareDir}/spotify-launcher/install/usr/share/spotify"
-elif [ -d /opt/spotify ]; then
+    print_log -sec "Spotify" " Spotify-launcher"
+    elif [ -d /opt/spotify ]; then
     spotify_path='/opt/spotify'
+    print_log -sec "Spotify" " System Package Manager"
 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 (pkg_installed spotify && pkg_installed spicetify-cli) || [ -e "${spotify_path}" ]; then
+    print_log -sec "Spotify" -stat "path" " ${spotify_path}"
     if [ "$(spicetify config | awk '{if ($1=="color_scheme") print $2}')" != "Wallbash" ] || [[ "${*}" == *"--reset"* ]]; then
         configure_spicetify "$spotify_path" "$cacheDir"
     fi
-
+    
     if pgrep -x spotify >/dev/null; then
         pkill -x spicetify
         spicetify -q watch -s &

Configs/.config/hypr/keybindings.conf

@@ -78,7 +78,7 @@ bindd = $mainMod, J, $d toggle split, togglesplit
 $l=Launcher
 $d=[$l|Apps]
 bindd = $mainMod, T, $d terminal emulator , exec, $TERMINAL
-bindd = $mainMod Alt, T, $d dropdown terminal , exec, [float; move 20% 5%; size 60% 60%] $TERMINAL
+bindd = $mainMod Alt, T, $d dropdown terminal , exec, hyde-shell pypr toggle console
 bindd = $mainMod, E, $d file explorer , exec, $EXPLORER
 bindd = $mainMod, C, $d text editor , exec, $EDITOR
 bindd = $mainMod, B, $d web browser , exec, $BROWSER

Configs/.config/hypr/pyprland.toml

@@ -0,0 +1,28 @@
+# Since Pyprland is very configurable, this is just a basic example config
+# to get you started. For more information, see the Pyprland documentation:
+# https://hyprland-community.github.io/pyprland/
+
+
+# Since You are using Hyde, you can use `hyde-shell` to run pypr commands
+# See  'hyde-shell pypr --help' for more information on how to use it!
+
+[pyprland]
+    # pypr has a lot of plugins, but this is just a basic example config
+    # https://hyprland-community.github.io/pyprland/Plugins.html
+    plugins = [ "scratchpads" ]
+
+# using variables for demonstration purposes (not needed)
+[pyprland.variables]
+    # term_with_class = "hyde-shell app -T" # You cannot set the class for this
+    # term_with_class = "alacritty --class"
+    # term_with_class = "foot --app-id"
+    term_with_class = "kitty --class"
+
+
+[scratchpads.console]
+    # This is a drop-down terminal configuration
+    animation = "fromTop"
+    class     = "console-dropdown"
+    command   = "[term_with_class] console-dropdown"
+    max_size  = "90% 100%"
+    size      = "75% 60%"

Configs/.config/hypr/shaders/.gitignore

@@ -1 +1 @@
-./*
+*

Configs/.config/hypr/workflows/.gitignore

@@ -0,0 +1 @@
+./*

Configs/.local/lib/hyde/color.set.sh

@@ -102,27 +102,34 @@ preprocess_substitutions() {
 }
 
 fn_wallbash() {
-    local template="${1}"
-    local temp_target_file exec_command
+    local temp_target_file exec_command template wallbash_dirs_array
+    template="${1}"
+    shift
+    wallbash_dirs_array=("${@}")
     WALLBASH_SCRIPTS="${template%%/wallbash/*}/wallbash/scripts"
-    
+
     if [[ "${template}" == *.theme ]]; then
         # This is approach is to handle the theme files
         # We don't want themes to launch the exec_command or any arbitrary codes
         # To enable this we should have a *.dcol file as a companion to the theme file
-        IFS=':' read -r -a wallbashDirs <<<"$WALLBASH_DIRS"
+        # IFS=':' read -r -a wallbash_dirs_array <<<"$wallbash_dirs"
+        local template_name 
         template_name="${template##*/}"
         template_name="${template_name%.*}"
-        # echo "${wallbashDirs[@]}"
-        dcolTemplate=$(find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "${template_name}.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
+        dcolTemplate=$(find -H "${wallbash_dirs_array[@]}" -type f -path "*/theme*" -name "${template_name}.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
+        # dcolTemplate="$(find "${wallbash_dirs_array[@]}" -H -type f -path "*/theme*" -name "${template_name}.dcol" -print -quit)"
         if [[ -n "${dcolTemplate}" ]]; then
             eval target_file="$(head -1 "${dcolTemplate}" | awk -F '|' '{print $1}')"
             exec_command="$(head -1 "${dcolTemplate}" | awk -F '|' '{print $2}')"
             WALLBASH_SCRIPTS="${dcolTemplate%%/wallbash/*}/wallbash/scripts"
         fi
     fi
 
-    [[ "${LOG_LEVEL}" == "debug" ]] && print_log -sec "wallbash" -stat "Template:" " ${template}"
+    if [[ "${LOG_LEVEL}" == "debug" ]];then
+     print_log -sec "wallbash" -stat "Template:" " ${template}"
+     print_log -sec "wallbash" -stat "Wallbash Directories:" " ${wallbash_dirs_array[*]}"
+     print_log -sec "wallbash" -stat "Wallbash Scripts:" " ${WALLBASH_SCRIPTS}"
+    fi
 
     # shellcheck disable=SC1091
     # shellcheck disable=SC2154
@@ -166,8 +173,6 @@ fn_wallbash() {
         bash -c "${exec_command}" &
         disown
     }
-
-    unset WALLBASH_SCRIPTS
 }
 
 scrDir="$(dirname "$(realpath "$0")")"
@@ -291,6 +296,8 @@ fi
 
 #// switch theme <//> wall based colors
 
+print_log -sec "wallbash" -stat "wallbash directories" " $WALLBASH_DIRS"
+
 # shellcheck disable=SC2154
 if [ "${enableWallDcol}" -eq 0 ] && [[ "${reload_flag}" -eq 1 ]]; then
 
@@ -303,13 +310,14 @@ if [ "${enableWallDcol}" -eq 0 ] && [[ "${reload_flag}" -eq 1 ]]; then
     done < <(find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++')
 
     # Process templates in parallel
-    parallel fn_wallbash ::: "${deployList[@]}" || true
+    parallel fn_wallbash {} "$wallbashDirs[@]" ::: "${deployList[@]}" || true
+
 
 elif [ "${enableWallDcol}" -gt 0 ]; then
     print_log -sec "wallbash" -stat "apply ${dcol_mode} colors" "Wallbash theme"
     # This is the reason we avoid SPACES for the wallbash template names
-    find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
+    find -H "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} "${wallbashDirs[@]}"  || true
 fi
 
 # Process "always" templates in parallel
-find -H "${wallbashDirs[@]}" -type f -path "*/always*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
+find -H "${wallbashDirs[@]}" -type f -path "*/always*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} "${wallbashDirs[@]}" || true

Configs/.local/lib/hyde/lockscreen.sh

@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 
 [[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
+
+lockscreen="${HYPRLAND_LOCKSCREEN:-$lockscreen}"
 lockscreen="${LOCKSCREEN:-hyprlock}"
+lockscreen="${HYDE_LOCKSCREEN:-$lockscreen}"
 
 case ${1} in
     --get)