all repos — nixfiles @ 76e18cffd04b20e9aa353df24f34cb7fceb6257f

System and user configuration, managed by nix and home-manager

marvin: switch back to ssh keys in secure enclave
Alan Pearce alan@alanpearce.eu
Mon, 11 Nov 2024 22:13:27 +0100
commit

76e18cffd04b20e9aa353df24f34cb7fceb6257f

parent

0c702c1ea19484f07996d98b608090989701fd23

3 files changed, 9 insertions(+), 18 deletions(-)

jump to
M flake.lockflake.lock
@@ -410,11 +410,10 @@ },     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1724763034,
-        "narHash": "sha256-IX3FlHvdrN1jghNQpFHEhZ7fPX9Bs3YiBp1r/f5lnYo=",
-        "ref": "refs/heads/main",
-        "rev": "2affab49f584a89d02432ff4705fdec6b8d0cdbf",
-        "revCount": 69,
+        "lastModified": 1731419442,
+        "narHash": "sha256-pKX4fJEu8rUdwtDOKjNP/e/MWzGYGqhGIM/9TgcfhGw=",
+        "rev": "ca9bcf13988895dbdef43a9b70125ad39604ed2e",
+        "revCount": 70,
         "type": "git",
         "url": "file:///home/alan/projects/alanpearce.eu/nixfiles/private"
       },
M system/marvin.nixsystem/marvin.nix
@@ -14,6 +14,10 @@ services.activate-system.enable = true; 
   environment.variables.LANG = "en_GB.UTF-8";
 
+  launchd.user.envVariables = {
+    SSH_AUTH_SOCK = "/Users/alan/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
+  };
+
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system.stateVersion = 4;
M user/settings/darwin.nixuser/settings/darwin.nix
@@ -118,19 +118,7 @@ stat = "stat -x";   };
 
   programs.ssh.extraConfig = ''
-    IdentityAgent "~/.strongbox/agent.sock"
-  '';
-
-  home.activation.linkStrongboxSSHAgentSocket = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
-    if [[ ! -d ~/.strongbox ]]
-    then
-      $DRY_RUN_CMD mkdir ~/.strongbox
-    fi
-    if [[ ! -S ~/.strongbox/agent.sock ]]
-    then
-      $DRY_RUN_CMD ln -s $VERBOSE_ARG \
-        ~/Library/Group\ Containers/group.strongbox.mac.mcguill/agent.sock ~/.strongbox/agent.sock
-    fi
+    IdentityAgent ~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh
   '';
 
   # Use GPG from  GPGTools