From ef64652150efeed976b606985f96516006150d60 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Thu, 17 Mar 2022 10:33:21 +0100
Subject: [PATCH] Use 1PW as the SSH agent

---
 config/ssh.nix    | 12 +++++-------
 programs/fish.nix | 10 ----------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/config/ssh.nix b/config/ssh.nix
index d542250..8ff4c70 100644
--- a/config/ssh.nix
+++ b/config/ssh.nix
@@ -12,9 +12,7 @@ in
     hashKnownHosts = true;
     serverAliveInterval = 60;
     extraConfig = ''
-      IgnoreUnknown UseKeychain,AddKeysToAgent
-      UseKeychain yes
-      AddKeysToAgent yes
+      IdentityAgent ~/.ssh/1password.sock
       UpdateHostKeys ask
       VerifyHostKeyDNS yes
     '';
@@ -25,8 +23,8 @@ in
       "git.app.nedeco.de" = {
         port = 22;
         user = "git";
+        identityFile = "~/.ssh/nedeco_gitlab.pub";
         identitiesOnly = true;
-        identityFile = "~/.ssh/nedeco_gitlab";
         compression = true;
       };
 
@@ -34,8 +32,8 @@ in
         host = "10.0.90.*";
         port = 22;
         user = "root";
+        identityFile = "~/.ssh/nedeco.pub";
         identitiesOnly = true;
-        identityFile = "~/.ssh/nedeco";
       };
 
       # Private
@@ -43,8 +41,8 @@ in
       "github.com" = {
         port = 22;
         user = "git";
+        identityFile = "~/.ssh/GitHub.pub";
         identitiesOnly = true;
-        identityFile = "~/.ssh/GitHub";
         compression = true;
       };
 
@@ -66,8 +64,8 @@ in
         hostname = "10.0.0.100";
         port = 22;
         user = "daniel";
+        identityFile = "~/.ssh/NAS.pub";
         identitiesOnly = true;
-        identityFile = "~/.ssh/freenas";
         compression = true;
       };
     };
diff --git a/programs/fish.nix b/programs/fish.nix
index b263ae1..a9871db 100644
--- a/programs/fish.nix
+++ b/programs/fish.nix
@@ -25,16 +25,6 @@
         };
       }
 
-      {
-        name = "ssh-agent-macos";
-        src = pkgs.fetchFromGitHub {
-          owner = "nifoc";
-          repo = "ssh-agent-macos.fish";
-          rev = "a9dde730a462b3b327cabf1a56a643a12b0aea3d";
-          sha256 = "e0YrQzcgkHvFiYuXluS+TZ/hjDneK33xcWbo7sjXWNA=";
-        };
-      }
-
       {
         name = "done-fish";
         src = pkgs.fetchFromGitHub {