diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix
index a55be211..58caefeb 100644
--- a/nix/configurations/vanadium/home/dev.nix
+++ b/nix/configurations/vanadium/home/dev.nix
@@ -17,6 +17,8 @@
     pkgs.nixpkgs-review
     pkgs.shellcheck
 
+    pkgs.fx # json viewer
+
     pkgs.lua-language-server
     pkgs.stylua # lua
     pkgs.nil # nix
diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index 7acc4da2..90f8e80e 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -242,11 +242,16 @@ myStartupHook = do
   spawn "dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY"
 
   io $ do
+    let setEnv' k v = setEnv k v False
     -- 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 `home.sessionVariable` (home-manager) would only effect shells because xmonad is configured with NixOS modules
     -- - 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
+    setEnv' "GTK_IM_MODULE"   "fcitx"
+    setEnv' "QT_IM_MODULE"    "fcitx"
+    setEnv' "XMODIFIERS"      "@im=fcitx"
+    setEnv' "GLFW_IM_MODULE"  "ibus"
+
+    setEnv' "MOZ_USE_XINPUT2" "1" -- Force touchpad for firefox
 
 removedKeybinds :: [(KeyMask, KeySym)]
 removedKeybinds =
diff --git a/nix/homeModules/common/tmux/tmux.conf b/nix/homeModules/common/tmux/tmux.conf
index 2616435c..2de98a16 100644
--- a/nix/homeModules/common/tmux/tmux.conf
+++ b/nix/homeModules/common/tmux/tmux.conf
@@ -10,7 +10,7 @@ set -g default-terminal "tmux-256color" # enable italics
 set -g base-index 1                     # start counting pane number from 1
 set -g renumber-windows on              # auto reorder window number
 set -g mode-keys vi                     # global vi mode
-set -g history-limit 10000              # I want more history
+set -g history-limit 1000000            # I want more history
 
 # Display style
 set -g @FG "#000000"