Rename root keys to host keys, add lime's host key

This commit is contained in:
Riley Apeldoorn 2023-06-19 19:16:27 +02:00
parent 67bfe4b47a
commit c3eb805bdf
7 changed files with 27 additions and 21 deletions

Binary file not shown.

View file

@ -1,10 +1,10 @@
let strawberry = [
(builtins.readFile ./system/strawberry/keys/riley.pub)
(builtins.readFile ./system/strawberry/keys/root.pub)
(builtins.readFile ./system/strawberry/keys/host.pub)
];
lime = [
(builtins.readFile ./system/lime/keys/riley.pub)
(builtins.readFile ./system/lime/keys/root.pub)
(builtins.readFile ./system/lime/keys/host.pub)
];
dev-lt-63 = [
(builtins.readFile ./system/dev-lt-63/keys/riley.pub)

View file

@ -5,15 +5,29 @@ let cfg = config.custom.nix;
in with lib; {
options.custom.nix = {
distributedBuilds.enable = mkEnableOption "distributed builds on strawberry";
distributedBuilds.enable =
(mkEnableOption "distributed builds on strawberry") // { default = true; };
};
# TODO: Add strawberry as a build machine here
config = {
config = mkMerge [
{
nixpkgs.config.allowUnfree = true;
nix = {
distributedBuilds = true;
buildMachines = [{
extraOptions = ''
experimental-features = nix-command flakes
'';
registry.nixpkgs.flake = nixpkgs;
registry.pwnix.flake = pwnix;
settings.trusted-users = [
"@wheel"
"root"
];
};
}
(mkIf cfg.distributedBuilds.enable {
nix.distributedBuilds = true;
nix.buildMachines = [{
hostName = "strawberry";
sshUser = "nix-build";
sshKey = "/etc/ssh/ssh_host_ed25519_key";
@ -30,16 +44,7 @@ in with lib; {
"kvm"
];
}];
extraOptions = ''
experimental-features = nix-command flakes
'';
registry.nixpkgs.flake = nixpkgs;
registry.pwnix.flake = pwnix;
settings.trusted-users = [
"@wheel"
"root"
})
];
};
};
}

View file

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOF9N5hsJEdm/jBxAGjQdQg7s/EFheZJK3KHyNkt5uFc root@lime

View file

@ -1 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOF9N5hsJEdm/jBxAGjQdQg7s/EFheZJK3KHyNkt5uFc root@lime
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAPycsXjXLc3yzqSxG0sAHgQsGZ3KqOgprW2dPmAErAQ root@lime