sail: Enable custom cache
This commit is contained in:
parent
0468835053
commit
82af968372
3 changed files with 12 additions and 1 deletions
|
@ -1,5 +1,8 @@
|
||||||
{ pkgs, ... }:
|
args@{ pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
secret = import ../../secret/hosts/sail.nix;
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../programs/fish.nix
|
../programs/fish.nix
|
||||||
|
@ -11,6 +14,8 @@
|
||||||
|
|
||||||
../programs/bat.nix
|
../programs/bat.nix
|
||||||
|
|
||||||
|
(import ../programs/custom-nix-cache.nix (args // { inherit secret; }))
|
||||||
|
|
||||||
../programs/fzf.nix
|
../programs/fzf.nix
|
||||||
|
|
||||||
../programs/jq.nix
|
../programs/jq.nix
|
||||||
|
|
Binary file not shown.
|
@ -1,6 +1,8 @@
|
||||||
args@{ pkgs, ... }:
|
args@{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
inherit (lib) optionals;
|
||||||
|
|
||||||
secret = import ../../secret/hosts/sail.nix;
|
secret = import ../../secret/hosts/sail.nix;
|
||||||
ssh-keys = import ../shared/ssh-keys.nix;
|
ssh-keys = import ../shared/ssh-keys.nix;
|
||||||
in
|
in
|
||||||
|
@ -25,11 +27,15 @@ in
|
||||||
substituters = [
|
substituters = [
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
"https://nifoc.cachix.org"
|
"https://nifoc.cachix.org"
|
||||||
|
] ++ optionals secret.nix-cache.nifoc.enabled [
|
||||||
|
secret.nix-cache.nifoc.s3Url
|
||||||
];
|
];
|
||||||
|
|
||||||
trusted-public-keys = [
|
trusted-public-keys = [
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
|
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
|
||||||
|
] ++ optionals secret.nix-cache.nifoc.enabled [
|
||||||
|
secret.nix-cache.nifoc.publicKeyValue
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue