Merge 'reorg' into 'main'

This patch moves in the reorganizational work done on the reorg branch,
mainly:

* Move host-specific modules into hosts/<host>/<module>
* Break up HM config

See the reorg branch for the individual commits.

1 files changed, 4 insertions, 11 deletions

diff --git a/flake.nix b/flake.nix
index 588bf98..f9142a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,13 +44,6 @@
       metadata = nixpkgs.lib.importTOML ./metadata.toml;
     };
 
-    darwinModules =
-      builtins.attrValues (import ./modules/darwin).general
-      ++ builtins.attrValues (import ./modules/darwin).personal;
-    nixosModules =
-      builtins.attrValues (import ./modules/nixos).general
-      ++ builtins.attrValues (import ./modules/nixos).personal;
-
     # This is a function that generates an attribute by calling a function
     # you pass to it, with each system as an argument. `systems` lists all
     # supported systems.
@@ -75,7 +68,7 @@
             ./hosts/common.nix
             ./home
           ]
-          ++ darwinModules;
+          ++ builtins.attrValues (import ./modules/darwin);
       };
     };
 
@@ -92,7 +85,7 @@
             ./hosts/common.nix
             ./home
           ]
-          ++ nixosModules;
+          ++ builtins.attrValues (import ./modules/nixos);
       };
     };
 
@@ -111,8 +104,8 @@
     overlays = import ./overlays;
 
     # We export the generally applicable modules.
-    darwinModules = (import ./modules/darwin).geneal;
-    nixosModules = (import ./modules/nixos).general;
+    darwinModules = import ./modules/darwin;
     homeModules = import ./modules/home-manager;
+    nixosModules = import ./modules/nixos;
   };
 }