aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Bump inputs and fix nix-eval-jobs

Browse source
This commit is contained in:
Andrea Ciceri 2024-11-08 10:15:31 +01:00
parent e58e5439d8
commit 8af20e204a
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
3 changed files with 265 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

92
modules/nix/default.nix
View file

@ -1,10 +1,14 @@
{
config,
lib,
fleetFlake,
...
}:
{
{ config, lib, fleetFlake, ... }: {
nixpkgs.overlays = [
(final: _: {
nix-eval-job =
fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs
// {
nix = final.nix;
};
})
];
nix = {
optimise.automatic = true;
@ -13,10 +17,7 @@
settings = {
auto-optimise-store = true;
trusted-users = [
"root"
"@wheel"
];
trusted-users = [ "root" "@wheel" ];
netrc-file = "/etc/nix/netrc";
substituters = [
# "s3://cache?profile=default&region=eu-south-1&scheme=https&endpoint=cache.aciceri.dev"
@ -48,32 +49,29 @@
options = "--delete-older-than 180d";
};
registry = lib.mkForce (
{
nixpkgs.to = {
type = "path";
path = fleetFlake.inputs.nixpkgs;
};
n.to = {
type = "path";
path = fleetFlake.inputs.nixpkgs;
};
}
// (lib.optionalAttrs (builtins.hasAttr "ccr" config) {
nixfleet.to = {
type = "path";
path = "/home/${config.ccr.username}/projects/aciceri/nixfleet";
};
fleet.to = {
type = "path";
path = "/home/${config.ccr.username}/projects/aciceri/nixfleet";
};
ccrEmacs.to = {
type = "path";
path = "/home/${config.ccr.username}/.config/emacs";
};
})
);
registry = lib.mkForce ({
nixpkgs.to = {
type = "path";
path = fleetFlake.inputs.nixpkgs;
};
n.to = {
type = "path";
path = fleetFlake.inputs.nixpkgs;
};
} // (lib.optionalAttrs (builtins.hasAttr "ccr" config) {
nixfleet.to = {
type = "path";
path = "/home/${config.ccr.username}/projects/aciceri/nixfleet";
};
fleet.to = {
type = "path";
path = "/home/${config.ccr.username}/projects/aciceri/nixfleet";
};
ccrEmacs.to = {
type = "path";
path = "/home/${config.ccr.username}/.config/emacs";
};
}));
distributedBuilds = true;
buildMachines =
@ -81,26 +79,16 @@
hostName = "sisko.fleet";
system = "aarch64-linux";
maxJobs = 7;
supportedFeatures = [
"kvm"
"nixos-test"
"big-parallel"
"benchmark"
];
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
protocol = "ssh-ng";
sshUser = "root";
sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";
}
++ (lib.lists.optional (config.networking.hostName == "picard") {
hostName = "mac.staging.mlabs.city?remote-program=/run/current-system/sw/bin/nix-store";
} ++ (lib.lists.optional (config.networking.hostName == "picard") {
hostName =
"mac.staging.mlabs.city?remote-program=/run/current-system/sw/bin/nix-store";
system = "x86_64-darwin";
maxJobs = 4;
supportedFeatures = [
"kvm"
"nixos-test"
"big-parallel"
"benchmark"
];
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
protocol = "ssh";
sshUser = "root";
sshKey = "/home/${config.ccr.username}/.ssh/id_rsa";