diff --git a/global.nix b/global.nix
index c5eece35..7f95cdb9 100644
--- a/global.nix
+++ b/global.nix
@@ -204,7 +204,7 @@
   # programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = true;
+    # enableSSHSupport = true;
   };
 
   # List services that you want to enable:
diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix
index d198aac5..d659f05d 100644
--- a/modules/nixos/cspark-desktop-niri/home.nix
+++ b/modules/nixos/cspark-desktop-niri/home.nix
@@ -46,7 +46,9 @@ in
       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
       SDL_VIDEODRIVER = "wayland";
       _JAVA_AWT_WM_NONREPARENTING = "1";
-      SSH_ASKPASS = "lxqt-openssh-askpass";
+      SSH_ASKPASS_REQUIRE = "force";
+      SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
+      MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
     };
diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix
index 765ed44a..be9def43 100644
--- a/modules/nixos/cspark-desktop-niri/module.nix
+++ b/modules/nixos/cspark-desktop-niri/module.nix
@@ -104,6 +104,11 @@ in
       ];
     };
 
+    programs.ssh = {
+      enableAskPassword = true;
+      askPassword = "/run/current-system/sw/bin/lxqt-openssh-askpass";
+    };
+
     environment.sessionVariables = {
       TERM = "foot";
       QT_QPA_PLATFORM = "wayland";
@@ -111,7 +116,9 @@ in
       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
       SDL_VIDEODRIVER = "wayland";
       _JAVA_AWT_WM_NONREPARENTING = "1";
-      SSH_ASKPASS = "lxqt-openssh-askpass";
+      SSH_ASKPASS_REQUIRE = "force";
+      SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
+      MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
     };
@@ -122,7 +129,9 @@ in
       QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
       SDL_VIDEODRIVER = "wayland";
       _JAVA_AWT_WM_NONREPARENTING = "1";
-      SSH_ASKPASS = lib.mkForce "lxqt-openssh-askpass";
+      SSH_ASKPASS_REQUIRE = "force";
+      SSH_ASKPASS = lib.mkForce "/run/current-system/sw/bin/lxqt-openssh-askpass";
+      MOZ_ENABLE_WAYLAND = "1";
       # Enable native wayland support for chromium and electron based applications
       NIXOS_OZONE_WL = "1";
     };