diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index bd52f010..39cb9fa6 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -74,7 +74,15 @@ inputs:
       {
         config.programs.dankMaterialShell = { enable = true; enableKeybinds = true; enableSystemd = true; };
       })];
-      services.gnome.gcr-ssh-agent.enable = false;
+      # niri module will auto enable this, disable it to avoid conflict with system ssh-agent and kwallet
+      services.gnome = { gcr-ssh-agent.enable = false; gnome-keyring.enable = inputs.lib.mkForce false; };
+    })
+    # niri setup kwallet
+    (inputs.lib.mkIf (gui.implementation == "niri")
+    {
+      nixos.packages.packages._packages = with inputs.pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
+      xdg.portal.extraPortals = [ inputs.pkgs.kdePackages.kwallet ];
+      security.pam.services.login.kwallet = { enable = true; package = inputs.pkgs.kdePackages.kwallet-pam; };
     })
   ];
 }