Fix #1153 #1160 #1163

Closes #1153
Closes #1160
Closes #1163

Author: kRHYME7

CHANGELOG.md

@@ -12,21 +12,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 - Dunst: Fix dunst crashing when the font cannot handle unsupported characters -- Thanks to [#1131](https://github.com/HyDE-Project/HyDE/issues/1131)
 - UWSM: Clean up the xdg freedesktop.org spec as uwsm handles it
 - Wallpaper: fix #1136 as exporting arrays are not supported in bash
+- Lockscreen: Fix zombie hyprlock
 
 ### Changed
 
 - Core: Move wallbash to ~/.local/share/wallbash
-- wlogout: Add support for for uwsm
+- Wlogout: Add support for for uwsm
 - Flatpak: make themes,icons as rw for flatpak --user
 - Added multi-gpu message to nvidia.conf
-- logs now will have '*.log' as extension 
+- Logs now will have '\*.log' as extension
+- Waybar: run as a systemd scope unit on startup
+- Wallpaper: run as a systemd scope unit on startup
 
 ### Added
 
 - hyde-shell: Add 'logout' command to handle with/out uwsm
 - waybar: Add lighter temperature module (Needs manual setup)
 - Add credits page
 - waybar: Try to force initialization on restore (redundancy) might fix [#1160](https://github.com/HyDE-Project/HyDE/issues/1160)
+- Added pyprland boilerplate, no configs for now
+- Hyprland: Graciously handle some of the issues hyprland config issues for unknown SHELL
 
 ## v25.8.1
 

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

@@ -85,5 +85,9 @@ if (pkg_installed spotify && pkg_installed spicetify-cli) || [ -n "$spotify_path
     if pgrep -x spotify >/dev/null; then
         pkill -x spicetify
         spicetify -q watch -s &
+        sleep 3
+        if pgrep -x spicetify >/dev/null; then
+            spicetify restart
+        fi
     fi
 fi

Configs/.config/hypr/hypridle.conf

@@ -4,8 +4,6 @@
 # hypridle.conf - Hypridle configuration for HyDE
 # Handles idle actions: dim, lock, DPMS, suspend, and custom listeners
 # 
-# $LOCKSCREEN: Command to lock the screen (set to your preferred lockscreen)
-# 
 # Listeners: Each listener block defines an idle timeout and actions to run
 # 
 # For more info, see: https://wiki.hypr.land/Hypr-Ecosystem/hypridle/
@@ -18,23 +16,22 @@
 #!     ░▒▒░░▓▓   ▓▓   \__  |____/ |____/
 #!       ░▒▓▓   ▓▓  //____/
 
-# $LOCKSCREEN = hyprlock # preferred LOCKSCREEN e.g swaylock
-$LOCKSCREEN = hyde-shell lockscreen  # Calls $LOCKSCREEN
+$LOCK_CMD = hyde-shell lockscreen.sh # Calls $LOCKSCREEN default is hyprlock
+$UNLOCK_CMD = sh -c 'sleep 3 && pkill -9 $(hyde-shell lockscreen --get)' # kills the lockscreen after 3 seconds for cleanup
 
-# // --- General hypridle settings ---
 general {
-    lock_cmd = $LOCKSCREEN # Registers the lockscreen command to dbus so it can be invoked by `loginctl lock-session`
-    # unlock_cmd = #notify-send "unlock!"      # Command to run on unlock (optional)
-    before_sleep_cmd = loginctl lock-session    # Locks before sleep
-    # after_sleep_cmd = # notify-send "Awake!"  # Command after waking up (optional)
+    lock_cmd = $LOCK_CMD # command when `loginctl lock-session` is called
+    unlock_cmd = $UNLOCK_CMD # command when `loginctl unlock-session` is called
     ignore_dbus_inhibit = false             # Ignore dbus idle-inhibit requests (false = respect them)
     ignore_systemd_inhibit = false          # Ignore systemd-inhibit --what=idle (false = respect them)
+    # before_sleep_cmd =     # command ran before sleep
+    # after_sleep_cmd = # notify-send "Awake!"  # command ran after sleep
 }
 
 # // --- Listener: Dim display after 60s idle ---
 listener {
     timeout = 60
-    on-timeout = { brightnessctl -s && brightnessctl s 1% ;} # Save and set brightness to 1%
+    on-timeout = brightnessctl -s && brightnessctl s 1% # Save and set brightness to 1%
     on-resume = brightnessctl -r # Restore brightness on activity
 }
 

Configs/.local/bin/hyde-shell

@@ -445,6 +445,51 @@ run_command() {
     fi
 }
 
+run_pip() {
+    python_activate
+    shift
+    pip "$@"
+}
+
+run_pypr() {
+
+    python_activate
+    shift
+
+    if command -v pypr >/dev/null 2>&1; then
+
+        socket_path="${XDG_RUNTIME_DIR}/hypr/${HYPRLAND_INSTANCE_SIGNATURE}/.pyprland.sock"
+
+        if [[ -S "$socket_path" ]] && pgrep -u "$USER" pypr >/dev/null 2>&1; then
+            exec app2unit.sh pypr "$@"
+        else
+            print_log -sec "pypr" "PyPR is not running properly, starting fresh"
+            rm "$socket_path"
+
+            exec app2unit.sh -t service pypr
+        fi
+
+    else
+        pip install --no-input pyprland==2.4.7
+    fi
+
+}
+
+lock_session() {
+    #? hyde-shell lock-session wraps around the lockscreen.sh script
+    #? lockscreen.sh activates the set lockscreen blindly
+    #? however, lock-session will check if the lockscreen is set FD's ScreenSaver
+    #? if it is, it will use loginctl lock-session
+    #? otherwise, it will use lockscreen.sh
+    if busctl --user list | grep -q "org.freedesktop.ScreenSaver"; then
+        echo "Using org.freedesktop.ScreenSaver for locking"
+        loginctl lock-session
+    else
+        lockscreen.sh
+    fi
+
+}
+
 #*--------------------------------------------------------------------------------
 
 if [[ -z "${BASH_SOURCE[0]}" ]]; then
@@ -476,7 +521,10 @@ init | --init)
     initialized
     exit 0
     ;;
-
+lock-session)
+    lock_session
+    exit 0
+    ;;
 *)
     export HYDE_SHELL_INIT=1
     ;;
