From 82af9683727933dc46921a775d683d7b3dc7ed67 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Tue, 9 Aug 2022 19:14:22 +0200
Subject: [PATCH] sail: Enable custom cache

---
 home/hosts/sail.nix   |   7 ++++++-
 secret/hosts/sail.nix | Bin 427 -> 1115 bytes
 system/hosts/sail.nix |   6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/home/hosts/sail.nix b/home/hosts/sail.nix
index 0ebd77b..55fc3a9 100644
--- a/home/hosts/sail.nix
+++ b/home/hosts/sail.nix
@@ -1,5 +1,8 @@
-{ pkgs, ... }:
+args@{ pkgs, ... }:
 
+let
+  secret = import ../../secret/hosts/sail.nix;
+in
 {
   imports = [
     ../programs/fish.nix
@@ -11,6 +14,8 @@
 
     ../programs/bat.nix
 
+    (import ../programs/custom-nix-cache.nix (args // { inherit secret; }))
+
     ../programs/fzf.nix
 
     ../programs/jq.nix
diff --git a/secret/hosts/sail.nix b/secret/hosts/sail.nix
index 87eb0186298eb31c202cdac46749dec891ae0a33..a8e19b3a0f02e4374ae300a490843dcce3a314fb 100644
GIT binary patch
literal 1115
zcmV-h1f=@_M@dveQdv+`0BKj?0S!o^;`xjBQg5=6(-Afjpm0XO{vZQCI9g7bsTRFW
zw2gTesK;YhN>-RTn@4S_mN7xwXOa}iv{JZ-a7Q+&ZN*WiawRQ%AF@)(&)qz{n&r+~
zN=a!^?wHEfG^yZMf^Wyi?3R0I1z}@LJ_^tLC<_D-tb9pgh+Yis?^bZTW1F@f8O@lt
zWFALCOlN-s+7V|m3Rl8QV@}+Ie_>pg_b5Gvk&sg5_>qsxGIcKl74NTO4$<~sshkvt
zx*XofDR|Z~|E?K$bKH?vmQdCc87~{cq#Xik*rBP;B2}BW?rYvu)~j-n?JkDIpWxts
z*WR4M(7a><x8DAh?80j==fraSLTTjQm%r#smU|^vF7BrVD7RX^2Mk>I$E$CqjdjL@
ztO|pM>JG!LG>jChoz})%fRUpAO>Ef?GXmiY<(5H4-EDu9w{q*}QS)3exEOqmyeBWf
z_3ywLq=kS)OlXXD9-DkxTZI2_=Jm;fkm0<e!5KCXG1YX4RBl3$a;1zVCcE>vjsqj*
zqDU?!ivd(hr--aeTF0EGiK3WQEWXeojbioW*Re(`54Io2c!k2v)X1F|`phLH5bn2;
zE+lZEE@nG5QkSo^ZEsbFwugk4N=Bpb!gp2PaI{&M($?ObSvpTGMYp^dSpbB+EJoyS
z($a<8@n=_kXQY!s=wyCfUe^v_0i4wlC$90OIG)3E!3T-V!$z>ZX^GwLeS3mZu6`u+
z2S#@Qe7Z$%jY}B<$s$}{jsP<Q^bZ}=S7@r}>yJmlL6_*){a-v!E1rPJJaNCAYvEC=
zOF)UP#;~yV%RTosuiDRuS<o)S4ng8=sHy|P!Hn;YgloAx1Dm-TyzZ&;uOgb(%Z9c?
z-Sbx=>Yrr1ZetoG7xcf%0)_%q_fZU|LIJ+>x8qqMQiK=2kY-1Bt%m0R$iI#ORL|NF
z21HH15G+cM`1G0Zsa9c?!b=~?P!$6pXI!$ugHE+@qBwtaa1gs0dSdlACxir_q`Zlr
zmn;KnFPj*itU}HHw-^pAQ4leCIOnUa(_c!c<C4}cNX{ihY20=PDh&Pup&a76R68Q*
zrQA{oKzt$m-|R0{(r(v!3}}|xtrsNT!4xp9n>}Z=?@yifrOL-x>r=p3;wfIgE9}Cv
zms%lvX#A^6{$Lp$%gSpXX<sTxi0{hnuv5usp{oY*#?Ivxw@bHd;6#S+<`pH4Cg}{B
zGOX*@@RRZI5k9?Ecryx$qPDj@l3)C?dlIqnN_y!I6UZUnr~Tt+3^X6G&2NrdB#^pE
z7I+z(4yO9<jmOGl>*W`DbxXRWqyuUGw|YF*E!`4tw5XmRa89*uP}M#KU*nm96Wxb4
zaen!Zkxvy01}&#vR+()%A^SK|+Gak%261uF^8^cl^?oWA4}%p_EG6Fk(AaOQkw2qa
hzLzm3@^#l~hIvU=g(3_Th0IH@Bu)QCwap#RnhB<5Dir_#

literal 427
zcmV;c0aX3~M@dveQdv+`09!KO4pC*6j@5r7`(x`<@?%SOdSCSEm{Ys?X2rJ}E8cm^
zPk8QZVtbKBejQRf%8c&#TcK{w?jc0ARv<VX4fq<=0OGPbRutfs*<GN4K`wSr>}b`p
z<M#O8A;4TYFWosD;OYvxwOuXh=X~6)f=MyL>?m(|M|)p6&1-JpD9y9RU*xf3iC}m2
zGNdQU&8ul~{%I9Z=*YM!fvplD8f5kia8+|Ze&LB7%LOP_&z*hlLGuaICf?~(qg+k5
zTvx@_)lFt47t@Qk0v@3}8KH9=sHxwpCPX_SDVZ`I%1Bzx*OmOV7vCGC{~an0bW8G1
zG$(I^yV0FS$aGfyl0qkL22<NE7w_Dp7V%>XtU)j4Bdtn-_-)5U-u*<b!-s1I3DO;0
zy@UH5D15VLNww7D9E=lJ)5~G6F(PKMHKWesQyl4y+tqg>&OetMfn(CCNoB;b7{+RK
zN|`7LG?(5EMme8%|3IinS<~JU-Q=c2Se$ff`)<xcke=@t$>X65=3ORI6coPl2bgF#
VnE)uI2Z8*IzX-ns6gj^dgWlFm(5C<Z

diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix
index 96a500b..b21286c 100644
--- a/system/hosts/sail.nix
+++ b/system/hosts/sail.nix
@@ -1,6 +1,8 @@
 args@{ pkgs, ... }:
 
 let
+  inherit (lib) optionals;
+
   secret = import ../../secret/hosts/sail.nix;
   ssh-keys = import ../shared/ssh-keys.nix;
 in
@@ -25,11 +27,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
       ];
     };