From aeeb6a95f99ffe68a3aecc4b0cf4732470dd1d37 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Wed, 31 Jul 2024 13:13:42 +0800
Subject: [PATCH] lib/env-builders: refactor

---
 lib/env-builders.nix | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/env-builders.nix b/lib/env-builders.nix
index 7552938a..a502cfbc 100644
--- a/lib/env-builders.nix
+++ b/lib/env-builders.nix
@@ -52,13 +52,13 @@ rec {
         foodogsquaredUtils = import ./utils/nixos.nix { inherit lib; };
         foodogsquaredModulesPath = builtins.toString nixosModules;
       };
-      modules = extraModules ++ lib.singleton {
-        imports = [
-          nixosModules
-          ../modules/nixos/_private
-        ];
-        nixpkgs.hostPlatform = lib.mkForce system;
-      };
+      modules = extraModules ++ [
+        nixosModules
+        ../modules/nixos/_private
+        ({ lib, ... }: {
+          nixpkgs.hostPlatform = lib.mkForce system;
+        })
+      ];
 
       # Since we're setting it through nixpkgs.hostPlatform, we'll have to pass
       # this as null.
@@ -100,12 +100,11 @@ rec {
         foodogsquaredModulesPath = builtins.toString homeModules;
       };
       configuration = { lib, ... }: {
-        imports = modules ++ lib.singleton {
-          imports = [
-            homeModules
-            ../modules/home-manager/_private
-          ];
-        };
+        imports = modules ++ [
+          homeModules
+          ../modules/home-manager/_private
+        ];
+
         config = {
           programs.home-manager.path = homeManagerSrc;
           inherit (pkgs) overlays;
@@ -130,11 +129,9 @@ rec {
         specialArgs = specialArgs // {
           foodogsquaredModulesPath = builtins.toString wrapperManagerModules;
         };
-        modules = modules ++ lib.singleton {
-          imports = [
-            wrapperManagerModules
-            ../modules/wrapper-manager/_private
-          ];
-        };
+        modules = modules ++ [
+          wrapperManagerModules
+          ../modules/wrapper-manager/_private
+        ];
       };
 }