diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index c5f2b96..bbeef49 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -117,6 +117,12 @@ in
             {
               "$mod" = "SUPER";
 
+              env = [
+                "QT_AUTO_SCREEN_SCALE_FACTOR,1"
+                "QT_QPA_PLATFORM,wayland;xcb"
+                "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
+              ];
+
               exec-once = [
                 "systemctl --user start hyprpolkitagent"
 
@@ -310,19 +316,7 @@ in
     };
 
     environment.sessionVariables = {
-      NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland
-
-      XDG_CURRENT_DESKTOP = "Hyprland";
-      XDG_SESSION_TYPE = "wayland";
-      XDG_SESSION_DESKTOP = "Hyprland";
-
-      QT_AUTO_SCREEN_SCALE_FACTOR = "1";
-      QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-      QT_QPA_PLATFORM = "wayland;xcb";
-
-      ELECTRON_OZONE_PLATFORM_HINT = "auto";
-
-      WLR_DRM_NO_ATOMIC = "1";
+      NIXOS_OZONE_WL = "1";
     };
   };
 }
diff --git a/modules/nixos/system/hardware/gpu/nvidia/default.nix b/modules/nixos/system/hardware/gpu/nvidia/default.nix
index b6eb846..d2c4e74 100644
--- a/modules/nixos/system/hardware/gpu/nvidia/default.nix
+++ b/modules/nixos/system/hardware/gpu/nvidia/default.nix
@@ -32,22 +32,5 @@ in
     };
 
     services.xserver.videoDrivers = [ "nvidia" ];
-    boot.kernelParams = [
-      "nvidia_drm.fbdev=1"
-
-      # TODO: remove after https://github.com/NVIDIA/open-gpu-kernel-modules/pull/692
-      # and similar are merged and build in nixpkgs-unstable.
-      # WARNING: this disables tty output and thus hides boot logs.
-      "initcall_blacklist=simpledrm_platform_driver_init"
-    ];
-
-    environment.sessionVariables = {
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-      LIBVA_DRIVER_NAME = "nvidia";
-      __GL_GSYNC_ALLOWED = "1";
-      __GL_VRR_ALLOWED = "0";
-      NVD_BACKEND = "direct";
-    };
   };
 }
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index 776dae4..7dfecfe 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -48,6 +48,14 @@ in
           "Unknown-1, disable"
         ];
 
+        env = [
+          "LIBVA_DRIVER_NAME,nvidia"
+          "XDG_SESSION_TYPE,wayland"
+          "GBM_BACKEND,nvidia-drm"
+          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
+          "NVD_BACKEND,direct"
+        ];
+
         cursor = {
           no_hardware_cursors = true;
         };