miracle-wm: fixes

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,

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

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
+## Load system and user environment.d variables using systemd generator
-if [ -d /etc/environment.d ]; then
+if [ -x /usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator ]; then
-    set -o allexport
+    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
+exec systemd-cat --identifier=miracle-wm /usr/bin/miracle-wm \
-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 \
     --systemd-session-configure=/usr/libexec/miracle-wm-session-setup \
     --display-config=static=$(systemd-path user-configuration)/miracle-wm-display.yaml