modules: flatten imports

6 files changed, 15 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 8c15ba6..decba44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
   };
 
   outputs = inputs: let
-    inherit ((import ./modules/flake).flake) flakeModules;
+    flakeModules = import ./modules/flake;
   in
     inputs.flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 97f25d5..3ef9339 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,8 +1,6 @@
 {
-  flake.darwinModules = {
-    archetypes = ./archetypes;
-    base = ./base;
-    desktop = ./desktop;
-    traits = ./traits;
-  };
+  archetypes = ./archetypes;
+  base = ./base;
+  desktop = ./desktop;
+  traits = ./traits;
 }
diff --git a/modules/default.nix b/modules/default.nix
index 9268452..62a17e4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,7 +1,5 @@
 {
-  imports = [
-    ./nixos
-    ./darwin
-    ./flake
-  ];
+  nixosModules = import ./nixos;
+  darwinModules = import ./darwin;
+  flakeModules = import./flake;
 }
diff --git a/modules/flake/configurations.nix b/modules/flake/configurations.nix
index 78a5033..d9406db 100644
--- a/modules/flake/configurations.nix
+++ b/modules/flake/configurations.nix
@@ -146,6 +146,7 @@ in {
     (mkAliasOptionModule ["nixosModules"] ["flake" "nixosModules"])
     (mkAliasOptionModule ["darwinModules"] ["flake" "darwinModules"])
     (mkAliasOptionModule ["homeModules"] ["flake" "homeModules"])
+    (mkAliasOptionModule ["flakeModules"] ["flake" "flakeModules"])
   ];
 
   options = {
diff --git a/modules/flake/default.nix b/modules/flake/default.nix
index 8730f01..c653708 100644
--- a/modules/flake/default.nix
+++ b/modules/flake/default.nix
@@ -1,6 +1,4 @@
 {
-  flake.flakeModules = {
-    configurations = import ./configurations.nix;
-    terranix = import ./terranix.nix;
-  };
+  configurations = import ./configurations.nix;
+  terranix = import ./terranix.nix;
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 2460091..3ef9339 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,8 +1,6 @@
 {
-  flake.nixosModules = {
-    archetypes = ./archetypes;
-    base = ./base;
-    desktop = ./desktop;
-    traits = ./traits;
-  };
+  archetypes = ./archetypes;
+  base = ./base;
+  desktop = ./desktop;
+  traits = ./traits;
 }