From aacb06b7283acecdc7887263782edac05854b303 Mon Sep 17 00:00:00 2001
From: Olivier DOSSMANN <git@dossmann.net>
Date: Fri, 10 Jan 2025 18:41:18 +0100
Subject: [PATCH] fix(sway): Load .config/environment.d/envvars.conf in another
 way

---
 .config/environment.d/envvars.conf |  2 ++
 .config/zsh/.zprofile              | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/.config/environment.d/envvars.conf b/.config/environment.d/envvars.conf
index 633417d..8166ab7 100644
--- a/.config/environment.d/envvars.conf
+++ b/.config/environment.d/envvars.conf
@@ -10,6 +10,8 @@ ELECTRON_OZONE_PLATFORM_HINT=wayland
 # Pour wayland
 SDL_VIDEODRIVER=wayland
 # Session : déjà fait par sway-systemd. Cf. https://github.com/alebastr/sway-systemd/blob/main/src/session.sh
+# Regarder dans .config/sway/config, à la fin ça importe /etc/sway/config.d/ qui contient 10-systemd-session.conf qui exécute session.sh
+# Ce qui import XDG_SESSION_TYPE, XDG_SESSION_DESKTOP, XDG_CURRENT_DESKTOP, etc.
 #export XDG_SESSION_TYPE=wayland
 #export XDG_SESSION_DESKTOP=sway
 # gammastep-indicator n'est plus utilisé dans mon Wayland
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index dc65185..b3c322e 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -11,5 +11,18 @@ emulate sh -c '. ~/.profile'
 
 # Start X automatically
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
+  case $HOST in
+    roc | zou)
+      : # Exceptions : On ne fait rien pour ces machines qui sont sous Xorg.
+      ;;
+    *)
+      # Pour toutes les autres on charge le contenu de .config/environment.d
+      # Cf. https://wiki.archlinux.org/title/Environment_variables#Per_Wayland_session
+      # use systemd-environment-d-generator(8) to generate environment, and export those variables
+      set -o allexport
+      source <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+      set +o allexport
+      ;;
+  esac
   exec sway
 fi