Merge pull request 'Refactor(build-clan): rename to lib/modules' (#4055) from clan-unify into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4055

flakeModules/clan.nix

@@ -11,7 +11,7 @@ let
 
   buildClanModule = clan-core.clanLib.buildClanModule;
 
-  publicAttrs = import ../lib/build-clan/public.nix;
+  publicAttrs = import ../lib/modules/public.nix;
   # Create output options only for listed attributes
   # TODO: Refactor this into an explicit module, so we can have description and other attributes to be listed in flake-parts
   outputModule = {

lib/default.nix

@@ -39,7 +39,7 @@ lib.fix (clanLib: {
   # ------------------------------------
   # ClanLib functions
   evalClan = clanLib.callLib ./inventory/eval-clan-modules { };
-  buildClanModule = clanLib.callLib ./build-clan { };
+  buildClanModule = clanLib.callLib ./modules { };
   inventory = clanLib.callLib ./inventory { };
   modules = clanLib.callLib ./inventory/frontmatter { };
   test = clanLib.callLib ./test { };

lib/flake-module.nix

@@ -7,7 +7,7 @@
 rec {
   # TODO: automatically generate this from the directory conventions
   imports = [
-    ./build-clan/flake-module.nix
+    ./modules/flake-module.nix
     ./clanTest/flake-module.nix
     ./introspection/flake-module.nix
     ./inventory/flake-module.nix

pkgs/clan-app/clan-app.code-workspace

@@ -13,7 +13,7 @@
 			"path": "../../nixosModules"
 		},
 		{
-			"path": "../../lib/build-clan"
+			"path": "../../lib/modules"
 		},
 		{
 			"path": "./ui"
@@ -50,4 +50,4 @@
 		},
 		"files.autoSave": "off"
 	}
-}
+}

pkgs/clan-vm-manager/clan-vm-manager.code-workspace

@@ -13,7 +13,7 @@
 			"path": "../../nixosModules"
 		},
 		{
-			"path": "../../lib/build-clan"
+			"path": "../../lib/modules"
 		},
 		{
 			"path": "../../../democlan"
@@ -43,4 +43,4 @@
 		},
 		"files.autoSave": "off"
 	}
-}
+}