From f4bf843db8765fda3a4629d9846c2edc458712eb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 24 May 2024 04:53:52 -0400
Subject: flatten imports

---
 modules/darwin/default.nix | 10 ++++++----
 modules/default.nix        | 14 +++++---------
 modules/nixos/default.nix  | 12 +++++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'modules')

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 3ef9339..97f25d5 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,6 +1,8 @@
 {
-  archetypes = ./archetypes;
-  base = ./base;
-  desktop = ./desktop;
-  traits = ./traits;
+  flake.darwinModules = {
+    archetypes = ./archetypes;
+    base = ./base;
+    desktop = ./desktop;
+    traits = ./traits;
+  };
 }
diff --git a/modules/default.nix b/modules/default.nix
index ecfaf25..e8a1832 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,10 +1,6 @@
-{moduleLocation, ...}: {
-  flake = {
-    darwinModules = builtins.mapAttrs (k: v: {
-      _file = "${toString moduleLocation}#darwinModules.${k}";
-      imports = [v];
-    }) (import ./darwin);
-
-    nixosModules = import ./nixos;
-  };
+{
+  imports = [
+    ./darwin
+    ./nixos
+  ];
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index b66e06d..b0e3664 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,7 +1,9 @@
 {
-  archetypes = ./archetypes;
-  base = ./base;
-  desktop = ./desktop;
-  server = ./server;
-  traits = ./traits;
+  flake.nixosModules = {
+    archetypes = ./archetypes;
+    base = ./base;
+    desktop = ./desktop;
+    server = ./server;
+    traits = ./traits;
+  };
 }
-- 
cgit v1.2.3