remove machine settings.json

lib/build-clan/module.nix

@@ -26,32 +26,6 @@ let
     }
   );
 
-  machineSettings =
-    machineName:
-    let
-      warn = lib.warn ''
-        The use of ./machines/<machine>/settings.json is deprecated.
-        If your settings.json is empty, you can safely remove it.
-        !!! Consider using the inventory system. !!!
-
-        File: ${directory + /machines/${machineName}/settings.json}
-
-        If there are still features missing in the inventory system, please open an issue on the clan-core repository.
-      '';
-    in
-    # CLAN_MACHINE_SETTINGS_FILE allows to override the settings file temporarily
-    # This is useful for doing a dry-run before writing changes into the settings.json
-    # Using CLAN_MACHINE_SETTINGS_FILE requires passing --impure to nix eval
-    if builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE" != "" then
-      warn (builtins.fromJSON (builtins.readFile (builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE")))
-    else
-      lib.optionalAttrs (builtins.pathExists "${directory}/machines/${machineName}/settings.json") (
-        warn (builtins.fromJSON (builtins.readFile (directory + /machines/${machineName}/settings.json)))
-      );
-
-  machineImports =
-    machineSettings: map (module: clan-core.clanModules.${module}) (machineSettings.clanImports or [ ]);
-
   # TODO: remove default system once we have a hardware-config mechanism
   nixosConfiguration =
     {
@@ -73,7 +47,6 @@ let
               hwConfig
             ];
           }
-          settings
           clan-core.nixosModules.clanCore
           extraConfig
           (machines.${name} or { })
@@ -109,38 +82,7 @@ let
       } // specialArgs;
     };
 
-  # TODO: Will be deprecated
+  allMachines = inventory.machines or { } // machines;
-  # We must migrate the tests, that create a settings.json to add a machine.
-  ##################################################
-  testMachines =
-    lib.mapAttrs
-      (name: _: {
-        inherit name;
-        system = (machineSettings name).nixpkgs.hostSystem or null;
-      })
-      (
-        lib.filterAttrs (
-          machineName: _:
-          if builtins.pathExists "${directory}/machines/${machineName}/settings.json" then
-            lib.warn ''
-              The use of ./machines/<machine>/settings.json is deprecated.
-              If your settings.json is empty, you can safely remove it.
-              !!! Consider using the inventory system. !!!
-
-              File: ${directory + /machines/${machineName}/settings.json}
-
-              If there are still features missing in the inventory system, please open an issue on the clan-core repository.
-            '' true
-          else
-            false
-        ) machinesDirs
-      );
-  machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (
-    builtins.readDir (directory + /machines)
-  );
-  ##################################################
-
-  allMachines = inventory.machines or { } // machines // testMachines;
 
   supportedSystems = [
     "x86_64-linux"

pkgs/clan-cli/clan_cli/dirs.py

@@ -115,10 +115,6 @@ def specific_machine_dir(flake_dir: Path, machine: str) -> Path:
     return machines_dir(flake_dir) / machine
 
 
-def machine_settings_file(flake_dir: Path, machine: str) -> Path:
-    return specific_machine_dir(flake_dir, machine) / "settings.json"
-
-
 def module_root() -> Path:
     return Path(__file__).parent
 

pkgs/clan-cli/tests/test_flake/flake.nix

@@ -12,23 +12,11 @@
       inputs = inputs' // {
         clan-core = fake-clan-core;
       };
-      machineSettings = (
-        if builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE" != "" then
-          builtins.fromJSON (builtins.readFile (builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE"))
-        else if builtins.pathExists ./machines/machine1/settings.json then
-          builtins.fromJSON (builtins.readFile ./machines/machine1/settings.json)
-        else
-          { }
-      );
-      machineImports = map (module: fake-clan-core.clanModules.${module}) (
-        machineSettings.clanImports or [ ]
-      );
     in
     {
       nixosConfigurations.machine1 = inputs.nixpkgs.lib.nixosSystem {
-        modules = machineImports ++ [
+        modules = [
           ./nixosModules/machine1.nix
-          machineSettings
           (
             {
               lib,