7 files changed, 62 insertions, 51 deletions
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;
+  };
 }
diff --git a/systems/darwin.nix b/systems/darwin.nix
new file mode 100644
index 0000000..f36d152
--- /dev/null
+++ b/systems/darwin.nix
@@ -0,0 +1,11 @@
+{self, ...}: {
+  flake = {
+    darwinConfigurations = let
+      inherit (self.lib) darwinSystem;
+    in {
+      caroline = darwinSystem {
+        modules = [./caroline];
+      };
+    };
+  };
+}
diff --git a/systems/default.nix b/systems/default.nix
index 881310b..7bf8c5e 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -1,35 +1,7 @@
 {
-  inputs,
-  self,
-  ...
-}: {
-  flake = {
-    darwinConfigurations = let
-      inherit (self.lib) darwinSystem;
-    in {
-      caroline = darwinSystem {
-        modules = [./caroline];
-      };
-    };
-
-    nixosConfigurations = let
-      inherit (self.lib) nixosSystem nixosSystemStable;
-    in {
-      glados = nixosSystem {
-        modules = [./glados];
-      };
-
-      glados-wsl = nixosSystem {
-        modules = [./glados-wsl];
-      };
-
-      atlas = nixosSystemStable {
-        modules = [./atlas];
-      };
-    };
-  };
-
-  perSystem = {system, ...}: {
-    apps = (inputs.nixinate.nixinate.${system} self).nixinate;
-  };
+  imports = [
+    ./darwin.nix
+    ./nixos.nix
+    ./nixinate.nix
+  ];
 }
diff --git a/systems/nixinate.nix b/systems/nixinate.nix
new file mode 100644
index 0000000..5f1c66f
--- /dev/null
+++ b/systems/nixinate.nix
@@ -0,0 +1,9 @@
+{
+  inputs,
+  self,
+  ...
+}: {
+  perSystem = {system, ...}: {
+    apps = (inputs.nixinate.nixinate.${system} self).nixinate;
+  };
+}
diff --git a/systems/nixos.nix b/systems/nixos.nix
new file mode 100644
index 0000000..9f95f02
--- /dev/null
+++ b/systems/nixos.nix
@@ -0,0 +1,19 @@
+{self, ...}: {
+  flake = {
+    nixosConfigurations = let
+      inherit (self.lib) nixosSystem nixosSystemStable;
+    in {
+      glados = nixosSystem {
+        modules = [./glados];
+      };
+
+      glados-wsl = nixosSystem {
+        modules = [./glados-wsl];
+      };
+
+      atlas = nixosSystemStable {
+        modules = [./atlas];
+      };
+    };
+  };
+}