From 700b56d41adb99bf0607e6b8a5c0a712a8729436 Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Sat, 28 Sep 2024 20:10:46 +0100
Subject: [PATCH] fix

---
 home/tpmssh.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/home/tpmssh.nix b/home/tpmssh.nix
index be01990..e2183f9 100644
--- a/home/tpmssh.nix
+++ b/home/tpmssh.nix
@@ -2,11 +2,7 @@
 {pkgs, config, lib, ...}: {
   home.packages = [ pkgs.ssh-tpm-agent ];
   home.sessionVariables = {
-    SSH_AUTH_SOCK = let
-      maybeProxy = lib.strings.optionalString config.services.gpg-agent.enableSshSupport "-A $(${config.programs.gpg.package}/bin/gpgconf --list-dirs agent-ssh-socket)";
-      cmd = "${pkgs.ssh-tpm-agent} --print-socket${maybeProxy}";
-    in "$(${cmd})";
-    TESTIFICLES = "hello";
+    SSH_AUTH_SOCK = "$(${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent --print-socket)";
   };
   systemd.user.sockets.ssh-tpm-agent = {
     Unit.WantedBy = [ "sockets.target" ];
@@ -26,7 +22,11 @@
       Environment = ''
         SSH_AUTH_SOCK="%t/ssh-tpm-agent.sock"
       '';
-      ExecStart = "${pkgs.ssh-tpm-agent}";
+      ExecStart = "${pkgs.writeShellScriptBin "start-ssh-tpm-agent" (if config.services.gpg-agent.enableSshSupport then ''
+        ${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent -A $(${config.programs.gpg.package}/bin/gpgconf --list-dirs agent-ssh-socket)
+      '' else ''
+        ${pkgs.ssh-tpm-agent}/bin/ssh-tpm-agent
+      '')}/bin/start-ssh-tpm-agent";
       PassEnvironment = "SSH_AGENT_PID";
       SuccessExitStatus = 2;
       Type = "simple";