modules: import extra options where they're introduced

8 files changed, 13 insertions, 11 deletions

diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index 1b6cd03..97f25d5 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,7 +1,7 @@
 {
   flake.darwinModules = {
-    default = ./base;
     archetypes = ./archetypes;
+    base = ./base;
     desktop = ./desktop;
     traits = ./traits;
   };
diff --git a/modules/darwin/traits/default.nix b/modules/darwin/traits/default.nix
index e6e5275..0939a66 100644
--- a/modules/darwin/traits/default.nix
+++ b/modules/darwin/traits/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./home-manager.nix
     ./users.nix
   ];
 }
diff --git a/modules/darwin/traits/home-manager.nix b/modules/darwin/traits/home-manager.nix
new file mode 100644
index 0000000..9428499
--- /dev/null
+++ b/modules/darwin/traits/home-manager.nix
@@ -0,0 +1,3 @@
+{inputs, ...}: {
+  imports = [inputs.home-manager.darwinModules.home-manager];
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index a334bb3..2460091 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,7 +1,7 @@
 {
   flake.nixosModules = {
-    default = ./base;
     archetypes = ./archetypes;
+    base = ./base;
     desktop = ./desktop;
     traits = ./traits;
   };
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index bf064a2..d2a50e7 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -5,6 +5,7 @@
     ./cloudflared.nix
     ./containers.nix
     ./hercules.nix
+    ./home-manager.nix
     ./locale.nix
     ./nginx.nix
     ./nvk
diff --git a/modules/nixos/traits/home-manager.nix b/modules/nixos/traits/home-manager.nix
new file mode 100644
index 0000000..01af5b1
--- /dev/null
+++ b/modules/nixos/traits/home-manager.nix
@@ -0,0 +1,3 @@
+{inputs, ...}: {
+  imports = [inputs.home-manager.nixosModules.home-manager];
+}
diff --git a/modules/nixos/traits/secrets.nix b/modules/nixos/traits/secrets.nix
index 085d8f3..57762cd 100644
--- a/modules/nixos/traits/secrets.nix
+++ b/modules/nixos/traits/secrets.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  inputs,
   ...
 }: let
   cfg = config.traits.secrets;
@@ -9,6 +10,8 @@ in {
     enable = lib.mkEnableOption "secrets management";
   };
 
+  imports = [inputs.agenix.nixosModules.default];
+
   config = lib.mkIf cfg.enable {
     age = {
       identityPaths = ["/etc/age/key"];
diff --git a/systems/default.nix b/systems/default.nix
index 22adae8..49f0e44 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -7,11 +7,6 @@
     nixos = {
       builder = inputs.nixpkgs.lib.nixosSystem;
 
-      modules = with inputs; [
-        agenix.nixosModules.default
-        home-manager.nixosModules.home-manager
-      ];
-
       systems = {
         glados = {};
 
@@ -27,10 +22,6 @@
     darwin = {
       builder = inputs.darwin.lib.darwinSystem;
 
-      modules = [
-        inputs.home-manager.darwinModules.home-manager
-      ];
-
       systems = {
         caroline = {};
       };