Merge branch 'rc' into dev

Author: kRHYME7

CHANGELOG.md

@@ -14,8 +14,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 ### Changed
 
 - Core: Move wallbash to ~/.local/share/wallbash
+- wlogout: Add support for for uwsm
 
-## v25.8.2
+### Added
+
+- hyde-shell: Add `logout` command to handle with/out uwsm
+
+
+## v25.8.1
 
 Big CHANGE in HyDE! We are now using `uwsm` for session management and app2unit for application management.
 

Configs/.config/wlogout/layout_1

@@ -7,7 +7,7 @@
 
 {
     "label": "logout",
-    "action": "hyprctl dispatch exit 0",
+    "action": "hyde-shell logout",
     "text": "Logout",
     "keybind": "e"
 }

Configs/.config/wlogout/layout_2

@@ -7,7 +7,7 @@
 
 {
     "label": "logout",
-    "action": "hyprctl dispatch exit 0",
+    "action": "hyde-shell logout",
     "text": "Logout",
     "keybind": "e"
 }

Configs/.local/bin/hyde-shell

@@ -392,6 +392,14 @@ generate_completions() {
     esac
 }
 
+hyde-logout() {
+    if uwsm check is-active; then
+        uwsm stop
+    elif [[ -n "${HYPRLAND_INSTANCE_SIGNATURE}" ]]; then
+        hyprctl dispatch exit 0
+    fi
+}
+
 run_command() {
     # Convert to array, deduplicate, and filter out empty entries
     IFS=':' read -ra RAW_DIRS <<<"$HYDE_SCRIPTS_PATH"
@@ -458,24 +466,22 @@ export BIN_DIR LIB_DIR SHARE_DIR PATH HYDE_SCRIPTS_PATH
 
 # Priority commands
 case "$1" in
-    app)
-        export PATH="${HYDE_SCRIPTS_PATH}:${PATH}"
-        [[ "${HYDEPY}" -eq 1 ]] && python_activate
-        shift
-        exec app2unit.sh "$@"
-        ;;
-    init | --init)
-        initialized
-        exit 0
-        ;;
-        
-    *)
-        export HYDE_SHELL_INIT=1
-        ;;
+app)
+    export PATH="${HYDE_SCRIPTS_PATH}:${PATH}"
+    [[ "${HYDEPY}" -eq 1 ]] && python_activate
+    shift
+    exec app2unit.sh "$@"
+    ;;
+init | --init)
+    initialized
+    exit 0
+    ;;
+
+*)
+    export HYDE_SHELL_INIT=1
+    ;;
 esac
 
-
-
 # shellcheck disable=SC1091
 if ! source "${LIB_DIR}/hyde/globalcontrol.sh"; then
     echo "Error: Could not load HyDE, broken installation?"
@@ -487,6 +493,9 @@ fi
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
 
     case $1 in
+    logout)
+        hyde-logout
+        ;;
     -r | reload)
         hyde_reload
         ;;

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

@@ -104,7 +104,8 @@ preprocess_substitutions() {
 fn_wallbash() {
     local template="${1}"
     local temp_target_file exec_command
-    WALLBASH_SCRIPTS="${template%%hyde/wallbash*}hyde/wallbash/scripts"
+    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
@@ -117,11 +118,12 @@ fn_wallbash() {
         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%%hyde/wallbash*}hyde/wallbash/scripts"
-
+            WALLBASH_SCRIPTS="${dcolTemplate%%/wallbash/*}/wallbash/scripts"
         fi
     fi
 
+    [[ "${LOG_LEVEL}" == "debug" ]] && print_log -sec "wallbash" -stat "Template:" " ${template}"
+
     # shellcheck disable=SC1091
     # shellcheck disable=SC2154
     [ -f "$HYDE_STATE_HOME/state" ] && source "$HYDE_STATE_HOME/state"
@@ -160,9 +162,12 @@ fn_wallbash() {
         mv "${temp_target_file}" "${target_file}"
     fi
     [ -z "${exec_command}" ] || {
+        [[ "${LOG_LEVEL}" == "debug" ]] && print_log -sec "wallbash" -stat "Exec command:" " ${exec_command} from ${WALLBASH_SCRIPTS}"
         bash -c "${exec_command}" &
         disown
     }
+
+    unset WALLBASH_SCRIPTS
 }
 
 scrDir="$(dirname "$(realpath "$0")")"