From 6a64411c0aede49f0fce1909dc32b9737f18fcb4 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Tue, 1 Mar 2022 02:05:02 +0000 Subject: [PATCH] Only use secretive ssh auth if on mac --- home/default.nix | 2 ++ home/macs.nix | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/home/default.nix b/home/default.nix index 3da35b8..bde94a2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -69,5 +69,7 @@ in { fzf.enable = true; + ssh.enable = true; + }; } diff --git a/home/macs.nix b/home/macs.nix index e6bd4e2..cb181da 100644 --- a/home/macs.nix +++ b/home/macs.nix @@ -1,7 +1,7 @@ -{ ... }: { - home.sessionVariables = { +{ pkgs, lib, ... }: { # Use secretive for SSH agent - "SSH_AUTH_SOCK" = - "/Users/$USERNAME/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; + programs.ssh.matchBlocks.all = lib.mkIf pkgs.stdenv.isDarwin { + host = "*"; + extraOptions."IdentityAgent" = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; }; }