From d0e8c4bda7b43b197c5ef1ebedcb84a3ad209ef7 Mon Sep 17 00:00:00 2001
From: Peter Rice <peterrice@fastmail.com>
Date: Sun, 23 Aug 2026 23:59:10 -0400
Subject: [PATCH] ssh-agent: reenable

---
 modules/desktop/niri/default.nix | 3 +--
 modules/nixos/nixos.nix          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/desktop/niri/default.nix b/modules/desktop/niri/default.nix
index 17271f1..e8d29bc 100644
--- a/modules/desktop/niri/default.nix
+++ b/modules/desktop/niri/default.nix
@@ -14,8 +14,7 @@
           pkgs.xwayland-satellite
         ];
 
-        # conflicts with gnome keyring
-        programs.ssh.startAgent = false;
+        services.gnome.gcr-ssh-agent.enable = false;
       };
     };
 
diff --git a/modules/nixos/nixos.nix b/modules/nixos/nixos.nix
index 4325c71..cdb147a 100644
--- a/modules/nixos/nixos.nix
+++ b/modules/nixos/nixos.nix
@@ -24,7 +24,7 @@
 
       security.sudo.wheelNeedsPassword = false;
 
-      programs.ssh.startAgent = lib.mkDefault true;
+      programs.ssh.startAgent = true;
 
       services.fstrim.enable = true;
 
-- 
2.51.2