From ecc140c6d23bbb954a8b130f4e3136eb3f3076b9 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sun, 7 Sep 2025 17:06:45 -0400
Subject: [PATCH] Fix 1password  ssh agent

---
 configurations/home/srid@infinitude.nix | 29 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/configurations/home/srid@infinitude.nix b/configurations/home/srid@infinitude.nix
index 86ec11b..8a39918 100644
--- a/configurations/home/srid@infinitude.nix
+++ b/configurations/home/srid@infinitude.nix
@@ -1,12 +1,8 @@
 { lib, pkgs, flake, ... }:
-let
-  inherit (flake) inputs;
-  inherit (inputs) self;
-in
 {
   imports = [
-    self.homeModules.default
-    self.homeModules.darwin-only
+    flake.inputs.self.homeModules.default
+    flake.inputs.self.homeModules.darwin-only
   ];
 
   home.username = "srid";
@@ -16,9 +12,22 @@ in
     pkgs.tart
   ];
 
-  # 1password ssh agent
-  home.sessionVariables = {
-    SSH_AUTH_SOCK = "~/Library/Group\\ Containers/2BUA8C4S2C.com.1password/t/agent.sock";
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        extraOptions = {
+          # Configure SSH to use 1Password agent
+          IdentityAgent = "~/Library/Group\\ Containers/2BUA8C4S2C.com.1password/t/agent.sock";
+        };
+      };
+      "sensuous" = {
+        forwardAgent = true;
+      };
+      "pureintent" = {
+        forwardAgent = true;
+      };
+    };
   };
-
 }