Buildmachines works, maybe ?
This commit is contained in:
parent
9191593dc7
commit
2f76f3be7e
9 changed files with 78 additions and 35 deletions
|
@ -17,5 +17,5 @@
|
||||||
|
|
||||||
deployment.targetHost = "5ce:969c:40d1:9575:f5e:591d:c377:a20b";
|
deployment.targetHost = "5ce:969c:40d1:9575:f5e:591d:c377:a20b";
|
||||||
|
|
||||||
jovian.steam.enable = true;
|
#jovian.steam.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,5 +11,4 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = name;
|
networking.hostName = name;
|
||||||
deployment.tags = config.system.nixos.tags;
|
|
||||||
}
|
}
|
||||||
|
|
7
modules/system/settings/colmena/default.nix
Normal file
7
modules/system/settings/colmena/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
{ config, ... }:
|
||||||
|
{
|
||||||
|
deployment = {
|
||||||
|
allowLocalDeployment = true;
|
||||||
|
tags = config.system.nixos.tags;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./colmena
|
||||||
./font
|
./font
|
||||||
./locale
|
./locale
|
||||||
./logind
|
./logind
|
||||||
|
|
13
modules/system/settings/nix/cache/default.nix
vendored
Normal file
13
modules/system/settings/nix/cache/default.nix
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
nix.settings = {
|
||||||
|
substituters = [
|
||||||
|
"https://colmena.cachix.org"
|
||||||
|
"https://nix-community.cachix.org"
|
||||||
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg="
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,21 +1,19 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./cache
|
||||||
./channels
|
./channels
|
||||||
./distributed
|
./distributed
|
||||||
./gc
|
./maintenence
|
||||||
./unfree
|
./unfree
|
||||||
];
|
];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
package = pkgs.lix;
|
package = pkgs.lix;
|
||||||
settings = {
|
settings.experimental-features = [
|
||||||
auto-optimise-store = true;
|
"flakes"
|
||||||
experimental-features = [
|
"nix-command"
|
||||||
"nix-command"
|
];
|
||||||
"flakes"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use a newer implementation of nixos-rebuild
|
# Use a newer implementation of nixos-rebuild
|
||||||
|
|
|
@ -1,39 +1,59 @@
|
||||||
{ nodes, ... }:
|
{ config, lib, nodes, ... }:
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
buildMachines = with nodes; [
|
buildMachines = with nodes; [
|
||||||
{
|
{
|
||||||
hostName = midas.config.deployment.targetHost;
|
hostName = "midas";
|
||||||
system = midas.config.nixpkgs.localSystem.system;
|
system = midas.config.nixpkgs.hostPlatform.system;
|
||||||
publicHostKey = "AAAAC3NzaC1lZDI1NTE5AAAAIFcFMvrx9/iUZ1mEubf+QF1i3LNTxFhaU/1zFSjdo0kK";
|
supportedFeatures = midas.config.nix.settings.system-features;
|
||||||
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUZjRk12cng5L2lVWjFtRXViZitRRjFpM0xOVHhGaGFVLzF6RlNqZG8wa0sgcm9vdEBraXR0eQo=";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
|
sshKey = "/root/.ssh/buildkey";
|
||||||
|
maxJobs = 8;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostName = kitty.config.deployment.targetHost;
|
hostName = "kitty";
|
||||||
system = kitty.config.nixpkgs.localSystem.system;
|
system = kitty.config.nixpkgs.hostPlatform.system;
|
||||||
publicHostKey = "AAAAC3NzaC1lZDI1NTE5AAAAIIrGmsya5DXKuXO6jNjUlrYHqk49KLzxM/60GXtLRLrL";
|
supportedFeatures = kitty.config.nix.settings.system-features;
|
||||||
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUlyR21zeWE1RFhLdVhPNmpOalVscllIcWs0OUtMenhNLzYwR1h0TFJMckwgcm9vdEBraXR0eQo=";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
|
sshKey = "/root/.ssh/buildkey";
|
||||||
|
maxJobs = 8;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostName = detritus.config.deployment.targetHost;
|
hostName = "detritus";
|
||||||
system = detritus.config.nixpkgs.localSystem.system;
|
system = detritus.config.nixpkgs.hostPlatform.system;
|
||||||
publicHostKey = "AAAAC3NzaC1lZDI1NTE5AAAAIN+GvLro4DVmlvmXcasU1gctIX9qct7mZtElpB735AoL";
|
supportedFeatures = detritus.config.nix.settings.system-features;
|
||||||
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSU4rR3ZMcm80RFZtbHZtWGNhc1UxZ2N0SVg5cWN0N21adEVscEI3MzVBb0wgcm9vdEBkZXRyaXR1cwo=";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
|
sshKey = "/root/.ssh/buildkey";
|
||||||
|
maxJobs = 8;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostName = elder.config.deployment.targetHost;
|
hostName = "elder";
|
||||||
system = elder.config.nixpkgs.localSystem.system;
|
system = elder.config.nixpkgs.hostPlatform.system;
|
||||||
publicHostKey = "AAAAC3NzaC1lZDI1NTE5AAAAIFjmJ6bkuO57gp6GZDEfR1O7krdf5wiqrOBC5pzTDl91";
|
supportedFeatures = elder.config.nix.settings.system-features;
|
||||||
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUZqbUo2Ymt1TzU3Z3A2R1pERWZSMU83a3JkZjV3aXFyT0JDNXB6VERsOTEgcm9vdEBlbGRlcgo=";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
|
sshKey = "/root/.ssh/buildkey";
|
||||||
|
maxJobs = 8;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostName = prophet.config.deployment.targetHost;
|
hostName = "prophet";
|
||||||
system = prophet.config.nixpkgs.localSystem.system;
|
system = prophet.config.nixpkgs.hostPlatform.system;
|
||||||
publicHostKey = "AAAAC3NzaC1lZDI1NTE5AAAAICrp3Y/X2BRUENx+0GMTmB1VDA6SiwkGgdJMHSdMMepM";
|
supportedFeatures = prophet.config.nix.settings.system-features;
|
||||||
|
publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUNycDNZL1gyQlJVRU54KzBHTVRtQjFWREE2U2l3a0dnZEpNSFNkTU1lcE0gcm9vdEBwcm9waGV0Cg==";
|
||||||
protocol = "ssh-ng";
|
protocol = "ssh-ng";
|
||||||
|
sshKey = "/root/.ssh/buildkey";
|
||||||
|
maxJobs = 8;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
distributedBuilds = true;
|
distributedBuilds = true;
|
||||||
settings.trusted-users = [ "root" ];
|
|
||||||
|
settings = {
|
||||||
|
max-jobs = if builtins.elem "server" config.system.nixos.tags then "auto" else 0;
|
||||||
|
trusted-users = [ "root" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
nix.gc = {
|
|
||||||
automatic = true;
|
|
||||||
dates = "weekly";
|
|
||||||
options = "--delete-older-than 7d";
|
|
||||||
};
|
|
||||||
}
|
|
13
modules/system/settings/nix/maintenence/default.nix
Normal file
13
modules/system/settings/nix/maintenence/default.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
nix = let
|
||||||
|
common = {
|
||||||
|
automatic = true;
|
||||||
|
persistent = true;
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
gc = common;
|
||||||
|
optimise = common;
|
||||||
|
settings.auto-optimise-store = true;
|
||||||
|
};
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue