set hostName and domain in nixos config directly

This commit is contained in:
Pim Kunis 2024-01-28 12:55:58 +01:00
parent 371b851ca5
commit bd5dc4b883
5 changed files with 55 additions and 45 deletions

View file

@ -40,18 +40,19 @@
pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
machines = import ./nixos/machines;
physicalMachines = lib.filterAttrs (n: v: v.type == "physical") machines;
# TODO: Maybe use mergeAttrLists
# TODO: Use mergeAttrLists
mkNixosSystems = systemDef:
nixpkgs.lib.foldlAttrs
(acc: name: machine:
acc // {
"${name}" = nixpkgs.lib.nixosSystem (systemDef machine);
"${name}" = nixpkgs.lib.nixosSystem (systemDef name machine);
})
{ }
physicalMachines;
mkDeployNodes = nodeDef:
# TODO: Use mergeAttrLists
nixpkgs.lib.foldlAttrs
(acc: name: machine: acc // { "${name}" = nodeDef machine; })
(acc: name: machine: acc // { "${name}" = nodeDef name machine; })
{ }
physicalMachines;
in
@ -75,7 +76,7 @@
formatter.${system} = pkgs.nixfmt;
nixosConfigurations = mkNixosSystems (machine: {
nixosConfigurations = mkNixosSystems (name: machine: {
inherit system;
specialArgs = { inherit machines machine kubenix dns microvm disko agenix; };
modules = [ ./nixos ];
@ -85,12 +86,11 @@
sshUser = "root";
user = "root";
nodes = mkDeployNodes (machine: {
# TODO: simply get this from nixos configuration?
hostname = "${machine.hostName}.${machine.domain}";
nodes = mkDeployNodes (name: machine: {
hostname = self.nixosConfigurations.${name}.config.networking.fqdn;
profiles.system = {
path = deploy-rs.lib.${system}.activate.nixos
self.nixosConfigurations.${machine.hostName};
self.nixosConfigurations.${name};
};
});
};

View file

@ -1,11 +1,16 @@
{
jefke = {
# TODO: directly set and read this from nixos config.
hostName = "jefke";
domain = "hyp";
# TODO: model this in a nixos module?
type = "physical";
nixosModule.lab = {
nixosModule = {
networking = {
hostName = "jefke";
# TODO: generate this using type?
domain = "hyp";
};
lab = {
terraformDatabase.enable = true;
storage = {
@ -21,15 +26,19 @@
};
};
};
};
atlas = {
hostName = "atlas";
domain = "hyp";
type = "physical";
nixosModule = { config, ... }:
let inherit (config.lab.networking) dmzServicesIPv4 dmzServicesIPv6; in
{
networking = {
hostName = "atlas";
domain = "hyp";
};
lab = {
networking = {
# TODO: Ideally, we don't have to set this here.
@ -53,11 +62,14 @@
};
lewis = {
hostName = "lewis";
domain = "hyp";
type = "physical";
nixosModule = { pkgs, ... }: {
networking = {
hostName = "lewis";
domain = "hyp";
};
lab = {
dataHost.enable = true;
@ -76,8 +88,6 @@
};
my-microvm = {
hostName = "my-microvm";
domain = "dmz";
type = "virtual";
hypervisorName = "lewis";
@ -86,6 +96,11 @@
echo "Hello world from inside a virtual machine!!" | ${pkgs.lolcat}/bin/lolcat
'';
networking = {
hostName = "my-microvm";
domain = "dmz";
};
lab.vmMacAddress = "BA:DB:EE:F0:00:00";
};
};

View file

@ -89,8 +89,6 @@ in {
config = {
networking = {
hostName = machine.hostName;
domain = machine.domain;
nftables.enable = true;
useDHCP = machine.type == "virtual";

View file

@ -58,12 +58,11 @@
microvm.vms =
let
vmsForHypervisor = lib.attrValues (lib.filterAttrs (n: v: v.type == "virtual" && v.hypervisorName == machine.hostName) machines);
vmsForHypervisor = lib.filterAttrs (n: v: v.type == "virtual" && v.hypervisorName == config.networking.hostName) machines;
in
lib.attrsets.mergeAttrsList (map
(vm:
builtins.mapAttrs
(name: vm:
{
"${vm.hostName}" = {
# TODO Simplify?
specialArgs = { inherit agenix disko pkgs lib microvm; machine = vm; hypervisorConfig = config; };
config = {
@ -71,10 +70,8 @@
./.
];
};
};
}
)
vmsForHypervisor
);
vmsForHypervisor;
};
}

View file

@ -1,4 +1,4 @@
{ lib, config, machine, hypervisorConfig, ... }: {
{ lib, config, hypervisorConfig, ... }: {
options.lab.vmMacAddress = lib.mkOption {
type = lib.types.str;
description = ''
@ -19,7 +19,7 @@
interfaces = [{
type = "tap";
id = "vm-${machine.hostName}";
id = "vm-${config.networking.hostName}";
mac = config.lab.vmMacAddress;
}];
};