From 78461b199fdfb607ed0151d9ba148f16bf4a2d2f Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Fri, 28 Nov 2025 12:33:38 +0800
Subject: [PATCH] module.system.gui: niri use gnome keyring

---
 modules/system/gui.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/modules/system/gui.nix b/modules/system/gui.nix
index 5369cb88..d7473e75 100644
--- a/modules/system/gui.nix
+++ b/modules/system/gui.nix
@@ -70,22 +70,8 @@ inputs:
       {
         config.programs.dankMaterialShell = { enable = true; niri.enableKeybinds = true; systemd.enable = true; };
       })];
-      # 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; };
-      services.dbus.packages = inputs.lib.singleton
-        (inputs.pkgs.writeTextDir "share/dbus-1/services/org.freedesktop.secrets.service"
-        ''
-          [D-BUS Service]
-          Name=org.freedesktop.secrets
-          Exec=${inputs.pkgs.kdePackages.kwallet}/bin/kwalletd6
-        '');
+      # niri module will auto enable this, disable it to avoid conflict with system ssh-agent
+      services.gnome.gcr-ssh-agent.enable = false;
     })
   ];
 }