From 808dfa95ae640f7e333b3e96813e806139668701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 20 Aug 2025 17:53:36 +0200
Subject: [PATCH] vanadium/xmonad: keep some env var config

Revert "home/firefox: set MOZ_USE_XINPUT2=1"

This reverts commit 7e5116f55dcc44fa58c8a07f096d17cd3677961c.

Revert "home/fcitx: set GLFW_IM_MODULE"

This reverts commit 7d949dcce26f7ebe9f7c12c6dee3076b83cb3167.
---
 nix/configurations/vanadium/home/xmonad/xmonad.hs | 8 ++++++++
 nix/homeModules/common/fcitx5/default.nix         | 4 ----
 nix/homeModules/common/firefox.nix                | 4 ----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index 9a4e1054..14b850b9 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -24,6 +24,7 @@ import XMonad.Util.SpawnOnce
 
 import Data.Map.Strict              qualified as M
 import Graphics.X11.ExtraTypes.XF86
+import System.Posix
 
 import Leanamonad.Layouts.ReflectMsg
 import Leanamonad.GreekChar
@@ -77,6 +78,13 @@ main =
           -- https://wiki.archlinux.org/title/GNOME/Keyring#Using_gnome-keyring-daemon_outside_desktop_environments_(KDE,_GNOME,_XFCE,_...)
           spawn "dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY"
 
+          io $ do
+            -- This is done here because:
+            -- - setting `home.sessionVariable` (home-manager) would only effect shells, probably due to the order of launched processes blah blah
+            -- - setting `environment.sessionVariables` (NixOS) would make my set up less portable
+            putEnv "GLFW_IM_MODULE=ibus"  -- Make sure kitty knows how to talk to fcitx
+            putEnv "MOZ_USE_XINPUT2=1"    -- Force touchpad for firefox
+
       , layoutHook =
           let tallr = reflectMsg . reflectHoriz
                       $ ResizableTall 1 (1/10) (3/7) []
diff --git a/nix/homeModules/common/fcitx5/default.nix b/nix/homeModules/common/fcitx5/default.nix
index d2d43a6f..d0e86339 100644
--- a/nix/homeModules/common/fcitx5/default.nix
+++ b/nix/homeModules/common/fcitx5/default.nix
@@ -22,8 +22,4 @@ in {
   xdg.configFile = lib.mkIf cfg.enable {
     "fcitx5".source = "${./fcitx}";
   };
-
-  home.sessionVariables = lib.mkIf cfg.enable {
-    GLFW_IM_MODULE = "ibus"; # make kitty aware of fcitx via ibus interface
-  };
 }
diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix
index c5666266..dccb7d8a 100644
--- a/nix/homeModules/common/firefox.nix
+++ b/nix/homeModules/common/firefox.nix
@@ -105,8 +105,4 @@ in {
       "text/html" = ["firefox.desktop"];
     };
   };
-
-  home.sessionVariables = lib.mkIf cfg.enable {
-    MOZ_USE_XINPUT2 = "1"; # Better scrolling
-  };
 }