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

Author: kRHYME7

CHANGELOG.md

@@ -10,6 +10,8 @@ Big CHANGE in HyDE! We are now using `uwsm` for session management and app2unit
 
 **PLEASE run install.sh again to upgrade and install missing dependencies!!!**
 
+Upon opening in you SDDM, Please choose `Hyprland (UWSM Managed)` as your session. Or else you will handle the session yourself!
+
 ### Changed
 
 - Hyprlock: Sourcing hyprlock/HyDE.conf as default theme

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

@@ -31,11 +31,15 @@ configure_spicetify() {
            -e "/^spotify_path/ s+=.*$+= $spotify_path+g" \
            -e "/^spotify_launch_flags/ s+=.*$+= $spotify_flags+g" "$spotify_conf"
 
-    curl -L -o "${cache_dir}/landing/Spotify_Sleek.tar.gz" "https://github.com/prasanthrangan/hyprdots/raw/main/Source/arcs/Spotify_Sleek.tar.gz"
-    tar -xzf "${cache_dir}/landing/Spotify_Sleek.tar.gz" -C ~/.config/spicetify/Themes/
+    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"
+        tar -xzf "${cache_dir}/landing/Spotify_Sleek.tar.gz" -C "$spicetify_themes_dir"
+    fi
     spicetify backup apply
     spicetify config current_theme Sleek
     spicetify config color_scheme Wallbash
+    spicetify config sidebar_config 0
     spicetify restore backup
     spicetify backup apply
 }
@@ -59,9 +63,11 @@ EOF
         spotify_path="${shareDir}/spotify-launcher/install/usr/bin/spotify"
     elif [ -d /opt/spotify ]; then
         spotify_path='/opt/spotify'
-        if [ ! -w "${spotify_path}" ] || [ ! -w "${spotify_path}/Apps" ]; then
-            notify_and_set_permissions "${spotify_path}"
-        fi
+    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

Configs/.config/xdg-terminals.list

@@ -1 +1,4 @@
+# See https://github.com/Vladimir-csp/xdg-terminal-exec?tab=readme-ov-file#configuration
 kitty.desktop
+Alacritty.desktop
+foot.desktop

Configs/.local/bin/hyde-shell

@@ -152,10 +152,10 @@ Restore Date: $HYDE_VERSION_LAST_CHECKED
 Last Commit Message: $HYDE_VERSION_COMMIT_MSG
 
 Tools:
-hydectl: $(hydectl version || echo "hydectl not found")
-$(hyprland -v | head -n1 || echo "hyprland not found")
+hydectl: $(hydectl version 2>/dev/null || echo "hydectl not found")
+$(hyprland -v 2>/dev/null | head -n1 || echo "hyprland not found")
 $(if hyprctl_output=$(hyprctl version 2>/dev/null | head -n1); then echo "$hyprctl_output (Running Instance)"; else echo "hyprctl not found or not running"; fi)
-$(hyde-ipc --version || echo "hyde-ipc not found")
+$(hyde-ipc --version 2>/dev/null || echo "hyde-ipc not found")
 
 
 HyDE updates every friday, so please check for updates regularly.

