Merge branch 'dev' into hydevm

Author: kRHYME7

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased] v25.7.3
 
-We use a dedicated Python environment to keep HyDE clean and dependency-free. Just run your scripts with `hyde-shell`—it handles the environment for you.
+We use a dedicated Python environment to keep HyDE clean and dependency-free. Just run your scripts with `hyde-shell`— this handles the environment for you.
 
 Examples:  
  `hyde-shell mediaplayer.py`  
@@ -25,6 +25,7 @@ Examples:
 - Waybar: Made mpris comparable to custom/mediaplayer. Should be noted mpris is not very customizable.
 - Waybar: Added generic gamemode module which detects if games are running in feral mode
 - Waybar: 'hyde-shell waybar --select' now will ask for **layout and style** options.
+- Core:Solid theming fallback
 
 ### Removed
 
@@ -33,9 +34,13 @@ Examples:
 ### Changed
 
 - Launch Scripts using 'hyde-shell' instead of '$scrPath/'
+- Hyprland: Remove dconf setting in Hyprland config and add a separate dconf stack on color setup. This removes some hiccups on hyprctl reload.
+- Updated `hyq` hyprquery v0.6.3r2
+- Updated `hydectl`
 
 ### Fixed
 
 - Waybar: Avoid multi user process conflict
 - Mediaplayer: crash when player is not playing.
 - Waybar: QOL fixes.
+- Rofi: Fallback scaling for some script to not rely with hyprland

Configs/.config/hypr/shaders.conf

@@ -7,7 +7,7 @@
 # *│ HyDE Controlled content DO NOT EDIT!                                      |
 # *│ Edit or add shaders in the ./shaders/ directory                           |
 # *│ and run the 'shaders.sh --select' command to update this file             |
-# *│ Modify ./shaders/user-defines.frag to add your own custom defines         |
+# *│ Modify ./shaders/shader-name.inc to add your own custom defines         |
 # *│ The 'shader.sh' script will automatically copy this file to the cache     |
 # *│ and the cache will be used in the shader                                  |
 # *│                                                                            |

Configs/.config/hypr/shaders/.compiled.cache.glsl

@@ -1,10 +1,10 @@
 #version 300 es
 
-/* 
-  ┌─────────────────────────────────────────────────────────────────────────┐
-  │ This is a blank shader to disable hyprland shaders.                     │
-  └─────────────────────────────────────────────────────────────────────────┘
- */
+/*
+┌─────────────────────────────────────────────────────────────────────────┐
+│ This is a blank shader to disable hyprland shaders.                     │
+└─────────────────────────────────────────────────────────────────────────┘
+*/
 
 precision mediump float;
 
@@ -13,6 +13,6 @@ out vec4 fragColor;
 
 uniform sampler2D tex;
 
-void main() {
-    fragColor = texture(tex, v_texcoord);
+void main(){
+  fragColor=texture(tex,v_texcoord);
 }

Configs/.local/bin/hyde-shell

@@ -42,7 +42,7 @@ HYDE_SCRIPTS_PATH=${HYDE_SCRIPTS_PATH}
 export BIN_DIR LIB_DIR SHARE_DIR PATH HYDE_SCRIPTS_PATH HYDE_SHELL_INIT
 EOF
     #? Use sed to remove any shebang hints to avoid conflicts with "eval"
-    command cat "${LIB_DIR}/hyde/globalcontrol.sh" 
+    command cat "${LIB_DIR}/hyde/globalcontrol.sh"
 }
 
 # If args is init or --init, print initialization script

