deploy.nix

@@ -6,14 +6,14 @@
   deployArch = "x86_64-linux";
   mkDeployNodes = nodeDef:
     builtins.mapAttrs
-    (name: module: nodeDef name module)
+    (name: machine: nodeDef name machine)
-    self.machines;
+    self.machines.${deployArch};
 in {
   deploy = {
     sshUser = "root";
     user = "root";
 
-    nodes = mkDeployNodes (name: _module: let
+    nodes = mkDeployNodes (name: machine: let
       nixosConfiguration = self.nixosConfigurations.${name};
       machineArch = nixosConfiguration.config.facter.report.system;
     in {

machines/atlas/default.nix

@@ -1,4 +1,8 @@
 {
+  machines.atlas = {
+    kubernetesNodeLabels.storageType = "slow";
+
+    nixosModule = {
       facter.reportPath = ./facter.json;
 
       lab = {
@@ -10,4 +14,6 @@
           serverAddr = "https://jefke.dmz:6443";
         };
       };
+    };
+  };
 }

machines/default.nix

@@ -1,8 +1,51 @@
-{...}: {
+{
-  machines = {
+  nixpkgs,
-    atlas = import ./atlas;
+  flake-utils,
-    jefke = import ./jefke;
+  ...
-    lewis = import ./lewis;
+}:
-    warwick = import ./warwick;
+flake-utils.lib.eachDefaultSystem (system: let
+  pkgs = nixpkgs.legacyPackages.${system};
+  lib = pkgs.lib;
+
+  machineOpts = {config, ...}: {
+    options = {
+      nixosModule = lib.mkOption {
+        default = {...}: {};
+        type = lib.types.anything;
+        description = ''
+          Customized configuration for this machine in the form of a NixOS module.
+        '';
       };
-}
+
+      kubernetesNodeLabels = lib.mkOption {
+        default = null;
+        type = with lib.types; nullOr attrs;
+        description = ''
+          Any labels to add to the Kubernetes node.
+        '';
+      };
+    };
+  };
+
+  allOpts = {
+    options = {
+      machines = lib.mkOption {
+        type = with lib.types; attrsOf (submodule machineOpts);
+      };
+    };
+  };
+in {
+  machines =
+    (lib.modules.evalModules {
+      modules = [
+        allOpts
+        ./warwick
+        ./atlas
+        ./jefke
+        ./lewis
+        # ./talos.nix
+      ];
+    })
+    .config
+    .machines;
+})

machines/jefke/default.nix

@@ -1,4 +1,8 @@
 {
+  machines.jefke = {
+    kubernetesNodeLabels.storageType = "fast";
+
+    nixosModule = {
       facter.reportPath = ./facter.json;
 
       lab = {
@@ -10,4 +14,6 @@
           clusterInit = true;
         };
       };
+    };
+  };
 }

machines/lewis/default.nix

@@ -1,4 +1,11 @@
 {
+  machines.lewis = {
+    kubernetesNodeLabels = {
+      storageType = "fast";
+      hasMedia = "true";
+    };
+
+    nixosModule = {
       facter.reportPath = ./facter.json;
 
       lab = {
@@ -12,4 +19,6 @@
           serverAddr = "https://jefke.dmz:6443";
         };
       };
+    };
+  };
 }

machines/talos.nix

@@ -0,0 +1,9 @@
+{
+  machines.talos = {
+    nixosModule = {lib, ...}: {
+      lab.storage.profile = "normal";
+
+      # boot.loader.systemd-boot.enable = lib.mkForce false;
+    };
+  };
+}

machines/warwick/default.nix

@@ -1,4 +1,6 @@
-{inputs, ...}: {
+{
+  machines.warwick = {
+    nixosModule = {inputs, ...}: {
       imports = [inputs.nixos-hardware.nixosModules.raspberry-pi-4];
 
       config = {
@@ -14,4 +16,6 @@
           };
         };
       };
+    };
+  };
 }

modules/default.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   inputs,
+  machine,
   config,
   ...
 }: {
@@ -15,6 +16,7 @@
     ./k3s
     ./tailscale.nix
     ./facter.nix
+    machine.nixosModule
     inputs.disko.nixosModules.disko
     inputs.sops-nix.nixosModules.sops
     inputs.nix-snapshotter.nixosModules.nix-snapshotter

modules/monitoring/default.nix

@@ -38,7 +38,7 @@ in {
         let
           generated =
             lib.attrsets.mapAttrsToList
-            (name: _module: {
+            (name: machine: {
               job_name = name;
               static_configs = [
                 {

modules/networking/default.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  machine,
   ...
 }: {
   config = {

nixos.nix

@@ -3,24 +3,22 @@
   nixpkgs,
   ...
 } @ inputs: let
+  deployArch = "x86_64-linux";
+  machines = self.machines.${deployArch};
   mkNixosSystems = systemDef:
     builtins.mapAttrs
     (
-      name: module:
+      name: machine:
-        nixpkgs.lib.nixosSystem (systemDef name module)
+        nixpkgs.lib.nixosSystem (systemDef name machine)
     )
-    self.machines;
+    machines;
 in {
-  nixosConfigurations = mkNixosSystems (name: module: {
+  nixosConfigurations = mkNixosSystems (name: machine: {
-    specialArgs = {
+    specialArgs = {inherit self inputs machine machines;};
-      inherit self inputs;
-      inherit (self) machines;
-    };
 
     modules = [
       "${self}/modules"
       {networking.hostName = name;}
-      module
     ];
   });
 }