From 72768573db94591d00798b08383d27eed40e09e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Aug 2023 22:29:32 +0200
Subject: [PATCH] drop non-existent clan modules

---
 lib/build-clan/default.nix | 4 ++--
 lib/default.nix            | 4 ++--
 lib/flake-module.nix       | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix
index 297e94a7..fc6c465f 100644
--- a/lib/build-clan/default.nix
+++ b/lib/build-clan/default.nix
@@ -1,4 +1,4 @@
-{ nixpkgs, clan, lib }:
+{ nixpkgs, lib }:
 { directory  # The directory containing the machines subdirectory
 , specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available
 , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
@@ -20,7 +20,7 @@ let
         modules = [
           (machineSettings name)
           (machines.${name} or { })
-        ] ++ lib.attrValues clan.clanModules;
+        ];
         specialArgs = specialArgs;
       })
     (machinesDirs // machines);
diff --git a/lib/default.nix b/lib/default.nix
index 89ac0cc3..066e88ef 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,4 @@
-{ lib, clan, nixpkgs, ... }:
+{ lib, nixpkgs, ... }:
 {
   findNixFiles = folder:
     lib.mapAttrs'
@@ -14,5 +14,5 @@
 
   jsonschema = import ./jsonschema { inherit lib; };
 
-  buildClan = import ./build-clan { inherit lib clan nixpkgs; };
+  buildClan = import ./build-clan { inherit lib nixpkgs; };
 }
diff --git a/lib/flake-module.nix b/lib/flake-module.nix
index 517e96d4..64369ec2 100644
--- a/lib/flake-module.nix
+++ b/lib/flake-module.nix
@@ -1,5 +1,4 @@
 { lib
-, self
 , inputs
 , ...
 }: {
@@ -7,7 +6,6 @@
     ./jsonschema/flake-module.nix
   ];
   flake.lib = import ./default.nix {
-    clan = self;
     inherit lib;
     inherit (inputs) nixpkgs;
   };