modules: move clan module to flake.modules.clan.default

flakeModules/clan.nix

@@ -9,8 +9,6 @@ clan-core:
 let
   inherit (lib) types;
 
-  clanLib = clan-core.clanLib;
-
 in
 {
   # Backwards compatibility
@@ -37,7 +35,7 @@ in
           # inventoryInterface = {};
         };
         modules = [
-          clanLib.module
+          clan-core.modules.clan.default
         ];
       };
     };

lib/clanTest/flake-module.nix

@@ -170,6 +170,7 @@ in
     {
       imports = [
         ../test/container-test-driver/driver-module.nix
+
       ];
       options = {
         clanSettings = mkOption {
@@ -197,7 +198,7 @@ in
               self = throw "set clan.directory in the test";
             };
             modules = [
-              clanLib.module
+              clan-core.modules.clan.default
               {
                 _prefix = [
                   "checks"

lib/default.nix

@@ -19,15 +19,6 @@ lib.fix (
     );
   in
   {
-    module = {
-      _class = "clan";
-      _module.args = {
-        inherit clanLib;
-      };
-      imports = [
-        ./modules/clan/default.nix
-      ];
-    };
 
     inherit (buildClanLib)
       buildClan

lib/modules/clan/default.nix

@@ -1,4 +1,10 @@
+{ clan-core }:
 {
+  _class = "clan";
+  _module.args = {
+    inherit clan-core;
+    inherit (clan-core) clanLib;
+  };
   imports = [
     ./module.nix
     ./interface.nix

lib/modules/clan/flake-module.nix

@@ -0,0 +1,4 @@
+{ self, lib, ... }:
+{
+  flake.modules.clan.default = lib.modules.importApply ./default.nix { clan-core = self; };
+}

lib/modules/eval-docs.nix

@@ -1,12 +1,12 @@
 {
   pkgs,
   lib,
-  clanLib,
+  clan-core,
 }:
 let
   eval = lib.evalModules {
     modules = [
-      clanLib.module
+      clan-core.modules.clan.default
     ];
   };
   evalDocs = pkgs.nixosOptionsDoc {

lib/modules/flake-module.nix

@@ -9,6 +9,9 @@ let
   );
 in
 {
+  imports = [
+    ./clan/flake-module.nix
+  ];
   perSystem =
     {
       pkgs,
@@ -19,7 +22,7 @@ in
     let
       jsonDocs = import ./eval-docs.nix {
         inherit pkgs lib;
-        inherit (self) clanLib;
+        clan-core = self;
       };
     in
     {

lib/modules/inventory/tests/default.nix

@@ -11,7 +11,7 @@ let
     lib.evalModules {
       specialArgs = { inherit clan-core nix-darwin clanLib; };
       modules = [
-        ../../clan/default.nix
+        clan-core.modules.clan.default
         {
           self = { };
         }