From dc9454565520b0a28fc77ce294e3c54bc93b07ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 27 Aug 2024 09:04:59 +0200
Subject: [PATCH] remove nixos-factor modules for now

I would like to get rid of blueprint before having this feature
---
 flake.lock                | 54 ---------------------------------------
 flake.nix                 | 16 ++++++------
 lib/build-clan/module.nix | 10 ++++----
 3 files changed, 13 insertions(+), 67 deletions(-)

diff --git a/flake.lock b/flake.lock
index 36eaf72f9..e8b68d70b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,28 +1,5 @@
 {
   "nodes": {
-    "blueprint": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724053269,
-        "narHash": "sha256-DinmPyxmUSLjBUYMe3eK0GKykwe33vWbVTmp7++P4Ng=",
-        "owner": "numtide",
-        "repo": "blueprint",
-        "rev": "766302be9063650ca6578e5ba09cc4260b0da29c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "blueprint",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -63,35 +40,6 @@
         "type": "github"
       }
     },
-    "nixos-facter-modules": {
-      "inputs": {
-        "blueprint": [
-          "blueprint"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ],
-        "treefmt-nix": [
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724320449,
-        "narHash": "sha256-0hB5P75tIwPS9lNI3nYxEorpcFtuQUJGmGHGIEgWksY=",
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "rev": "e00d789870e72baabb79d19afcc645428c3c6980",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nixos-facter-modules",
-        "type": "github"
-      }
-    },
     "nixos-images": {
       "inputs": {
         "nixos-stable": [],
@@ -131,10 +79,8 @@
     },
     "root": {
       "inputs": {
-        "blueprint": "blueprint",
         "disko": "disko",
         "flake-parts": "flake-parts",
-        "nixos-facter-modules": "nixos-facter-modules",
         "nixos-images": "nixos-images",
         "nixpkgs": "nixpkgs",
         "sops-nix": "sops-nix",
diff --git a/flake.nix b/flake.nix
index 3d6f8dd1e..821ad2ab4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,16 +18,16 @@
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
-    nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs";
-    nixos-facter-modules.inputs.systems.follows = "systems";
-    nixos-facter-modules.inputs.blueprint.follows = "blueprint";
-    nixos-facter-modules.inputs.treefmt-nix.follows = "treefmt-nix";
+    #nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
+    #nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs";
+    #nixos-facter-modules.inputs.systems.follows = "systems";
+    #nixos-facter-modules.inputs.blueprint.follows = "blueprint";
+    #nixos-facter-modules.inputs.treefmt-nix.follows = "treefmt-nix";
     # Pinned input for nixos-facter-modules
     # Allows downstream flakes to .follow override the input
-    blueprint.url = "github:numtide/blueprint";
-    blueprint.inputs.nixpkgs.follows = "nixpkgs";
-    blueprint.inputs.systems.follows = "systems";
+    #blueprint.url = "github:numtide/blueprint";
+    #blueprint.inputs.nixpkgs.follows = "nixpkgs";
+    #blueprint.inputs.systems.follows = "systems";
   };
 
   outputs =
diff --git a/lib/build-clan/module.nix b/lib/build-clan/module.nix
index 8100ce4a6..f7144a31c 100644
--- a/lib/build-clan/module.nix
+++ b/lib/build-clan/module.nix
@@ -67,13 +67,13 @@ let
           facterJson = "${directory}/machines/${name}/facter.json";
           hwConfig = "${directory}/machines/${name}/hardware-configuration.nix";
 
-          facterModules = lib.optionals (builtins.pathExists facterJson) [
-            clan-core.inputs.nixos-facter-modules.nixosModules.facter
-            { config.facter.reportPath = facterJson; }
-          ];
         in
+        #facterModules = lib.optionals (builtins.pathExists facterJson) [
+        #  clan-core.inputs.nixos-facter-modules.nixosModules.facter
+        #  { config.facter.reportPath = facterJson; }
+        #];
         (machineImports settings)
-        ++ facterModules
+        #++ facterModules
         ++ [
           {
             # Autoinclude configuration.nix and hardware-configuration.nix