1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00

feat: switch from colmena.makeHive to nixosSystem

This commit is contained in:
oddlama 2023-09-20 12:48:01 +02:00
parent e30f2a1c38
commit c89e6d8df3
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
8 changed files with 130 additions and 127 deletions

View file

@ -1,6 +1,15 @@
{
{inputs, ...}: {
disabledModules = ["services/security/kanidm.nix"];
imports = [
inputs.agenix-rekey.nixosModules.default
inputs.agenix.nixosModules.default
inputs.disko.nixosModules.disko
inputs.elewrap.nixosModules.default
inputs.home-manager.nixosModules.default
inputs.impermanence.nixosModules.impermanence
inputs.nixos-nftables-firewall.nixosModules.default
inputs.nixseparatedebuginfod.nixosModules.default
../users/root
./config/boot.nix
@ -38,4 +47,9 @@
./system/deteministic-ids.nix
];
nixpkgs.overlays = [
inputs.microvm.overlay
inputs.nixpkgs-wayland.overlay
];
}

View file

@ -84,23 +84,21 @@
};
microvm.vms.${vmName} = let
node = import ../../nix/generate-node.nix inputs {
name = vmCfg.nodeName;
inherit (vmCfg) system;
};
mac = (net.mac.assignMacs "02:01:27:00:00:00" 24 [] (attrNames vms)).${vmName};
in {
# Allow children microvms to know which node is their parent
specialArgs =
{
parentNode = config;
parentNodeName = nodeName;
}
// node.specialArgs;
inherit (node) pkgs;
specialArgs = {
parentNode = config;
parentNodeName = nodeName;
inherit (inputs.self) nodes;
inherit (inputs.self.pkgs.${vmCfg.system}) lib;
inherit inputs;
};
pkgs = inputs.self.pkgs.${vmCfg.system};
inherit (vmCfg) autostart;
config = {config, ...}: {
imports = cfg.commonImports ++ node.imports ++ vmCfg.modules;
imports = cfg.commonImports ++ vmCfg.modules;
node.name = vmCfg.nodeName;
lib.microvm.mac = mac;

View file

@ -8,6 +8,6 @@
services = {
fwupd.enable = true;
smartd.enable = true;
thermald.enable = builtins.elem config.nixpkgs.system ["x86_64-linux"];
thermald.enable = builtins.elem config.nixpkgs.hostPlatform.system ["x86_64-linux"];
};
}