Reorganize hosts and modules

flake.nix

@@ -5,26 +5,24 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
   };
 
-  outputs = { nixpkgs, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
   let
     secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
   in {
+    nixosModules = {
+      common = import ./modules/common.nix;
+    };
+
     nixosConfigurations = {
       marauder = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
-          ./marauder
-          ./common
-        ];
-        specialArgs = { inherit inputs secrets; };
+        modules = [ ./hosts/marauder ];
+        specialArgs = { inherit self inputs secrets; };
       };
       monolith = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        modules = [
-          ./monolith
-          ./common
-        ];
-        specialArgs = { inherit inputs secrets; };
+        modules = [ ./hosts/monolith ];
+        specialArgs = { inherit self inputs secrets; };
       };
     };
   };