refactor(modules): move base modules under modules

lib/default.nix

@@ -32,6 +32,9 @@ let
       ) (builtins.readDir dir)
     );
 
+  moduleFiles = collectNixFiles (self + "/modules");
+  guestFiles = collectNixFiles (self + "/guests");
+
   specialArgs = {
     inherit inputs self;
     my = self.lib;
@@ -42,10 +45,13 @@ let
 
   guests = import ./guests.nix {
     inherit
+      inputs
       lib
       self
       specialArgs
       bridgeName
+      moduleFiles
+      registry
       ;
   };
 
@@ -57,17 +63,19 @@ let
     inputs.nixpkgs.lib.nixosSystem {
       inherit system specialArgs;
       modules =
-        (collectNixFiles (self + "/modules"))
-        ++ (collectNixFiles (self + "/guests"))
+        moduleFiles
+        ++ guestFiles
         ++ [
           inputs.chaotic.nixosModules.default
           inputs.disko.nixosModules.disko
           inputs.sops-nix.nixosModules.sops
           inputs.stylix.nixosModules.stylix
           registry.module
-          (self + "/system.nix")
           (self + "/hosts/${hostName}")
-          { networking.hostName = hostName; }
+          {
+            networking.hostName = hostName;
+            modules.host.enable = true;
+          }
         ];
     };
 

lib/guests.nix

@@ -1,8 +1,11 @@
 {
+  inputs,
   lib,
   self,
   specialArgs,
   bridgeName,
+  moduleFiles,
+  registry,
 }:
 let
   inherit (lib) escapeShellArg mapAttrsToList;
@@ -345,11 +348,18 @@ let
           inherit specialArgs;
 
           config = {
-            imports = [
-              (self + "/guest.nix")
-              guestNet
-              interior
-            ];
+            imports =
+              moduleFiles
+              ++ [
+                registry.module
+                inputs.sops-nix.nixosModules.sops
+                inputs.stylix.nixosModules.stylix
+                {
+                  modules.guest.enable = true;
+                }
+                guestNet
+                interior
+              ];
           };
         };
       };