From 719b12e4317db00ab1eebc1696b7bc9b722b212b Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Thu, 25 Jul 2024 12:21:59 +0300
Subject: [PATCH] fix(configuration-types)!: consolidate names with upstream

`nixDarwin{Machines,Modules}` -> `darwin{Machines,Modules}`
---
 modules/flake/configurations.nix | 25 ++++++++++++++-----------
 modules/flake/modules.nix        |  2 +-
 nix/utils.nix                    |  4 ++--
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/modules/flake/configurations.nix b/modules/flake/configurations.nix
index 485bb3b..995eeb9 100644
--- a/modules/flake/configurations.nix
+++ b/modules/flake/configurations.nix
@@ -7,6 +7,7 @@ let
     hasFiles
     hasDirectories
     recurseDir
+    configuration-type-to-outputs-modules
     configuration-type-to-outputs-machines;
 in
 let
@@ -16,8 +17,8 @@ let
       useGlobalPkgs = true;
       # Do not keep packages in ${HOME}
       useUserPackages = true;
-      # Default import all of our exported homeManagerModules
-      sharedModules = builtins.attrValues config.flake.homeManagerModules;
+      # Default import all of our exported `home-manager` modules
+      sharedModules = builtins.attrValues config.flake.${configuration-type-to-outputs-modules "home-manager"};
       # Pass in `inputs`, `outputs` and maybe `meta`
       extraSpecialArgs = {
         inherit inputs outputs;
@@ -57,7 +58,7 @@ let
       {
         networking.hostName = lib.mkDefault hostname;
       }
-    ] ++ (builtins.attrValues config.flake.nixosModules);
+    ] ++ (builtins.attrValues config.flake.${configuration-type-to-outputs-modules "nixos"});
 
     specialArgs = {
       inherit inputs outputs;
@@ -74,7 +75,7 @@ let
       "${root}/configuration.nix"
       # Home Manager
       (homeManagerModule args)
-    ] ++ (builtins.attrValues config.flake.nixOnDroidModules);
+    ] ++ (builtins.attrValues config.flake.${configuration-type-to-outputs-modules "nix-on-droid"});
 
     extraSpecialArgs = {
       inherit inputs outputs;
@@ -97,7 +98,7 @@ let
       # {
       #   nixpkgs.hostPlatform = system;
       # }
-    ] ++ (builtins.attrValues config.flake.nixDarwinModules);
+    ] ++ (builtins.attrValues config.flake.${configuration-type-to-outputs-modules "nix-darwin"});
 
     specialArgs = {
       inherit inputs outputs;
@@ -110,7 +111,7 @@ let
 
     modules = [
       "${root}/home.nix"
-    ] ++ (builtins.attrValues config.flake.homeManagerModules);
+    ] ++ (builtins.attrValues config.flake.${configuration-type-to-outputs-modules "home-manager"});
 
     extraSpecialArgs = {
       inherit inputs outputs;
@@ -208,9 +209,11 @@ in
           ];
     in {
       # Machines
+      # NOTE: manually inheriting generated machines to avoid recursion
+      #       (`autoMachines` depends on `config.flake` itself)
       inherit (autoMachines)
         nixosMachines
-        nixDarwinMachines
+        darwinMachines
         nixOnDroidMachines
         homeManagerMachines;
 
@@ -236,7 +239,7 @@ in
                 (lib.strings.removeSuffix ".nix")
                 (builtins.attrNames (configurationFiles."home" or { })));
             })
-          config.flake.nixosMachines;
+          config.flake.${configuration-type-to-outputs-machines "nixos"};
 
       nixOnDroidConfigurations =
         createConfigurations
@@ -253,7 +256,7 @@ in
               inherit system;
               hostname = host;
             })
-          config.flake.nixOnDroidMachines;
+          config.flake.${configuration-type-to-outputs-machines "nix-on-droid"};
 
       darwinConfigurations =
         createConfigurations
@@ -276,7 +279,7 @@ in
                 (lib.strings.removeSuffix ".nix")
                 (builtins.attrNames (configurationFiles."home" or { })));
             })
-          config.flake.nixDarwinMachines;
+          config.flake.${configuration-type-to-outputs-machines "nix-darwin"};
 
       homeConfigurations =
         createConfigurations
@@ -293,7 +296,7 @@ in
               inherit system;
               hostname = host;
             })
-          config.flake.homeManagerMachines;
+          config.flake.${configuration-type-to-outputs-machines "home-manager"};
     };
   };
 }
diff --git a/modules/flake/modules.nix b/modules/flake/modules.nix
index 10017e0..7479c3c 100644
--- a/modules/flake/modules.nix
+++ b/modules/flake/modules.nix
@@ -136,7 +136,7 @@ in
       inherit (autoModules)
         nixosModules
         nixOnDroidModules
-        nixDarwinModules
+        darwinModules
         homeManagerModules
         flakeModules;
     };
diff --git a/nix/utils.nix b/nix/utils.nix
index f3a05dd..ad30de3 100644
--- a/nix/utils.nix
+++ b/nix/utils.nix
@@ -62,7 +62,7 @@ rec {
       {
         nixos = "nixosMachines";
         nix-on-droid = "nixOnDroidMachines";
-        nix-darwin = "nixDarwinMachines";
+        nix-darwin = "darwinMachines";
         home-manager = "homeManagerMachines";
       }
       (configuration-type:
@@ -74,7 +74,7 @@ rec {
       {
         nixos = "nixosModules";
         nix-on-droid = "nixOnDroidModules";
-        nix-darwin = "nixDarwinModules";
+        nix-darwin = "darwinModules";
         home-manager = "homeManagerModules";
         flake = "flakeModules";
       }