From 90f5fa3de8af65e84e219ba9f8872b8e19259576 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 12:26:20 +0200 Subject: [PATCH 1/2] home packages: add fd --- home/modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 924357f..4df6e6d 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -104,6 +104,7 @@ let shellcheck mtr ripgrep + fd gitui lazygit pre-commit From 85147a4fd6d956e913e4d6e9091c039121f6c2dc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 25 Jul 2024 16:19:46 +0200 Subject: [PATCH 2/2] home.workmac: enable 1Password SSH agent integration --- home/workmac.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index 8899e9f..043a0f0 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -3,6 +3,7 @@ inputs, config, system, + lib, ... }: @@ -30,15 +31,20 @@ in enable = true; # ssh host config matchBlocks = { - "hydra01" = { + + "*" = { + extraOptions.IdentityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\""; + }; + + "hydra01" = lib.hm.dag.entryAfter ["*"] { hostname = "hydra01.access.whq.gocept.net"; user = "os"; }; - "fcio-whq-jump" = { + "fcio-whq-jump" = lib.hm.dag.entryAfter ["*"] { hostname = "vpn-whq.services.fcio.net"; extraOptions.LogLevel = "Verbose"; }; - "fcio-rzob-jump" = { + "fcio-rzob-jump" = lib.hm.dag.entryAfter ["*"] { hostname = "vpn-rzob.services.fcio.net"; }; };