Configs/.local/bin/hydectl

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-pkill rofi && exit 0
+pkill -u "$USER" rofi && exit 0
+
 [[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
 
 # define paths and files

Configs/.local/lib/hyde/cliphist.sh

@@ -1,6 +1,18 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2154
 
+[[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
+
+# Hook commands to always run for theming and colors
+load_dconf_kdeglobals() {
+
+    wallbash.hypr.sh #<--- hyprland hook
+    toml_write "${confDir}/kdeglobals" "Colors:View" "BackgroundNormal" "#${dcol_pry1:-000000}FF"
+    toml_write "${confDir}/Kvantum/wallbash/wallbash.kvconfig" '%General' 'reduce_menu_opacity' 0
+    dconf.set.sh
+
+}
+
 # Function to create wallbash substitutions
 create_wallbash_substitutions() {
     local use_inverted=$1
@@ -220,21 +232,20 @@ fi
 [ "${dcol_mode}" == "dark" ] && dcol_invt="light" || dcol_invt="dark"
 set +a
 
-if [ -z "$GTK_THEME" ]; then
-    if [ "${enableWallDcol}" -eq 0 ]; then
-        GTK_THEME="$(get_hyprConf "GTK_THEME")"
-    else
-        GTK_THEME="Wallbash-Gtk"
-    fi
-fi
-[ -z "$GTK_ICON" ] && GTK_ICON="$(get_hyprConf "ICON_THEME")"
-[ -z "$CURSOR_THEME" ] && CURSOR_THEME="$(get_hyprConf "CURSOR_THEME")"
-export GTK_THEME GTK_ICON CURSOR_THEME
-
 # Preprocess substitutions once before processing any templates
 preprocess_substitutions
 print_log -sec "wallbash" -stat "preprocessed" "color substitutions"
 
+#  Theme mode: detects the color-scheme set in hypr.theme and falls back if nothing is parsed.
+revert_colors=0
+[ "${enableWallDcol}" -eq 0 ] && { grep -q "${dcol_mode}" <<<"$(get_hyprConf "COLOR_SCHEME")" || revert_colors=1; }
+export revert_colors
+
+# Run dconf and kdeglobals commands
+# Add configuration hooks
+load_dconf_kdeglobals
+export GTK_THEME GTK_ICON CURSOR_THEME COLOR_SCHEME
+
 #// deploy wallbash colors
 
 WALLBASH_DIRS=""
@@ -291,14 +302,5 @@ elif [ "${enableWallDcol}" -gt 0 ]; then
     find "${wallbashDirs[@]}" -type f -path "*/theme*" -name "*.dcol" 2>/dev/null | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
 fi
 
-#  Theme mode: detects the color-scheme set in hypr.theme and falls back if nothing is parsed.
-revert_colors=0
-[ "${enableWallDcol}" -eq 0 ] && { grep -q "${dcol_mode}" <<<"$(get_hyprConf "COLOR_SCHEME")" || revert_colors=1; }
-export revert_colors
-
 # Process "always" templates in parallel
 find "${wallbashDirs[@]}" -type f -path "*/always*" -name "*.dcol" 2>/dev/null | sort | awk '!seen[substr($0, match($0, /[^/]+$/))]++' | parallel fn_wallbash {} || true
-
-# Add configuration hooks
-toml_write "${confDir}/kdeglobals" "Colors:View" "BackgroundNormal" "#${dcol_pry1:-000000}FF"
-toml_write "${confDir}/Kvantum/wallbash/wallbash.kvconfig" '%General' 'reduce_menu_opacity' 0

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

@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC2154
+# shellcheck disable=SC1091
+
+[[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
+
+# Stores default values for the theme to avoid breakages.
+source "${SHARE_DIR}/hyde/theme-env"
+
+dconf_populate() {
+    # Build the dconf content
+    cat <<EOF
+[org/gnome/desktop/interface]
+icon-theme='$ICON_THEME'
+gtk-theme='$GTK_THEME'
+color-scheme='$COLOR_SCHEME'
+cursor-theme='$CURSOR_THEME'
+cursor-size=$CURSOR_SIZE
+font-name='$FONT $FONT_SIZE'
+document-font-name='$DOCUMENT_FONT $DOCUMENT_FONT_SIZE'
+monospace-font-name='$MONOSPACE_FONT $MONOSPACE_FONT_SIZE'
+font-antialiasing='$FONT_ANTIALIASING'
+font-hinting='$FONT_HINTING'
+
+[org/gnome/desktop/default-applications/terminal]
+exec='$(command -v "${TERMINAL}")'
+
+[org/gnome/desktop/wm/preferences]
+button-layout='$BUTTON_LAYOUT'
+EOF
+
+}
+# HYDE_THEME="$(hyq "${HYPRLAND_CONFIG}" --source --query 'hyde:theme')"
+COLOR_SCHEME="prefer-${dcol_mode}"
+GTK_THEME="Wallbash-Gtk"
+HYPRLAND_CONFIG=${HYPRLAND_CONFIG:-"${XDG_CONFIG_HOME:-$(xdg-user-dir CONFIG)}/hypr/hyprland.conf"}
+
+# Populate variables from hyprland config if exists
+if [[ -r "${HYPRLAND_CONFIG}" ]] &&
+    command -v "hyq" &>/dev/null; then
+
+    eval "$(
+        hyq "${HYPRLAND_CONFIG}" --source --export env \
+            -Q 'hyde:gtk-theme' \
+            -Q 'hyde:icon-theme' \
+            -Q 'hyde:cursor-theme' \
+            -Q 'hyde:cursor-size' \
+            -Q 'hyde:terminal' \
+            -Q 'hyde:font' \
+            -Q 'hyde:font-size' \
+            -Q 'hyde:document-font' \
+            -Q 'hyde:document-font-size' \
+            -Q 'hyde:monospace-font' \
+            -Q 'hyde:monospace-font-size' \
+            -Q 'hyde:button-layout' \
+            -Q 'hyde:font-antialiasing' \
+            -Q 'hyde:font-hinting'
+
+    )"
+    GTK_THEME=${_hyde_gtk_theme:-$GTK_THEME}
+    COLOR_SCHEME=${_hyde_color_scheme:-$COLOR_SCHEME}
+    ICON_THEME=${_hyde_icon_theme:-$ICON_THEME}
+    CURSOR_THEME=${_hyde_cursor_theme:-$CURSOR_THEME}
+    CURSOR_SIZE=${_hyde_cursor_size:-$CURSOR_SIZE}
+    TERMINAL=${_hyde_terminal:-$TERMINAL}
+    FONT=${_hyde_font:-$FONT}
+    FONT_SIZE=${_hyde_font_size:-$FONT_SIZE}
+    DOCUMENT_FONT=${_hyde_document_font:-$DOCUMENT_FONT}
+    DOCUMENT_FONT_SIZE=${_hyde_document_font_size:-$DOCUMENT_FONT_SIZE}
+    MONOSPACE_FONT=${_hyde_monospace_font:-$MONOSPACE_FONT}
+    MONOSPACE_FONT_SIZE=${_hyde_monospace_font_size:-$MONOSPACE_FONT_SIZE}
+    BUTTON_LAYOUT=${_hyde_button_layout:-$BUTTON_LAYOUT}
+    FONT_ANTIALIASING=${_hyde_font_antialiasing:-$FONT_ANTIALIASING}
+    FONT_HINTING=${_hyde_font_hinting:-$FONT_HINTING}
+fi
+
+# Check if we need inverted colors
+if [[ "${revert_colors:-0}" -eq 1 ]] ||
+    [[ "${enableWallDcol:-0}" -eq 2 && "${dcol_mode:-}" == "light" ]] ||
+    [[ "${enableWallDcol:-0}" -eq 3 && "${dcol_mode:-}" == "dark" ]]; then
+    if [[ "${dcol_mode}" == "dark" ]]; then
+        COLOR_SCHEME="prefer-light"
+    else
+        COLOR_SCHEME="prefer-dark"
+    fi
+fi
+
+DCONF_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/hyde/dconf"
+
+{ dconf load -f / <"${DCONF_FILE}" && print_log -sec "dconf" -stat "preserve" "${DCONF_FILE}"; } || print_log -sec "dconf" -warn "failed to preserve" "${DCONF_FILE}"
+{ dconf_populate >"${DCONF_FILE}" && print_log -sec "dconf" -stat "populated" "${DCONF_FILE}"; } || print_log -sec "dconf" -warn "failed to populate" "${DCONF_FILE}"
+{ dconf reset -f / <"${DCONF_FILE}" && print_log -sec "dconf" -stat "reset" "${DCONF_FILE}"; } || print_log -sec "dconf" -warn "failed to reset" "${DCONF_FILE}"
+{ dconf load -f / <"${DCONF_FILE}" && print_log -sec "dconf" -stat "loaded" "${DCONF_FILE}"; } || print_log -sec "dconf" -warn "failed to load" "${DCONF_FILE}"
+
+[[ -n "${HYPRLAND_INSTANCE_SIGNATURE}" ]] && hyprctl setcursor "${CURSOR_THEME}" "${CURSOR_SIZE}"
+
+print_log -sec "dconf" -stat "Loaded dconf settings"
+print_log -y "#-----------------------------------------------#"
+dconf_populate
+print_log -y "#-----------------------------------------------#"

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

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+pkill -u "$USER" rofi && exit 0
+
 [[ "${HYDE_SHELL_INIT}" -ne 1 ]] && eval "$(hyde-shell init)"
 
 emoji_dir=${HYDE_DATA_HOME:-$HOME/.local/share/hyde}

Configs/.local/lib/hyde/emoji-picker.sh

@@ -18,19 +18,19 @@ elem_border=$((hypr_border * 2))
 icon_border=$((elem_border - 3))
 r_override="element{border-radius:${elem_border}px;} element-icon{border-radius:${icon_border}px;}"
 
-[[ -z $MODE ]] && MODE=5
-case $MODE in
+[[ -n "${ROFI_GAMELAUNCHER_STYLE}" ]] && MODE=${ROFI_GAMELAUNCHER_STYLE}
+case ${MODE:-5} in
 5)
-monitor_info=()
-eval "$(hyprctl -j monitors | jq -r '.[] | select(.focused==true) |
+  monitor_info=()
+  eval "$(hyprctl -j monitors | jq -r '.[] | select(.focused==true) |
     "monitor_info=(\(.width) \(.height) \(.scale) \(.x) \(.y)) reserved_info=(\(.reserved | join(" ")))"')"
 
-# Remove decimal point from scale and convert to integer (e.g., 1.25 -> 125)
-monitor_scale="${monitor_info[2]//./}"
-# Calculate display width adjusted for scale (95% of actual width)
-monitor_width=$((monitor_info[0] * 95 / monitor_scale))
-# Calculate display height adjusted for scale (95% of actual height)
-monitor_height=$((monitor_info[1] * 95 / monitor_scale))
+  # Remove decimal point from scale and convert to integer (e.g., 1.25 -> 125)
+  monitor_scale="${monitor_info[2]//./}"
+  # Calculate display width adjusted for scale (95% of actual width)
+  monitor_width=$((monitor_info[0] * 95 / monitor_scale))
+  # Calculate display height adjusted for scale (95% of actual height)
+  monitor_height=$((monitor_info[1] * 95 / monitor_scale))
 
   BG=$HOME/.local/share/hyde/rofi/assets/steamdeck_holographic.png
   BGfx=$HOME/.cache/hyde/landing/steamdeck_holographic_${monitor_width}x${monitor_height}.png
@@ -48,7 +48,7 @@ monitor_height=$((monitor_info[1] * 95 / monitor_scale))
   # top right bottom left
   ;;
 
-*) : ;;
+*) ;;
 esac
 
 fn_steam() {
@@ -61,8 +61,8 @@ fn_steam() {
   # SteamLib might contain more than one path
   ManifestList=$(grep '"path"' $SteamLib | awk -F '"' '{print $4}' | while read sp; do
 
-  #Manifests for current path
-  find "${sp}/steamapps" -type f -name "appmanifest_*.acf" 2>/dev/null 
+    #Manifests for current path
+    find "${sp}/steamapps" -type f -name "appmanifest_*.acf" 2>/dev/null
   done)
 
   if [ -z "${ManifestList}" ]; then
@@ -88,7 +88,7 @@ fn_steam() {
       appid=$(echo "${acf}" | cut -d '|' -f 2)
       game=$(echo "${acf}" | cut -d '|' -f 1)
       # find the lib image
-      libImage=$(find "${SteamThumb}/${appid}/" -type f -name "${libraryThumbName}" | head  -1)
+      libImage=$(find "${SteamThumb}/${appid}/" -type f -name "${libraryThumbName}" | head -1)
       printf "%s\x00icon\x1f${libImage}\n" "${game}" >&2
       printf "%s\x00icon\x1f${libImage}\n" "${game}"
     done | rofi -dmenu \
@@ -97,7 +97,7 @@ fn_steam() {
   )
 
   # launch game
-  if [ -n "$RofiSel" ]; then 
+  if [ -n "$RofiSel" ]; then
     launchid=$(echo "$GameList" | grep "$RofiSel" | cut -d '|' -f 2)
 
     headerImage=$(find "${SteamThumb}/${launchid}/" -type f -name "*${libraryHeaderName}")