From 28902ae068cd66e397ddfdec79421f3d3202fee2 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 2 Feb 2023 17:23:08 +0800
Subject: [PATCH] nixops: fix gnome-keyring/ssh-agent conflict, install geary
 on desktops

---
 nixops/desktop.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixops/desktop.nix b/nixops/desktop.nix
index d4b0a484..e6cd91b9 100644
--- a/nixops/desktop.nix
+++ b/nixops/desktop.nix
@@ -22,6 +22,11 @@ in
             '"/etc/ssh/authorized_keys.d/%s", pw->pw_name)'
         '';
     });
+    gnome = super.gnome // {
+       gnome-keyring = super.gnome.gnome-keyring.overrideAttrs(oa: {
+          configureFlags = oa.configureFlags ++ ["--disable-ssh-agent"];
+        });
+    };
   };
 
   networking.hostName = host;
@@ -90,7 +95,6 @@ in
     PKCS11Provider "${pkgs.opensc}/lib/opensc-pkcs11.so"
     '';
   programs.ssh.startAgent = true;
-  services.gnome.gnome-keyring.enable = pkgs.lib.mkForce false;
   programs.ssh.agentPKCS11Whitelist = "${pkgs.opensc}/lib/opensc-pkcs11.so";
   security.pam.p11.enable = true;
 
@@ -133,7 +137,7 @@ in
 
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
-  environment.gnome.excludePackages = [ pkgs.epiphany pkgs.gnome3.geary ];
+  environment.gnome.excludePackages = [ pkgs.epiphany ];
 
   systemd.suppressedSystemUnits = [
       "hibernate.target"