Merge pull request 'Chore: remove unused clanImports module' (#2387) from hsjobeki/clan-core:hsjobeki-main into main

nixosModules/clanCore/default.nix

@@ -3,7 +3,6 @@
   imports = [
     ./backups.nix
     ./facts
-    ./imports.nix
     ./inventory/interface.nix
     ./manual.nix
     ./meta/interface.nix

nixosModules/clanCore/imports.nix

@@ -1,15 +0,0 @@
-{ lib, ... }:
-{
-  /*
-    Declaring imports inside the module system does not trigger an infinite
-    recursion in this case because buildClan generates the imports from the
-    settings.json file before calling out to evalModules.
-  */
-  options.clanImports = lib.mkOption {
-    type = lib.types.listOf lib.types.str;
-    description = ''
-      A list of imported module names imported from clan-core.clanModules.<name>
-      The buildClan function will automatically import these modules for the current machine.
-    '';
-  };
-}

nixosModules/clanCore/schema.nix

@@ -6,7 +6,7 @@ in
   options.clanSchema = lib.mkOption {
     type = lib.types.attrs;
     description = "The json schema for the .clan options namespace";
-    default = jsonschema.parseOptions options.clan;
+    default = jsonschema.parseOptions options.clan { };
     defaultText = lib.literalExpression "jsonschema.schemaToJSON options.clan";
   };
 }

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

@@ -19,7 +19,6 @@
           ./nixosModules/machine1.nix
           (
             {
-              lib,
               ...
             }:
             {
@@ -29,13 +28,6 @@
                 nixpkgs.pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
                 documentation.enable = false;
               };
-              options.clanImports = lib.mkOption {
-                type = lib.types.listOf lib.types.str;
-                description = ''
-                  A list of imported module names imported from clan-core.clanModules.<name>
-                  The buildClan function will automatically import these modules for the current machine.
-                '';
-              };
             }
           )
         ];