From d0bbf946239d40e439ab1280a14a0cc725826468 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Thu, 24 Mar 2022 00:01:19 -0400 Subject: [PATCH] Fix env vars for DM change --- modules/applications/firefox.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix index 12c69d8..1d92f6c 100644 --- a/modules/applications/firefox.nix +++ b/modules/applications/firefox.nix @@ -13,10 +13,15 @@ in with lib; { }; config = mkIf cfg.enable { - home-manager.users.james = { - # Enable touch controls. - home.sessionVariables = { MOZ_USE_XINPUT2 = 1; }; + environment.sessionVariables = { + MOZ_USE_XINPUT2 = "1"; + } // (if graphical.protocol == "Wayland" then { + MOZ_ENABLE_WAYLAND = "1"; + } else + { }) + // (if sway_cfg.enable then { XDG_CURRENT_DESKTOP = "sway"; } else { }); + home-manager.users.james = { programs.firefox = { enable = true; package = pkgs.firefox.override {