From f2ae3f0febe68ca1b9c9971ea8d543ddaa6cf3cf Mon Sep 17 00:00:00 2001
From: Aleksey Samoilov <samoilov.lex@gmail.com>
Date: Thu, 19 Jun 2025 22:20:02 +0400
Subject: [PATCH] miracle-wm: fixes

---
 debian/control                              |  2 +-
 miracle-wm/etc/skel/.config/miracle-wm.yaml | 26 ++++++++++++++++
 miracle-wm/usr/bin/start-miracle-wm         | 34 ++++++++++-----------
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 0b352f6..351ffd6 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Description: common settings for all TileOS editions
 
 Package: tileos-settings-miracle
 Architecture: all
-Depends: ${misc:Depends}, tileos-settings-common
+Depends: ${misc:Depends}, tileos-settings-common, python3-tenacity, python3-dbus-next
 Conflicts:
  tileos-settings-niri,
  tileos-settings-qtile,
diff --git a/miracle-wm/etc/skel/.config/miracle-wm.yaml b/miracle-wm/etc/skel/.config/miracle-wm.yaml
index 34abbe3..1c4df5f 100644
--- a/miracle-wm/etc/skel/.config/miracle-wm.yaml
+++ b/miracle-wm/etc/skel/.config/miracle-wm.yaml
@@ -83,20 +83,46 @@ custom_actions:
       key: KEY_E
     - command: /usr/share/tileos/scripts/brightness.sh up
       action: down
+      modifiers:
+        - function
       key: KEY_BRIGHTNESSUP
     - command: /usr/share/tileos/scripts/brightness.sh down
+      action: down
+      modifiers:
+        - function
       key: KEY_BRIGHTNESSDOWN
     - command: /usr/share/tileos/scripts/mic-mute.sh
+      action: down
+      modifiers:
+        - function
       key: KEY_MICMUTE
     - command: playerctl play-pause
+      action: down
+      modifiers:
+        - function
       key: KEY_PLAYPAUSE
     - command: playerctl next
+      action: down
+      modifiers:
+        - function
       key: KEY_NEXTSONG
     - command: playerctl previous
+      action: down
+      modifiers:
+        - function
       key: KEY_PREVIOUSSONG
     - command: pulsemixer --change-volume +5
+      action: down
+      modifiers:
+        - function
       key: KEY_VOLUMEUP
     - command: pulsemixer --change-volume -5
+      action: down
+      modifiers:
+        - function
       key: KEY_VOLUMEDOWN
     - command: pulsemixer --toggle-mute
+      action: down
+      modifiers:
+        - function
       key: KEY_MUTE
diff --git a/miracle-wm/usr/bin/start-miracle-wm b/miracle-wm/usr/bin/start-miracle-wm
index b2fab7f..8bab908 100755
--- a/miracle-wm/usr/bin/start-miracle-wm
+++ b/miracle-wm/usr/bin/start-miracle-wm
@@ -5,26 +5,26 @@ export XDG_CURRENT_DESKTOP=mir:miracle-wm
 export XDG_SESSION_DESKTOP=mir:miracle-wm
 export XDG_SESSION_TYPE=wayland
 
-## Load system environment customizations
-if [ -d /etc/environment.d ]; then
-    set -o allexport
+## Load system and user environment.d variables using systemd generator
+if [ -x /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ]; then
+    set -a
+    # Source the generator output in a subshell to avoid pollution
+    . /dev/fd/0 <<EOF
+$(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+EOF
+    set +a
+fi
+
+## Legacy fallback (optional)
+if [ ! -x /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ] && \
+   [ -d /etc/environment.d ]; then
+    set -a
     for f in /etc/environment.d/*.conf; do
-        # shellcheck source=/dev/null
-        . "$f"
+        [ -f "$f" ] && . "$f"
     done
-    set +o allexport
+    set +a
 fi
 
-## Load user environment customizations
-if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
-    set -o allexport
-    for i in "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d"/*.conf; do
-        # shellcheck source=/dev/null
-        . "$i"
-    done
-    set +o allexport
-fi
-
-systemd-cat --identifier=miracle-wm /usr/bin/miracle-wm \
+exec systemd-cat --identifier=miracle-wm /usr/bin/miracle-wm \
     --systemd-session-configure=/usr/libexec/miracle-wm-session-setup \
     --display-config=static=$(systemd-path user-configuration)/miracle-wm-display.yaml