flake.lock

@@ -289,21 +289,6 @@
         "type": "github"
       }
     },
-    "nixos-facter-modules": {
-      "locked": {
-        "lastModified": 1730026316,
-        "narHash": "sha256-AzP+trH/ykBJGTx3twkpuwbkhFSmsY1PJDQtRmK4k4c=",
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "rev": "15b6531d44aa6f0bbd2fd8309cd2a6d7f183ba32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1729742320,
@@ -426,7 +411,6 @@
         "kubenix": "kubenix",
         "nix-snapshotter": "nix-snapshotter",
         "nixng": "nixng",
-        "nixos-facter-modules": "nixos-facter-modules",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",

flake.nix

@@ -18,7 +18,6 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     flake-utils.url = "github:numtide/flake-utils";
     treefmt-nix.url = "github:numtide/treefmt-nix";
-    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
 
     git-hooks = {
       url = "github:cachix/git-hooks.nix";

machines/atlas.nix

@@ -2,7 +2,6 @@
   machines.atlas = {
     arch = "x86_64-linux";
     kubernetesNodeLabels.storageType = "slow";
-    facterReportPath = ./facter.json;
 
     nixosModule.lab = {
       storage.profile = "kubernetes";

machines/default.nix

@@ -17,14 +17,6 @@ flake-utils.lib.eachDefaultSystem (system: let
         '';
       };
 
-      facterReportPath = lib.mkOption {
-        default = null;
-        type = with lib.types; nullOr path;
-        description = ''
-          Path to the nixos-facter report JSON for this machine.
-        '';
-      };
-
       isRaspberryPi = lib.mkOption {
         default = false;
         type = lib.types.bool;
@@ -60,11 +52,12 @@ in {
     (lib.modules.evalModules {
       modules = [
         allOpts
-        ./warwick
-        ./atlas
-        ./jefke
-        ./lewis
+        ./warwick.nix
+        ./atlas.nix
+        ./jefke.nix
+        ./lewis.nix
         # ./talos.nix
+        # ./pikvm.nix
       ];
     })
     .config

machines/jefke.nix

@@ -2,7 +2,6 @@
   machines.jefke = {
     arch = "x86_64-linux";
     kubernetesNodeLabels.storageType = "fast";
-    facterReportPath = ./facter.json;
 
     nixosModule.lab = {
       storage.profile = "kubernetes";

machines/lewis.nix

@@ -5,7 +5,6 @@
       storageType = "fast";
       hasMedia = "true";
     };
-    facterReportPath = ./facter.json;
 
     nixosModule.lab = {
       storage.profile = "kubernetes";

machines/warwick.nix

@@ -2,7 +2,6 @@
   machines.warwick = {
     arch = "aarch64-linux";
     isRaspberryPi = true;
-    facterReportPath = ./facter.json;
 
     nixosModule.lab = {
       storage.profile = "pi";

modules/default.nix

@@ -20,7 +20,6 @@
       inputs.disko.nixosModules.disko
       inputs.sops-nix.nixosModules.sops
       inputs.nix-snapshotter.nixosModules.nix-snapshotter
-      inputs.nixos-facter-modules.nixosModules.facter
     ]
     ++ lib.lists.optional (machine.isRaspberryPi) inputs.nixos-hardware.nixosModules.raspberry-pi-4;
 
@@ -163,7 +162,5 @@
       age.keyFile = "/root/.config/sops/age/keys.txt";
       defaultSopsFile = "${self}/secrets/nixos.yaml";
     };
-
-    facter.reportPath = machine.facterReportPath;
   };
 }

treefmt.nix

@@ -1,5 +1,4 @@
 {...}: {
   projectRootFile = "flake.nix";
   programs.alejandra.enable = true;
-  programs.jsonfmt.enable = true;
 }