From 20fa17d09c36d55d604f8006651d6a5e6b62ab51 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Tue, 21 Jun 2022 21:15:01 -0400
Subject: [PATCH] Use a more compatible ssh-agent

---
 home/common-linux.nix | 5 +++--
 home/fish/fish.nix    | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/home/common-linux.nix b/home/common-linux.nix
index 735fb61..f691266 100644
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@@ -12,10 +12,11 @@ with lib; {
     ## Gnome-keyring
     services.gnome-keyring = {
       enable = true;
-      components = [ "pkcs11" "secrets" "ssh" ];
+      components = [ "pkcs11" "secrets" ];
     };
     services.gpg-agent.enable = true;
-    services.gpg-agent.pinentryFlavor = "gnome3";
+    services.gpg-agent.pinentryFlavor = "curses";
+    services.gpg-agent.enableSshSupport = true;
 
     # Git "safe-directory"
     programs.git.extraConfig.safe.directory = [
diff --git a/home/fish/fish.nix b/home/fish/fish.nix
index 2c0b914..19f516b 100644
--- a/home/fish/fish.nix
+++ b/home/fish/fish.nix
@@ -32,11 +32,6 @@
       if test -e /opt/homebrew/bin/brew
         /opt/homebrew/bin/brew shellenv | source
       end
-
-      # Gnome-keyring startup
-      if type -q gnome-keyring-daemon
-        set -x (gnome-keyring-daemon | string split "=")
-      end
     '';
 
     interactiveShellInit = ''