marvin: switch back to ssh keys in secure enclave
3 files changed, 9 insertions(+), 18 deletions(-)
M flake.lock → flake.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.nix → system/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.nix → user/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