From f6bd6847c4d53bbb592ee6da8b9915d4f59a9b0c Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 23 Mar 2026 20:50:31 -0400
Subject: [PATCH] controlpersist

---
 configurations/home/srid@zest.nix           |  1 +
 configurations/nixos/pureintent/default.nix |  1 +
 modules/home/cli/controlpersist.nix         | 15 +++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 modules/home/cli/controlpersist.nix

diff --git a/configurations/home/srid@zest.nix b/configurations/home/srid@zest.nix
index 81aba0b..eb3f2e8 100644
--- a/configurations/home/srid@zest.nix
+++ b/configurations/home/srid@zest.nix
@@ -9,6 +9,7 @@ in
     flake.inputs.self.homeModules.default
     flake.inputs.self.homeModules.darwin-only
     "${homeMod}/gui/1password.nix"
+    "${homeMod}/cli/controlpersist.nix"
     "${homeMod}/claude-code"
 
     "${homeMod}/work/juspay.nix"
diff --git a/configurations/nixos/pureintent/default.nix b/configurations/nixos/pureintent/default.nix
index d07c06a..58797d7 100644
--- a/configurations/nixos/pureintent/default.nix
+++ b/configurations/nixos/pureintent/default.nix
@@ -18,6 +18,7 @@ in
   users.users.${flake.config.me.username}.linger = true;
   home-manager.sharedModules = [
     "${homeMod}/cli/ssh-agent-forwarding.nix"
+    "${homeMod}/cli/controlpersist.nix"
     "${homeMod}/claude-code"
     "${homeMod}/work/juspay.nix"
     "${homeMod}/services/vira.nix"
diff --git a/modules/home/cli/controlpersist.nix b/modules/home/cli/controlpersist.nix
new file mode 100644
index 0000000..c36f52d
--- /dev/null
+++ b/modules/home/cli/controlpersist.nix
@@ -0,0 +1,15 @@
+{ ... }:
+let
+  controlMasterOpts = {
+    ControlMaster = "auto";
+    ControlPath = "~/.ssh/sockets/%r@%h-%p";
+    ControlPersist = "900";
+  };
+in
+{
+  programs.ssh.matchBlocks = {
+    "pureintent".extraOptions = controlMasterOpts;
+    "sincereintent".extraOptions = controlMasterOpts;
+    "zest".extraOptions = controlMasterOpts;
+  };
+}