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 87eb018..a8e19b3 100644 Binary files a/secret/hosts/sail.nix and b/secret/hosts/sail.nix differ 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 ]; };