daniel/dotfiles
1
0
Fork 0
Code Activity Actions

attic: Enable on systems

Browse source
This commit is contained in:
Daniel Kempkens 2023-04-05 13:12:40 +02:00
parent a6db9898e2
commit c3f4613074
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
5 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
secret/shared/nix-netrc Normal file
View file

Binary file not shown.

5
system/hosts/Styx.nix
View file

@ -20,19 +20,21 @@
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org" "https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
"https://attic.cache.daniel.sx/nifoc-systems"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
]; ];
trusted-users = [ "@admin" ]; trusted-users = [ "@admin" ];
}; };
extraOptions = '' extraOptions = ''
post-build-hook = /Users/daniel/.config/nixpkgs/home/programs/scripts/attic-system-cache post-build-hook = ${../../home/programs/scripts/attic-system-cache}
''; '';
configureBuildUsers = true; configureBuildUsers = true;
@ -70,6 +72,7 @@
environment = { environment = {
darwinConfig = "$HOME/.config/nixpkgs/system/hosts/Styx.nix"; darwinConfig = "$HOME/.config/nixpkgs/system/hosts/Styx.nix";
etc."nix/netrc".source = ../../secret/shared/nix-netrc;
}; };
services = { services = {

5
system/hosts/attic.nix
View file

@ -32,12 +32,14 @@ in
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org" "https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
"https://attic.cache.daniel.sx/nifoc-systems"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
"nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
]; ];
}; };
@ -52,9 +54,12 @@ in
extra-platforms = aarch64-linux extra-platforms = aarch64-linux
keep-derivations = true keep-derivations = true
keep-outputs = true keep-outputs = true
post-build-hook = ${../../home/programs/scripts/attic-system-cache}
''; '';
}; };
environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;
boot = { boot = {
cleanTmpDir = true; cleanTmpDir = true;

11
system/hosts/sail.nix
View file

@ -19,6 +19,8 @@ in
../nixos/atuin-sync.nix ../nixos/atuin-sync.nix
../nixos/attic.nix
../nixos/anonymous-overflow.nix ../nixos/anonymous-overflow.nix
(import ../nixos/freshrss.nix (args // { inherit secret; })) (import ../nixos/freshrss.nix (args // { inherit secret; }))
@ -61,16 +63,14 @@ in
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://wurzelpfropf.cachix.org" "https://wurzelpfropf.cachix.org"
"https://nifoc.cachix.org" "https://nifoc.cachix.org"
] ++ optionals secret.nix-cache.nifoc.enabled [ "https://attic.cache.daniel.sx/nifoc-systems"
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="
"wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0=" "wurzelpfropf.cachix.org-1:ilZwK5a6wJqVr7Fyrzp4blIEkGK+LJT0QrpWr1qBNq0="
"nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II=" "nifoc.cachix.org-1:ymuftq7RgN/lf/iWXFK8gpwDSAGFaGBeliWe9u6q8II="
] ++ optionals secret.nix-cache.nifoc.enabled [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU="
secret.nix-cache.nifoc.publicKeyValue
]; ];
}; };
@ -85,9 +85,12 @@ in
extra-platforms = aarch64-linux extra-platforms = aarch64-linux
keep-derivations = true keep-derivations = true
keep-outputs = true keep-outputs = true
post-build-hook = ${../../home/programs/scripts/attic-system-cache}
''; '';
}; };
environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;
boot = { boot = {
cleanTmpDir = true; cleanTmpDir = true;

5
system/nixos/attic.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.attic-client ];
}