diff options
| author | Alan Pearce | 2024-11-11 22:13:27 +0100 |
|---|---|---|
| committer | Alan Pearce | 2024-11-12 15:14:37 +0100 |
| commit | 76e18cffd04b20e9aa353df24f34cb7fceb6257f (patch) | |
| tree | 4aa7b3ca59b61a37b4d2913863b78147136e4532 | |
| parent | 0c702c1ea19484f07996d98b608090989701fd23 (diff) | |
| download | nixfiles-76e18cffd04b20e9aa353df24f34cb7fceb6257f.tar.lz nixfiles-76e18cffd04b20e9aa353df24f34cb7fceb6257f.tar.zst nixfiles-76e18cffd04b20e9aa353df24f34cb7fceb6257f.zip | |
marvin: switch back to ssh keys in secure enclave
| -rw-r--r-- | flake.lock | 9 | ||||
| m--------- | private | 0 | ||||
| -rw-r--r-- | system/marvin.nix | 4 | ||||
| -rw-r--r-- | user/settings/darwin.nix | 14 |
4 files changed, 9 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock index 2e82dccd..6b2fc477 100644 --- a/flake.lock +++ b/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" }, diff --git a/private b/private -Subproject 2affab49f584a89d02432ff4705fdec6b8d0cdb +Subproject ca9bcf13988895dbdef43a9b70125ad39604ed2 diff --git a/system/marvin.nix b/system/marvin.nix index 68caa190..e2a1e4e5 100644 --- a/system/marvin.nix +++ b/system/marvin.nix @@ -14,6 +14,10 @@ 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; diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix index 1a30a870..f445e5cb 100644 --- a/user/settings/darwin.nix +++ b/user/settings/darwin.nix @@ -118,19 +118,7 @@ }; 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 |