From c03e4c36b0796e5ab49768e28183a4aecb257bb5 Mon Sep 17 00:00:00 2001
From: Narice <narice@tutanota.com>
Date: Sat, 19 Nov 2022 20:37:16 +0100
Subject: [PATCH] Setting wayland environment variables at startup (#1045)

* Nix modules: removed GDK_BACKEND env variable

* setting wayland environment variables at startup

setting XDG_BACKEND and _JAVA_AWT_WM_NONREPARENTING in main.cpp
removed these variables from nix modules recommended environemnt
removed XCURSOR_SIZE from nix modules as it is already set

* Making _JAVA_AWT_WM_NONREPARENTING not overwritten
---
 nix/hm-module.nix | 4 ----
 nix/module.nix    | 4 ----
 src/main.cpp      | 2 ++
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/nix/hm-module.nix b/nix/hm-module.nix
index d8ac2be2..ac149985 100644
--- a/nix/hm-module.nix
+++ b/nix/hm-module.nix
@@ -92,11 +92,7 @@ in {
       ++ lib.optional cfg.xwayland.enable pkgs.xwayland;
 
     home.sessionVariables = lib.mkIf cfg.recommendedEnvironment {
-      GDK_BACKEND = "wayland,x11";
-      _JAVA_AWT_WM_NONREPARENTING = "1";
       NIXOS_OZONE_WL = "1";
-      XCURSOR_SIZE = toString config.home.pointerCursor.size or "24";
-      XDG_SESSION_TYPE = "wayland";
     };
 
     xdg.configFile."hypr/hyprland.conf" = {
diff --git a/nix/module.nix b/nix/module.nix
index a4e85d69..8d822b0c 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -47,11 +47,7 @@ in {
       systemPackages = lib.optional (cfg.package != null) cfg.package;
 
       sessionVariables = mkIf cfg.recommendedEnvironment {
-        GDK_BACKEND = "wayland,x11";
-        _JAVA_AWT_WM_NONREPARENTING = "1";
         NIXOS_OZONE_WL = "1";
-        XCURSOR_SIZE = "24";
-        XDG_SESSION_TYPE = "wayland";
       };
     };
     fonts.enableDefaultFonts = mkDefault true;
diff --git a/src/main.cpp b/src/main.cpp
index 122127fd..9f34c088 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,8 @@ int main(int argc, char** argv) {
     for (auto i = 0; i < argc; ++i)
         cmd += std::string(i == 0 ? "" : " ") + argv[i];
     setenv("HYPRLAND_CMD", cmd.c_str(), 1);
+    setenv("XDG_BACKEND", "wayland", 1);
+    setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 0);
 
     // parse some args
     std::string configPath;