hs as builder for basado

This commit is contained in:
ant 2025-10-04 17:25:54 +02:00
parent 69baac502c
commit ad97f8329a
3 changed files with 21 additions and 2 deletions

View file

@ -107,4 +107,17 @@ in
services.udev.packages = [ services.udev.packages = [
pkgs.android-udev-rules pkgs.android-udev-rules
]; ];
nix.distributedBuilds = true;
nix.settings.builders-use-substitutes = true;
nix.buildMachines = [
{
hostName = "192.168.1.5";
protocol = "ssh-ng";
sshUser = "remotebuild";
sshKey = "/home/ant/.ssh/id_ed25519";
system = pkgs.stdenv.hostPlatform.system;
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
}
];
} }

View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let sshKeys = with (import ../sshKeys.nix); [ let sshKeys = with (import ../sshKeys.nix); [
hs hs
basado
]; ];
in in
{ {
@ -16,4 +17,9 @@ in
users.groups.remotebuild = {}; users.groups.remotebuild = {};
nix.settings.extra-trusted-users = [ "remotebuild" ]; nix.settings.extra-trusted-users = [ "remotebuild" ];
nix.settings.extra-system-features = [
"gccarch-x86-64-v2"
"gccarch-x86-64-v3"
"gccarch-znver2"
];
} }

View file

@ -18,6 +18,7 @@ in {
../common.nix ../common.nix
../forgejo.nix ../forgejo.nix
(import ../remote-disk-unlock.nix ["r8169"] sshKeys) (import ../remote-disk-unlock.nix ["r8169"] sshKeys)
../builder.nix
]; ];
boot = { boot = {
@ -146,7 +147,6 @@ in {
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.settings.builders-use-substitutes = true; nix.settings.builders-use-substitutes = true;
nix.buildMachines = [ nix.buildMachines = [
{ {
hostName = "192.168.1.2"; hostName = "192.168.1.2";
@ -154,7 +154,7 @@ in {
sshUser = "remotebuild"; sshUser = "remotebuild";
sshKey = "/home/ant/.ssh/id_ed25519"; sshKey = "/home/ant/.ssh/id_ed25519";
system = pkgs.stdenv.hostPlatform.system; system = pkgs.stdenv.hostPlatform.system;
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ]; supportedFeatures = [ "nixos-test" "big-parallel" "kvm" "gccarch-x86-64-v3" ];
} }
]; ];
} }