julian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Fix builder using itself as remote subsituter

Browse Source
This commit is contained in:
Julian Mutter
2025-07-04 14:40:58 +02:00
parent 65a3dcdc08
commit 3bb8db1349
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/aspi/default.nix
View File

@ -4,6 +4,7 @@
../common/global ../common/global
../common/users/julian ../common/users/julian
../common/optional/binarycaches.nix
../common/optional/remote-builder.nix ../common/optional/remote-builder.nix
../common/optional/boot-efi.nix ../common/optional/boot-efi.nix

6
hosts/builder/default.nix
View File

@ -30,8 +30,12 @@
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.nixos.org/" "https://cache.nixos.org/"
"https://hyprland.cachix.org"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
]; ];
trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
trusted-users = ["nix"]; trusted-users = ["nix"];
max-jobs = "auto"; max-jobs = "auto";

20
hosts/common/global/nix.nix
View File

@ -26,26 +26,6 @@
]; ];
# warn-dirty = false; # warn-dirty = false;
# Setup binary caches
nix.settings = {
substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org/"
"https://hyprland.cachix.org"
"http://binarycache.julian-mutter.de"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
];
trusted-users = [
"root"
"@wheel"
]; # needed for devenv to add custom caches
};
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";

25
hosts/common/optional/binarycaches.nix Normal file
View File

@ -0,0 +1,25 @@
{
lib,
outputs,
...
}: {
# Setup binary caches
nix.settings = {
substituters = [
"https://nix-community.cachix.org"
"https://cache.nixos.org/"
"https://hyprland.cachix.org"
"http://binarycache.julian-mutter.de"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
];
trusted-users = [
"root"
"@wheel"
]; # needed for devenv to add custom caches
};
}

1
hosts/kardorf/default.nix
View File

@ -5,6 +5,7 @@
../common/global ../common/global
../common/users/julian ../common/users/julian
../common/users/wolfi ../common/users/wolfi
../common/optional/binarycaches.nix
../common/optional/xserver.nix ../common/optional/xserver.nix
../common/optional/remote-builder.nix ../common/optional/remote-builder.nix

1
hosts/pianonix/default.nix
View File

@ -15,6 +15,7 @@
../common/global ../common/global
../common/users/julian ../common/users/julian
../common/optional/binarycaches.nix
../common/optional/pipewire.nix ../common/optional/pipewire.nix
../common/optional/remote-builder.nix ../common/optional/remote-builder.nix