WIP: migrate to using builders flake module

flake.nix

@@ -30,25 +30,36 @@
 
   outputs = inputs@{ flake-parts, deploy-rs, nixpkgs, self, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
-      # imports = [ ./flakeModules/builders.nix ];
-      #
+      imports = [ ./flakeModules/builders ];
+
+      builders = {
+        configurations.nixos = [
+          { hostname = "snowhawk"; }
+        ];
+
+        configurations.darwin = [
+          { hostname = "lynx"; }
+        ];
+
+        configurations.home = [
+          { user = "zynh"; hostname = "msiserver"; }
+          { user = "val"; hostname = "caveserver"; }
+          { user = "ravenshade"; hostname = "permafrost"; }
+        ];
+
+        nixosModules = [
+          inputs.home-manager.nixosModules.default
+          inputs.chaotic.nixosModules.default
+          inputs.niri.nixosModules.niri
+        ];
+
+        homeModules = [
+          inputs.chaotic.homeManagerModules.default
+        ];
+      };
+
       flake =
-        let builders = import ./builders.nix inputs;
-        in {
-          nixosConfigurations = builders.compileNixosSystems [
-            { hostname = "snowhawk"; }
-          ];
-
-          darwinConfigurations = builders.compileDarwinSystems [
-            { hostname = "lynx"; }
-          ];
-
-          homeConfigurations = builders.compileHomes [
-            { user = "zynh"; hostname = "msiserver"; }
-            { user = "val"; hostname = "caveserver"; }
-            { user = "ravenshade"; hostname = "permafrost"; }
-          ];
-
+        {
           deploy =
             let homeConfigPath = username: deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations.${username};
             in {

flakeModules/builders/util.nix

@@ -75,8 +75,6 @@ rec {
           ./hosts/${hostname}/hardware-configuration.nix
           ./hosts/${hostname}/configuration.nix
           inputs.home-manager.nixosModules.default
-          inputs.chaotic.nixosModules.default
-          inputs.niri.nixosModules.niri
           {
             home-manager.extraSpecialArgs = {
               inherit inputs self pkgs;
@@ -100,7 +98,6 @@ rec {
         extraSpecialArgs = { inherit inputs self; };
 
         modules = [
-          inputs.chaotic.homeManagerModules.default
           ./hosts/${configHost}/home.nix
         ];
       });