From fe7742c8e08305d5bba7ff7664b13bff515e9c94 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Tue, 9 Aug 2022 20:54:07 +0200 Subject: [PATCH] adsb-antenna: Custom nix cache --- home/hosts/adsb-antenna.nix | 7 ++++++- secret/hosts/adsb-antenna.nix | Bin 198 -> 886 bytes system/hosts/adsb-antenna.nix | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/home/hosts/adsb-antenna.nix b/home/hosts/adsb-antenna.nix index 79585e0..c3f6fb1 100644 --- a/home/hosts/adsb-antenna.nix +++ b/home/hosts/adsb-antenna.nix @@ -1,5 +1,8 @@ -{ pkgs, ... }: +args@{ pkgs, ... }: +let + secret = import ../../secret/hosts/adsb-antenna.nix; +in { imports = [ ../programs/fish.nix @@ -9,6 +12,8 @@ ../programs/bat.nix + (import ../programs/custom-nix-cache.nix (args // { inherit secret; })) + ../programs/fzf.nix ../programs/jq.nix diff --git a/secret/hosts/adsb-antenna.nix b/secret/hosts/adsb-antenna.nix index 13174cbb37a2d7e7813a1e13e5e587f21c3d35f6..15e14b9b4f172563d0b2a4c1fac9857cbfbd027d 100644 GIT binary patch literal 886 zcmV-+1Bv_qM@dveQdv+`00f0KSeZ>k&q>CWQlpyVuUbkAt?`Oh4V9!}p5XO0LF$5x z=&FP6#f?aJ#@J#EIn*E;0Z+Tago_|z7#kJ%3$dWa!CXQ5FYJ)ZX1+HYh<2T`B}wxJ z?El$y`x2n{n_sp!t9zBt!RW{5n1Qg>J<^dut|6K31wI7 z%$lWphP$$44UKGXjhzc71E5w5_%QEn;QqBPVb@${9m6(v=BoMm|7ve2oO^mgx1hQ* zA-~_L>&F?|8`ay?H~x9IFTVX&KsT`XVKZ71$u?LD3i*G>7NdO`LM14BDeVEcRlEd$ z{rBoEQ1kRy07`a&wyAHf%W=%MnQR$lN)r27YbKilBdJbxfkrH!Ibs4_*;f^U7Lix0 zD<{`>yLpsYJm_sH&^GY=%8|36(_F*G9h2Q$v3jark+|HLQQbX?*C7XW9lg(9X06x| zPK3V0D83DgCO*bfs>UdBZQ3-|V5Ot3R{+$3k>{bW-2KARjg&g!KCC&6jtCze737Wa zCOzx4MpB|)yu)%o8zd~-Lb>pXNko)1DtDV%G@4^Uy62Mz+J)LI%!R9AKBx`w!i@^< zSE(N1Kw@PqlnUnd;XF5Lo3d9U{6&Y^N03kvS37EF^VatKo1(wk*7D}_lLbLZm}H*q z$8aO+fy=<)X(tJ}FL0kuOS_iaWx$cLTdS`C!`@3!+ikDKIh|Tk4tK4)a)pBv4 zJ!{TrzOLyY$b85mJd;;Wkj=!zFiGZ#|iUFEYo_VxI@P8OZHQUH=7e2 z6pSut7GGy6Yc7UTDlS M+vrjI!W5GG{c+W|$^ZZW literal 198 zcmV;%06G5vM@dveQdv+`01Vue?S0;3H&N(4y+C5_TKa3 zNjT#ra13l3-F(O%6dbqL)%Gz=<@}b*@JCx7V8*UdIpo*C%B5Vd`(YM`qp5eq63ADoizhkx>~9d*;iIY1uEUZHvumG8l%EO=Hl@5? Aod5s; diff --git a/system/hosts/adsb-antenna.nix b/system/hosts/adsb-antenna.nix index d10c331..ea67a38 100644 --- a/system/hosts/adsb-antenna.nix +++ b/system/hosts/adsb-antenna.nix @@ -1,6 +1,8 @@ -{ pkgs, ... }: +args@{ pkgs, lib, ... }: let + inherit (lib) optionals; + secret = import ../../secret/hosts/adsb-antenna.nix; ssh-keys = import ../shared/ssh-keys.nix; in @@ -24,11 +26,15 @@ in substituters = [ "https://nix-community.cachix.org" "https://nifoc.cachix.org" + ] ++ optionals secret.nix-cache.nifoc.enabled [ + secret.nix-cache.nifoc.s3Url ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" + ] ++ optionals secret.nix-cache.nifoc.enabled [ + secret.nix-cache.nifoc.publicKeyValue ]; };