fixes

Author: kRHYME7

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/.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)

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 -u hyde-bar.scope -- waybar.py --watch
-$start.WALLPAPER=hyde-shell app -u hyde-wallpaper.scope -- wallpaper.sh --start --global
+$start.BAR=hyde-shell app -u hyde-$XDG_SESSION_DESKTOP-waybar-watcher.service -t service -- waybar.py --watch # we specify `-waybar` because this unit is specific for waybar.py ↓ . `hyde-$XDG_SESSION_DESKTOP-bar.service -t service` should be used for other bars.
+$start.WALLPAPER=hyde-shell app -u hyde-$XDG_SESSION_DESKTOP-wallpaper.service -t service -- 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

Configs/.local/share/waybar/menus/hyde-menu.xml

@@ -108,6 +108,14 @@
                         </child>
 
 
+                        <child>
+                            <object class="GtkMenuItem" id="waybar-style-select">
+                                <property name="label">  Select Sytle</property>
+                            </object>
+                        </child>
+
+
+
                         <child>
                             <object class="GtkMenuItem" id="waybar-layout-next">
                                 <property name="label">  Next Layout</property>
@@ -165,6 +173,27 @@
         </child>
 
 
+        <child>
+            <object class="GtkMenuItem" id="lockscreen_menu">
+                <property name="label">  Lockscreen</property>
+                <child type="submenu">
+                    <object class="GtkMenu">
+
+                        <child>
+                            <object class="GtkMenuItem" id="lockscreen-select">
+                                <property name="label">  Select ockscreen</property>
+                            </object>
+                        </child>
+
+
+                    </object>
+                </child>
+            </object>
+        </child>
+
+
+
+
         <child>
             <object class="GtkMenuItem" id="shaders_menu">
                 <property name="label">  Shaders</property>

Configs/.local/share/waybar/modules/custom-cava.jsonc

@@ -1,7 +1,7 @@
 {
   "custom/cava": {
     "format": "{0}",
-    "exec": "hyde-shell app cava.py waybar --json",
+    "exec": "hyde-shell cava.py waybar --json",
     "restart-interval": 1,
     "hide-empty": true,
     "return-type": "json",

Configs/.local/share/waybar/modules/custom-hyde-menu.jsonc

@@ -17,9 +17,11 @@
       "theme-import": "hyde-shell app -T -- hydectl theme import",
       "waybar-restart": "hyde-shell waybar -ubg",
       "waybar-reload-css": "sed -i '${/^$/d;}'  $XDG_CONFIG_HOME/waybar/style.css",
-      "waybar-layout-select": "hyde-shell waybar --select",
+      "waybar-layout-select": "hyde-shell waybar --select-layout",
+      "waybar-style-select": "hyde-shell waybar --select-style",
       "waybar-layout-next": "hyde-shell waybar --update --next",
       "waybar-layout-previous": "hyde-shell waybar --update --prev",
+      "lockscreen-select": "hyde-shell lockscreen --select",
       "workflows-select": "hyde-shell workflows --select;pkill -RTMIN+19 waybar",
       "shaders-select": "hyde-shell shaders --select;pkill -RTMIN+19 waybar",
       "keybinds-hint": "hyde-shell keybinds_hint",

Scripts/restore_svc.sh

@@ -52,8 +52,12 @@ while IFS='|' read -r service context command || [ -n "$service" ]; do
         print_log -y "[exec] " "Service ${service} (${context}): $command"
 
         if [ "$flg_DryRun" -ne 1 ]; then
-            if [ "$context" = "user" ]; then
+            if [ "$context" = "user" ] ; then
+            if [[ -n "${DBUS_SESSION_BUS_ADDRESS}" ]] && [[ -n $XDG_RUNTIME_DIR ]];then
                 systemctl --user "${cmd_array[@]}" "${service}.service"
+            else 
+             print_log -sec "services" -stat "error" "DBUS_SESSION_BUS_ADDRESS or XDG_RUNTIME_DIR not set for user service" -y " skipping"
+            fi
             else
                 sudo systemctl "${cmd_array[@]}" "${service}.service"
             fi
@@ -68,4 +72,4 @@ while IFS='|' read -r service context command || [ -n "$service" ]; do
 
 done < "${scrDir}/restore_svc.lst"
 
-print_log -sec "services" -stat "completed" "service updates"
+print_log -sec "services" -stat "completed" "service updated successfully"