2024-05-26

1 files changed, 9 insertions, 41 deletions

diff --git a/flake.nix b/flake.nix
index 9e78601..1019a60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -189,6 +189,8 @@
 
       legacyPackages.${system} = pkgs;
 
+      overlays = import ./overlays.nix;
+
       devShells.${system}.default =
         with pkgs;
         mkShell {
@@ -198,49 +200,15 @@
 
       formatter.${system} = pkgs.nixfmt;
 
-      checks.${system} = import ./checks.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
-
-      nixosModules = import ./modules {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      checks.${system} = import ./checks.nix { inherit inputs pkgs system; };
 
-      nixosConfigurations = import ./configurations {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      nixosModules.nixfiles =
+        _: with lib; {
+          imports = attrValues (modulesIn ./modules);
+        };
 
-      overlays = import ./overlays.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      nixosConfigurations = import ./configurations { inherit inputs lib pkgs; };
 
-      topology = import ./topology.nix {
-        inherit
-          inputs
-          lib
-          pkgs
-          system
-          ;
-      };
+      topology = import ./topology.nix { inherit inputs lib pkgs; };
     };
 }