From 65f01c72bd3cad2179a1e5ddd9430851af0092ee Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Mon, 30 Jun 2025 15:32:31 +0200
Subject: [PATCH] clanServices: remove unneeded self reference in lib

---
 lib/default.nix                                            | 5 ++++-
 lib/modules/clan/module.nix                                | 1 +
 lib/modules/inventory/default.nix                          | 7 ++-----
 .../inventory/distributed-service/inventory-adapter.nix    | 6 +++---
 .../inventory/distributed-service/resolveModule.nix        | 5 +++--
 .../inventory/distributed-service/tests/default.nix        | 1 +
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index e0ebc4303..fd17f5a1d 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,8 @@
 {
   lib,
+  # TODO: Get rid of self here.
+  # DONT add any new functions that depend on self here.
+  # If a lib function depends on a piece in clan-core add that piece to the function arguments
   self,
   ...
 }:
@@ -31,7 +34,7 @@ lib.fix (
     # ------------------------------------
     # ClanLib functions
     evalClan = clanLib.callLib ./modules/inventory/eval-clan-modules { };
-    inventory = clanLib.callLib ./modules/inventory { clan-core = self; };
+    inventory = clanLib.callLib ./modules/inventory { };
     modules = clanLib.callLib ./modules/inventory/frontmatter { };
     test = clanLib.callLib ./test { };
     # Custom types
diff --git a/lib/modules/clan/module.nix b/lib/modules/clan/module.nix
index 795e3f079..da554b4bf 100644
--- a/lib/modules/clan/module.nix
+++ b/lib/modules/clan/module.nix
@@ -249,6 +249,7 @@ in
                 distributedServices = clanLib.inventory.mapInstances {
                   inherit (config) inventory;
                   inherit localModuleSet flakeInputs;
+                  clanCoreModules = clan-core.clan.modules;
                   prefix = [ "distributedServices" ];
                 };
                 machines = config.distributedServices.allMachines;
diff --git a/lib/modules/inventory/default.nix b/lib/modules/inventory/default.nix
index 2eb17d793..e19c7b277 100644
--- a/lib/modules/inventory/default.nix
+++ b/lib/modules/inventory/default.nix
@@ -1,12 +1,9 @@
 {
   lib,
-  clanLib,
-  clan-core,
+  clanLib
 }:
 let
-  services = clanLib.callLib ./distributed-service/inventory-adapter.nix {
-    inherit clan-core;
-  };
+  services = clanLib.callLib ./distributed-service/inventory-adapter.nix { };
 in
 {
   inherit (services) mapInstances;
diff --git a/lib/modules/inventory/distributed-service/inventory-adapter.nix b/lib/modules/inventory/distributed-service/inventory-adapter.nix
index 5b73c9328..ded0de9f6 100644
--- a/lib/modules/inventory/distributed-service/inventory-adapter.nix
+++ b/lib/modules/inventory/distributed-service/inventory-adapter.nix
@@ -12,11 +12,10 @@
 {
   lib,
   clanLib,
-  clan-core,
   ...
 }:
 let
-  resolveModule = import ./resolveModule.nix { inherit lib clan-core; };
+  resolveModule = import ./resolveModule.nix { inherit lib; };
 in
 {
   mapInstances =
@@ -26,6 +25,7 @@ in
       # The clan inventory
       inventory,
       localModuleSet,
+      clanCoreModules,
       prefix ? [ ],
     }:
     let
@@ -38,7 +38,7 @@ in
           resolvedModule = resolveModule {
             moduleSpec = instance.module;
             inherit localModuleSet;
-            inherit flakeInputs;
+            inherit flakeInputs clanCoreModules;
           };
 
           # Every instance includes machines via roles
diff --git a/lib/modules/inventory/distributed-service/resolveModule.nix b/lib/modules/inventory/distributed-service/resolveModule.nix
index 4e09bfe0b..1a423079a 100644
--- a/lib/modules/inventory/distributed-service/resolveModule.nix
+++ b/lib/modules/inventory/distributed-service/resolveModule.nix
@@ -1,8 +1,9 @@
-{ lib, clan-core }:
+{ lib }:
 {
   moduleSpec,
   flakeInputs,
   localModuleSet,
+  clanCoreModules,
 }:
 let
   inputName = if moduleSpec.input == null then "<clan>" else moduleSpec.input;
@@ -29,7 +30,7 @@ let
     let
       input =
         if moduleSpec.input == null then
-          clan-core
+          { clan.modules = clanCoreModules; }
         else if moduleSpec.input == "self" then
           { clan.modules = localModuleSet; }
         else
diff --git a/lib/modules/inventory/distributed-service/tests/default.nix b/lib/modules/inventory/distributed-service/tests/default.nix
index a764ab58b..5cfc6f5b2 100644
--- a/lib/modules/inventory/distributed-service/tests/default.nix
+++ b/lib/modules/inventory/distributed-service/tests/default.nix
@@ -45,6 +45,7 @@ let
       inventory = evalInventory inventoryModule;
     in
     clanLib.inventory.mapInstances {
+      clanCoreModules = { };
       flakeInputs = flakeInputsFixture;
       inherit inventory;
       localModuleSet = inventory.modules;