diff --git a/home-manager/features/hyprland.nix b/home-manager/features/hyprland.nix
index 323056c..75f54c5 100644
--- a/home-manager/features/hyprland.nix
+++ b/home-manager/features/hyprland.nix
@@ -48,23 +48,6 @@
         "wl-paste -t text -w xclip -selection clipboard"
       ];
 
-      env = [
-        "XCURSOR_SIZE,32"
-        "HYPRCURSOR_SIZE,32"
-        "HYPRCURSOR_THEME,phinger"
-
-        # Nvidia config
-        "LIBVA_DRIVER_NAME,nvidia"
-        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-
-        # For window theming
-        "QT_QPA_PLATFORMTHEME,qt6ct   # for Qt apps"
-        "GTK_THEME,Adwaita-dark"
-
-        # Tell electron apps they should use OZone for Wayland
-        "ELECTRON_OZONE_PLATFORM_HINT,auto"
-      ];
-
       general = {
         gaps_in = 5;
         gaps_out = 10;
@@ -498,4 +481,24 @@
       };
     };
   };
+
+  # UWSM sessions should not use Hyprland's variables but instead use UWSM's variable management.
+  # See https://wiki.hyprland.org/Configuring/Environment-variables/
+  home.file.".config/uwsm/env".text = ''
+    export XCURSOR_SIZE="32"
+    export HYPRCURSOR_SIZE="32"
+    export HYPRCURSOR_THEME="phinger"
+
+    # Nvidia config
+    export LIBVA_DRIVER_NAME="nvidia"
+    export __GLX_VENDOR_LIBRARY_NAME="nvidia"
+
+    # For window theming
+    export QT_QPA_PLATFORMTHEME="qt6ct   # for Qt apps"
+    export GTK_THEME="Adwaita-dark"
+
+    # Tell electron apps they should use OZone for Wayland
+    export ELECTRON_OZONE_PLATFORM_HINT="auto"
+  '';
+
 }