Configs/.local/lib/hyde/gnome-terminal

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+[[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
 
 # Declare an associative array for special cases
 declare -A dict
@@ -103,20 +105,20 @@ main() {
 
     [ -z "$mime_type" ] && {
         echo -e "Error: No matching MIME type found for $input\n"
-        gtk-launch "${fallbackCmd}" || exit 1
+        app2unit.sh "${fallbackCmd}" || exit 1
     }
 
     local default_app
     default_app=$(xdg-mime query default "$mime_type")
     [ -z "$default_app" ] && {
         echo -e "Error: No default application found for $mime_type\n"
-        gtk-launch "${fallbackCmd}" || exit 1
+        app2unit.sh "${fallbackCmd}" || exit 1
     }
 
     if [ "${std_only}" = true ]; then
         echo "${default_app}"
     else
-        gtk-launch "${default_app}" || gtk-launch "${fallbackCmd}"
+        app2unit.sh "${default_app}" || app2unit.sh "${fallbackCmd}"
     fi
 }
 main "$@"

Configs/.local/lib/hyde/hyde-launch.sh

@@ -6,7 +6,7 @@
 
 [ -z "${HYDE_THEME}" ] && echo "ERROR: unable to detect theme" && exit 1
 get_themes
-confDir="${XDG_CONFIG_HOME:-$(xdg-user-dir CONFIG)}"
+confDir="${XDG_CONFIG_HOME:-$HOME/.config}"
 #// define functions
 
 Theme_Change() {
@@ -48,6 +48,44 @@ Notification font: ${NOTIFICATION_FONT}
 EOF
 }
 
+load_hypr_variables() {
+  local hypr_file="${1}"
+
+  #? Load theme specific variables
+  eval "$(
+    hyq "${hypr_file}" \
+      --export env \
+      -Q "\$GTK_THEME[string]" \
+      -Q "\$ICON_THEME[string]" \
+      -Q "\$CURSOR_THEME[string]" \
+      -Q "\$CURSOR_SIZE[int]" \
+      -Q "\$FONT[string]" \
+      -Q "\$FONT_SIZE[int]" \
+      -Q "\$FONT_STYLE[string]" \
+      -Q "\$DOCUMENT_FONT[string]" \
+      -Q "\$DOCUMENT_FONT_SIZE[int]" \
+      -Q "\$MONOSPACE_FONT[string]" \
+      -Q "\$MONOSPACE_FONT_SIZE[int]"
+  )"
+
+  GTK_THEME=${__GTK_THEME:-$GTK_THEME}
+  ICON_THEME=${__ICON_THEME:-$ICON_THEME}
+  CURSOR_THEME=${__CURSOR_THEME:-$CURSOR_THEME}
+  CURSOR_SIZE=${__CURSOR_SIZE:-$CURSOR_SIZE}
+  TERMINAL=${__TERMINAL:-$TERMINAL}
+  FONT=${__FONT:-$FONT}
+  FONT_STYLE=${__FONT_STYLE:-''} # using hyprland this should be empty by default
+  FONT_SIZE=${__FONT_SIZE:-$FONT_SIZE}
+  DOCUMENT_FONT=${__DOCUMENT_FONT:-$DOCUMENT_FONT}
+  DOCUMENT_FONT_SIZE=${__DOCUMENT_FONT_SIZE:-$DOCUMENT_FONT_SIZE}
+  MONOSPACE_FONT=${__MONOSPACE_FONT:-$MONOSPACE_FONT}
+  MONOSPACE_FONT_SIZE=${__MONOSPACE_FONT_SIZE:-$MONOSPACE_FONT_SIZE}
+  BAR_FONT=${__BAR_FONT:-$BAR_FONT}
+  MENU_FONT=${__MENU_FONT:-$MENU_FONT}
+  NOTIFICATION_FONT=${__NOTIFICATION_FONT:-$NOTIFICATION_FONT}
+
+}
+
 sanitize_hypr_theme() {
   input_file="${1}"
   output_file="${2}"
@@ -131,37 +169,11 @@ if [[ -r "${HYPRLAND_CONFIG}" ]]; then
   [[ -n $HYPRLAND_INSTANCE_SIGNATURE ]] && hyprctl keyword misc:disable_autoreload 1 -q
   [[ -r "${HYDE_THEME_DIR}/hypr.theme" ]] && sanitize_hypr_theme "${HYDE_THEME_DIR}/hypr.theme" "${XDG_CONFIG_HOME}/hypr/themes/theme.conf"
 
-  eval "$(
-    hyq "${HYDE_THEME_DIR}/hypr.theme" \
-      --export env \
-      -Q "\$GTK_THEME[string]" \
-      -Q "\$ICON_THEME[string]" \
-      -Q "\$CURSOR_THEME[string]" \
-      -Q "\$CURSOR_SIZE[int]" \
-      -Q "\$FONT[string]" \
-      -Q "\$FONT_SIZE[int]" \
-      -Q "\$FONT_STYLE[string]" \
-      -Q "\$DOCUMENT_FONT[string]" \
-      -Q "\$DOCUMENT_FONT_SIZE[int]" \
-      -Q "\$MONOSPACE_FONT[string]" \
-      -Q "\$MONOSPACE_FONT_SIZE[int]"
-  )"
+  #? Load theme specific variables
+  load_hypr_variables "${HYDE_THEME_DIR}/hypr.theme"
 
-  GTK_THEME=${__GTK_THEME:-$GTK_THEME}
-  ICON_THEME=${__ICON_THEME:-$ICON_THEME}
-  CURSOR_THEME=${__CURSOR_THEME:-$CURSOR_THEME}
-  CURSOR_SIZE=${__CURSOR_SIZE:-$CURSOR_SIZE}
-  TERMINAL=${__TERMINAL:-$TERMINAL}
-  FONT=${__FONT:-$FONT}
-  FONT_STYLE=${__FONT_STYLE:-''} # using hyprland this should be empty by default
-  FONT_SIZE=${__FONT_SIZE:-$FONT_SIZE}
-  DOCUMENT_FONT=${__DOCUMENT_FONT:-$DOCUMENT_FONT}
-  DOCUMENT_FONT_SIZE=${__DOCUMENT_FONT_SIZE:-$DOCUMENT_FONT_SIZE}
-  MONOSPACE_FONT=${__MONOSPACE_FONT:-$MONOSPACE_FONT}
-  MONOSPACE_FONT_SIZE=${__MONOSPACE_FONT_SIZE:-$MONOSPACE_FONT_SIZE}
-  BAR_FONT=${__BAR_FONT:-$BAR_FONT}
-  MENU_FONT=${__MENU_FONT:-$MENU_FONT}
-  NOTIFICATION_FONT=${__NOTIFICATION_FONT:-$NOTIFICATION_FONT}
+  #? Load User's hyprland overrides
+  load_hypr_variables "${XDG_STATE_DIR:-$HOME/.local/state}/hyde/hyprland.conf"
 
 fi
 
@@ -235,7 +247,11 @@ else
   print_log -sec "theme" -stat "use" "'Wallbash-Gtk' as gtk4 theme"
 fi
 rm -rf "${confDir}/gtk-4.0"
-ln -s "${themesDir}/${gtk4Theme}/gtk-4.0" "${confDir}/gtk-4.0"
+if [ -d "${themesDir}/${gtk4Theme}/gtk-4.0" ]; then
+  ln -s "${themesDir}/${gtk4Theme}/gtk-4.0" "${confDir}/gtk-4.0"
+else
+  print_log -sec "theme" -warn "gtk4" "theme directory '${themesDir}/${gtk4Theme}/gtk-4.0' does not exist"
+fi
 
 #// flatpak GTK
 
@@ -296,6 +312,11 @@ if [ -f "$HOME/.Xdefaults" ]; then
   grep -q "^Xcursor\.size:" "$HOME/.Xdefaults" || echo "Xcursor.size: 30" >>"$HOME/.Xdefaults"
 fi
 
+#? Workaround for gtk-4 having settings.ini!
+if [ -f "${confDir}/gtk-4.0/settings.ini" ]; then
+  rm "${confDir}/gtk-4.0/settings.ini"
+fi
+
 #// wallpaper
 export -f pkg_installed
 

Configs/.local/lib/hyde/theme.switch.sh

@@ -6,6 +6,10 @@
 
 [[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
 
+if [[ "${WALLBASH_STARTUP:-0}" -eq 1 ]]; then
+    exit 0
+fi
+
 confDir="${confDir:-$XDG_CONFIG_HOME}"
 cacheDir="${cacheDir:-$XDG_CACHE_HOME/hyde}"
 HYDE_THEME="${HYDE_THEME:-}"

Configs/.local/lib/hyde/wallbash.hypr.sh

@@ -14,6 +14,7 @@ options:
     -p, --previous            Set previous wallpaper
     -r, --random              Set random wallpaper
     -s, --set <file>          Set specified wallpaper
+        --start               Start/apply current wallpaper to backend
     -g, --get                 Get current wallpaper of specified backend
     -o, --output <file>       Copy current wallpaper to specified file
         --link                Resolved the linked wallpaper according to the theme
@@ -191,7 +192,8 @@ main() {
     if [ -z "$wallpaper_backend" ] &&
         [ "$wallpaper_setter_flag" != "o" ] &&
         [ "$wallpaper_setter_flag" != "g" ] &&
-        [ "$wallpaper_setter_flag" != "select" ]; then
+        [ "$wallpaper_setter_flag" != "select" ] &&
+        [ "$wallpaper_setter_flag" != "start" ]; then
         print_log -sec "wallpaper" -err "No backend specified"
         print_log -sec "wallpaper" " Please specify a backend, try '--backend swww'"
         print_log -sec "wallpaper" " See available commands: '--help | -h'"
@@ -240,6 +242,17 @@ main() {
             get_hashmap "${wallpaper_path}"
             Wall_Cache
             ;;
+        start)
+            # Start/apply current wallpaper to backend
+            if [ ! -e "${wallSet}" ]; then
+                print_log -err "wallpaper" "No current wallpaper found: ${wallSet}"
+                exit 1
+            fi
+            export WALLPAPER_RELOAD_ALL=0 WALLBASH_STARTUP=1
+            current_wallpaper="$(realpath "${wallSet}")"
+            get_hashmap "${current_wallpaper}"
+            Wall_Cache
+            ;;
         g)
             if [ ! -e "${wallSet}" ]; then
                 print_log -err "wallpaper" "Wallpaper not found: ${wallSet}"
@@ -301,7 +314,7 @@ if [ -z "${*}" ]; then
 fi
 
 # Define long options
-LONGOPTS="link,global,select,json,next,previous,random,set:,backend:,get,output:,help,filetypes:"
+LONGOPTS="link,global,select,json,next,previous,random,set:,start,backend:,get,output:,help,filetypes:"
 
 # Parse options
 PARSED=$(
@@ -353,6 +366,10 @@ while true; do
         wallpaper_path="${2}"
         shift 2
         ;;
+    --start)
+        wallpaper_setter_flag=start
+        shift
+        ;;
     -g | --get)
         wallpaper_setter_flag=g
         shift