From 395ac91da06fcaa77722d4c35d511efd8f1edb5f Mon Sep 17 00:00:00 2001
From: Archit Gupta <archit@accelbread.com>
Date: Tue, 5 Dec 2023 00:12:04 -0800
Subject: [PATCH] Minor refactor in (nixos|home)Configurations

---
 builtinModules/homeConfigurations.nix  | 7 ++++---
 builtinModules/nixosConfigurations.nix | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/builtinModules/homeConfigurations.nix b/builtinModules/homeConfigurations.nix
index 2df9a01..5afa96e 100644
--- a/builtinModules/homeConfigurations.nix
+++ b/builtinModules/homeConfigurations.nix
@@ -17,6 +17,8 @@ let
     check = x: isAttrs x && x ? activationPackage;
     merge = mergeOneOption;
   };
+
+  configs = mapAttrs (_: f: f autoloadArgs) config.homeConfigurations;
 in
 {
   options.homeConfigurations = mkOption {
@@ -25,12 +27,11 @@ in
   };
 
   config.outputs = mkIf (config.homeConfigurations != { }) {
-    homeConfigurations = mapAttrs (_: f: f autoloadArgs)
-      config.homeConfigurations;
+    homeConfigurations = configs;
     checks = foldl recursiveUpdate { } (mapAttrsToList
       (n: v: {
         ${v.config.nixpkgs.system}."home-${n}" = v.activationPackage;
       })
-      (mapAttrs (_: f: f autoloadArgs) config.homeConfigurations));
+      configs);
   };
 }
diff --git a/builtinModules/nixosConfigurations.nix b/builtinModules/nixosConfigurations.nix
index 52a6a35..49786d8 100644
--- a/builtinModules/nixosConfigurations.nix
+++ b/builtinModules/nixosConfigurations.nix
@@ -19,6 +19,8 @@ let
       && x ? config.system.build.toplevel;
     merge = mergeOneOption;
   };
+
+  configs = mapAttrs (_: f: f autoloadArgs) config.nixosConfigurations;
 in
 {
   options.nixosConfigurations = mkOption {
@@ -27,13 +29,12 @@ in
   };
 
   config.outputs = mkIf (config.nixosConfigurations != { }) {
-    nixosConfigurations = mapAttrs (_: f: f autoloadArgs)
-      config.nixosConfigurations;
+    nixosConfigurations = configs;
     checks = foldl recursiveUpdate { } (mapAttrsToList
       (n: v: {
         ${v.config.nixpkgs.system}."nixos-${n}" =
           v.config.system.build.toplevel;
       })
-      (mapAttrs (_: f: f autoloadArgs) config.nixosConfigurations));
+      configs);
   };
 }