@@ -496,6 +544,16 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     logout)
         hyde-logout
         ;;
+
+    pypr)
+        run_pypr "${@}"
+        exit 0
+        ;;
+
+    pip)
+        run_pip "${@}"
+        exit 0
+        ;;
     -r | reload)
         hyde_reload
         ;;

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

@@ -1,13 +1,24 @@
 #!/usr/bin/env bash
 
-scrDir="$(dirname "$(realpath "$0")")"
-# shellcheck source=$HOME/.local/lib/hyde/globalcontrol.sh
-# shellcheck disable=SC1091
-source "${scrDir}/globalcontrol.sh"
-
+[[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
 lockscreen="${LOCKSCREEN:-hyprlock}"
 
-if ! hyde-shell "${lockscreen}.sh" "${@}"; then
+case ${1} in
+    --get)
+        echo "${lockscreen}"
+        exit 0
+        ;;    
+esac
+
+#? To cleanly exit hyprlock we should use a systemd scope unit.
+#? This allows us to manage the lockscreen process more effectively.
+#? This fix the zombie process issue when hyprlock is unlocked but still running.
+unit_id=(-u "hyde-lockscreen.scope")
+
+if app2unit.sh --test "${unit_id[@]}"  -- "${lockscreen}.sh" "${@}"; then
+    printf "Executing ${lockscreen} wrapper script : %s\n" "${lockscreen}.sh"
+    app2unit.sh  "${unit_id[@]}"  -- "${lockscreen}.sh" "${@}"
+else
     printf "Executing raw command: %s\n" "${lockscreen}"
-    app2unit.sh "${lockscreen}" "${@}"
+    app2unit.sh "${unit_id[@]}" -- "${lockscreen}" "${@}"
 fi

Configs/.local/share/hyde/hyprland.conf

@@ -16,6 +16,7 @@
 # hyprlang if !XDG_DATA_HOME
 $XDG_DATA_HOME = $HOME/.local/share
 # hyprlang endif
+
 # hyprlang if !XDG_CONFIG_HOME
 $XDG_CONFIG_HOME = $HOME/.config
 # hyprlang endif
@@ -26,6 +27,7 @@ $XDG_CONFIG_HOME = $HOME/.config
 source = $XDG_DATA_HOME/hypr/env.conf
 
 # hyprlang if !CONFIG_ALREADY_LOADED
+
 # ? Variables
 source = $XDG_DATA_HOME/hypr/variables.conf
 
@@ -38,6 +40,14 @@ source = $XDG_DATA_HOME/hypr/windowrules.conf
 #? Dynamic Stuff example theming and variable handlings
 source = $XDG_DATA_HOME/hypr/dynamic.conf
 
+# hyprlang endif
+
+# hyprlang if SCREEN_SHADER_COMPILED
+decoration:screen_shader = $SCREEN_SHADER_COMPILED #! This is the compiled shader file, it will be created by the shaders.sh script
+# hyprlang endif
+
+# hyprlang if !CONFIG_ALREADY_LOADED
+
 #? HyDE's startup overridable too!
 source = $XDG_DATA_HOME/hypr/startup.conf
 
@@ -51,3 +61,5 @@ source = $XDG_CONFIG_HOME/hypr/workflows.conf
 source = $XDG_DATA_HOME/hypr/finale.conf
 
 # hyprlang endif
+
+

Configs/.local/share/hypr/dynamic.conf

@@ -30,9 +30,6 @@ source = $XDG_CONFIG_HOME/hypr/shaders.conf # source shader variables
 source = $XDG_CONFIG_HOME/hypr/hyde.conf # Fallback if they still use hyde.conf
 source = $XDG_STATE_HOME/hyde/hyprland.conf # translated from config.toml // should override everything!
 
-# hyprlang if SCREEN_SHADER_COMPILED
-decoration:screen_shader = $SCREEN_SHADER_COMPILED #! This is the compiled shader file, it will be created by the shaders.sh script
-# hyprlang endif
 
 # hyprlang noerror false
 #! Below this is an immutable part of the configuration file, and should not be modified by the user.

Configs/.local/share/hypr/hyprland.conf

@@ -30,6 +30,10 @@ source = ./env.conf
 #? Dynamic Stuff example theming and variable handlings
 source = ./dynamic.conf
 
+# hyprlang if SCREEN_SHADER_COMPILED
+decoration:screen_shader = $SCREEN_SHADER_COMPILED #! This is the compiled shader file, it will be created by the shaders.sh script
+# hyprlang endif
+
 #? HyDE's startup overridable too!
 source = ./startup.conf
 

Configs/.local/share/hypr/variables.conf

@@ -24,8 +24,8 @@ $start.XDG_PORTAL_RESET=hyde-shell resetxdgportal.sh
 
 $start.AUTH_DIALOGUE=hyde-shell app -t service polkitkdeauth.sh
 
-$start.BAR=hyde-shell app -t service waybar.py --watch
-$start.WALLPAPER=hyde-shell app -t service wallpaper.sh --start --global
+$start.BAR=hyde-shell app -u hyde-bar.scope -- waybar.py --watch
+$start.WALLPAPER=hyde-shell app -u hyde-wallpaper.scope -- wallpaper.sh --start --global
 $start.NOTIFICATIONS=hyde-shell app -t service dunst
 
 $start.TEXT_CLIPBOARD=hyde-shell app -t service wl-paste --type text --watch cliphist store