move machine configurations under darwin and nixos

Don't manage fonts on Darwin with homebrew.

1 files changed, 22 insertions, 29 deletions

diff --git a/nix/flake/hosts.nix b/nix/flake/hosts.nix
index eaa0a45..9426bdd 100644
--- a/nix/flake/hosts.nix
+++ b/nix/flake/hosts.nix
@@ -12,44 +12,37 @@ let
           home-manager = {
             useGlobalPkgs = true;
             useUserPackages = true;
-            extraSpecialArgs = {
-              inherit self;
-            };
+            extraSpecialArgs = { inherit self; };
           };
         }
-        "${self}/nix/hosts/common/homebrew.nix"
-        "${self}/nix/hosts/common/macos.nix"
+        "${self}/nix/hosts/darwin/"
         "${self}/nix/hosts/common/nix.nix"
         path
-        {
-          nixpkgs.overlays = [
-          ];
-        }
+        { nixpkgs.overlays = [ ]; }
       ];
       specialArgs = { inherit inputs self; };
     };
 
-  mkNixosConfig = system: path: nixpkgs.lib.nixosSystem {
-    inherit system;
-    modules = [
-      "${self}/nix/hosts/nixos"
-      path
-    ];
-    specialArgs = { inherit inputs self; };
-  };
+  mkNixosConfig = system: path:
+    nixpkgs.lib.nixosSystem {
+      inherit system;
+      modules =
+        [ "${self}/nix/hosts/nixos" "${self}/nix/hosts/common/nix.nix" path ];
+      specialArgs = { inherit inputs self; };
+    };
 in
 {
-  flake = mkMerge [
-    {
-      darwinConfigurations = {
-        mba-fcuny = mkDarwinConfig "aarch64-darwin" "${self}/nix/hosts/mba";
-        HQ-C02FK3Q7MD6T = mkDarwinConfig "x86_64-darwin" "${self}/nix/hosts/work";
-      };
+  flake = mkMerge [{
+    darwinConfigurations = {
+      mba-fcuny =
+        mkDarwinConfig "aarch64-darwin" "${self}/nix/hosts/darwin/mba";
+      HQ-C02FK3Q7MD6T =
+        mkDarwinConfig "x86_64-darwin" "${self}/nix/hosts/darwin/work";
+    };
 
-      nixosConfigurations = {
-        vm = mkNixosConfig "aarch64-linux" "${self}/nix/hosts/vm";
-        wildcat = mkNixosConfig "x86_64-linux" "${self}/nix/hosts/wildcat";
-      };
-    }
-  ];
+    nixosConfigurations = {
+      vm = mkNixosConfig "aarch64-linux" "${self}/nix/hosts/nixos/vm";
+      wildcat = mkNixosConfig "x86_64-linux" "${self}/nix/hosts/nixos/wildcat";
+    };
+  }];
 }