diff --git a/home-manager/linux/programs/hyprland.nix b/home-manager/linux/programs/hyprland.nix
index b66fc63..e2001ca 100644
--- a/home-manager/linux/programs/hyprland.nix
+++ b/home-manager/linux/programs/hyprland.nix
@@ -48,8 +48,8 @@ in with lib; {
             config.home.sessionVariables))}
 
         # Setup missing XDG variables
-        env = XDG_SESSION_TYPE,wayland
-        env = XDG_SESSION_DESKTOP,Hyprland
+        # env = XDG_SESSION_TYPE,wayland
+        # env = XDG_SESSION_DESKTOP,Hyprland
 
         # Make applications respect wayland
         env = GDK_BACKEND,wayland,x11
@@ -203,8 +203,21 @@ in with lib; {
         bindr = CAPS, caps_lock, exec, swayosd --caps-lock
 
         # systemd integration
-        exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 2 && systemctl --user start hyprland-session.target
-
+        exec-once=dbus-update-activation-environment --systemd ${
+          lib.concatStringsSep "" ([
+            "DISPLAY"
+            "WAYLAND_DISPLAY"
+            "HYPRLAND_INSTANCE_SIGNATURE"
+            "XDG_CURRENT_DESKTOP"
+            "XDG_SESSION_TYPE"
+            "XDG_SESSION_DESKTOP"
+            "XDG_DESKTOP_PORTAL_DIR"
+            "GDK_BACKEND"
+            "QT_QPA_PLATFORM"
+            "SDL_VIDEODRIVER"
+            "CLUTTER_BACKEND"
+          ] ++ builtins.attrNames config.home.sessionVariables)
+        } && sleep 2 && systemctl --user start hyprland-session.target
 
         ## Window rules