From 6d1de943e1e85c7b13c56a7587c5fee2b74fe83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 8 Aug 2023 14:03:26 +0200
Subject: [PATCH] move out non-toplevel flake modules from flake.nix

---
 flake.nix                  | 5 -----
 pkgs/flake-module.nix      | 6 ++++++
 templates/flake-module.nix | 5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index cb5feadd4..c52398e17 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,14 +25,9 @@
         ./devShell.nix
         ./formatter.nix
         ./templates/flake-module.nix
-        ./templates/python-project/flake-module.nix
 
         ./pkgs/flake-module.nix
 
-        ./pkgs/clan-cli/flake-module.nix
-        ./pkgs/installer/flake-module.nix
-        ./pkgs/ui/flake-module.nix
-
         ./lib/flake-module.nix
         ({ self, lib, ... }: {
           flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ./nixosModules);
diff --git a/pkgs/flake-module.nix b/pkgs/flake-module.nix
index d0a2f0613..d0d9aae1c 100644
--- a/pkgs/flake-module.nix
+++ b/pkgs/flake-module.nix
@@ -1,4 +1,10 @@
 { ... }: {
+  imports = [
+    ./clan-cli/flake-module.nix
+    ./installer/flake-module.nix
+    ./ui/flake-module.nix
+  ];
+
   perSystem = { pkgs, config, ... }: {
     packages = {
       tea-create-pr = pkgs.callPackage ./tea-create-pr { };
diff --git a/templates/flake-module.nix b/templates/flake-module.nix
index 22b1070dd..a7149430d 100644
--- a/templates/flake-module.nix
+++ b/templates/flake-module.nix
@@ -1,4 +1,7 @@
-{ ... }: {
+{
+  imports = [
+    ./python-project/flake-module.nix
+  ];
   flake.templates = {
     new-clan = {
       description = "Initialize a new clan flake";