move modules into nixosModules, add autoimport

flake-parts/modules.nix

@@ -1,7 +1,10 @@
 # export some of our flake moduels for re-use in other projects
-{ ...
+{ lib
+, self
+, ...
 }: {
   flake.modules.flake-parts = {
     writers = ./writers;
   };
+  flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ../nixosModules);
 }

flake-parts/nixosModules.nix

@@ -0,0 +1,6 @@
+{ lib
+, self
+, ...
+}: {
+  flake.nixosModules = lib.mapAttrs (_: nix: { imports = [ nix ]; }) (self.lib.findNixFiles ../nixosModules);
+}

flake-parts/packages.nix

@@ -5,6 +5,7 @@
         system = "x86_64-linux";
         modules = [
           self.nixosModules.installer
+          self.nixosModules.hidden-ssh-announce
           self.inputs.nixos-generators.nixosModules.all-formats
           self.inputs.disko.nixosModules.disko
         ];

flake.nix

@@ -25,27 +25,14 @@
         ./flake-parts/formatting.nix
         ./flake-parts/merge-after-ci
         ./flake-parts/modules.nix
+        ./flake-parts/nixosModules.nix
         ./flake-parts/packages.nix
         ./flake-parts/tea-create-pr
         ./flake-parts/writers
         ./templates/flake-module.nix
         ./templates/python-project/flake-module.nix
         ./pkgs/clan-cli/flake-module.nix
+        ./lib/flake-module.nix
       ];
-      flake = {
-        nixosModules = {
-          installer = {
-            imports = [
-              ./modules/installer.nix
-              ./modules/hidden-ssh-announce.nix
-            ];
-          };
-          hidden-announce = {
-            imports = [
-              ./modules/hidden-ssh-announce.nix
-            ];
-          };
-        };
-      };
     });
 }

lib/default.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+let
+  clanLib = {
+    findNixFiles = folder:
+      lib.mapAttrs'
+        (name: type:
+          if
+            type == "directory"
+          then
+            lib.nameValuePair name "${folder}/${name}"
+          else
+            lib.nameValuePair (lib.removeSuffix ".nix" name) "${folder}/${name}"
+        )
+        (builtins.readDir folder);
+  };
+in
+clanLib

lib/flake-module.nix

@@ -0,0 +1,5 @@
+{ lib
+, ...
+}: {
+  flake.lib = import ./default.nix { inherit lib; };
+}