Improve setting facter report path

machines/atlas/default.nix

@@ -1,15 +1,18 @@
 {
   machines.atlas = {
     kubernetesNodeLabels.storageType = "slow";
-    facterReportPath = ./facter.json;
 
-    nixosModule.lab = {
+    nixosModule = {
-      storage.profile = "kubernetes";
+      facter.reportPath = ./facter.json;
-      tailscale.enable = true;
 
-      k3s = {
+      lab = {
-        enable = true;
+        storage.profile = "kubernetes";
-        serverAddr = "https://jefke.dmz:6443";
+        tailscale.enable = true;
+
+        k3s = {
+          enable = true;
+          serverAddr = "https://jefke.dmz:6443";
+        };
       };
     };
   };

machines/default.nix

@@ -9,14 +9,6 @@ flake-utils.lib.eachDefaultSystem (system: let
 
   machineOpts = {config, ...}: {
     options = {
-      facterReportPath = lib.mkOption {
-        default = null;
-        type = with lib.types; nullOr path;
-        description = ''
-          Path to the nixos-facter report JSON for this machine.
-        '';
-      };
-
       nixosModule = lib.mkOption {
         default = {...}: {};
         type = lib.types.anything;

machines/jefke/default.nix

@@ -1,15 +1,18 @@
 {
   machines.jefke = {
     kubernetesNodeLabels.storageType = "fast";
-    facterReportPath = ./facter.json;
 
-    nixosModule.lab = {
+    nixosModule = {
-      storage.profile = "kubernetes";
+      facter.reportPath = ./facter.json;
-      tailscale.enable = true;
 
-      k3s = {
+      lab = {
-        enable = true;
+        storage.profile = "kubernetes";
-        clusterInit = true;
+        tailscale.enable = true;
+
+        k3s = {
+          enable = true;
+          clusterInit = true;
+        };
       };
     };
   };

machines/lewis/default.nix

@@ -4,17 +4,20 @@
       storageType = "fast";
       hasMedia = "true";
     };
-    facterReportPath = ./facter.json;
 
-    nixosModule.lab = {
+    nixosModule = {
-      storage.profile = "kubernetes";
+      facter.reportPath = ./facter.json;
-      backups.enable = true;
-      data-sharing.enable = true;
-      tailscale.enable = true;
 
-      k3s = {
+      lab = {
-        enable = true;
+        storage.profile = "kubernetes";
-        serverAddr = "https://jefke.dmz:6443";
+        backups.enable = true;
+        data-sharing.enable = true;
+        tailscale.enable = true;
+
+        k3s = {
+          enable = true;
+          serverAddr = "https://jefke.dmz:6443";
+        };
       };
     };
   };

machines/warwick/default.nix

@@ -1,11 +1,11 @@
 {
   machines.warwick = {
-    facterReportPath = ./facter.json;
-
     nixosModule = {inputs, ...}: {
       imports = [inputs.nixos-hardware.nixosModules.raspberry-pi-4];
 
       config = {
+        facter.reportPath = ./facter.json;
+
         lab = {
           storage.profile = "pi";
           monitoring.server.enable = true;

modules/default.nix

@@ -141,7 +141,5 @@
       age.keyFile = "/root/.config/sops/age/keys.txt";
       defaultSopsFile = "${self}/secrets/nixos.yaml";
     };
-
-    facter.reportPath = machine.facterReportPath;
   };
 }