From d65929b62652cc1b6258efe5e91f5c1b34d6c9e0 Mon Sep 17 00:00:00 2001
From: geekiot <geekiot@proton.me>
Date: Sat, 27 Sep 2025 17:39:35 +0500
Subject: [PATCH] fix (options): fix make-config-function's errors

---
 lib/config.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/config.nix b/lib/config.nix
index 5463ac4..28b95e0 100644
--- a/lib/config.nix
+++ b/lib/config.nix
@@ -19,7 +19,7 @@ let
   HomeCustomOptions = ../options/home;
 
   DeviceConfig = ../devices/${deviceName};
-  HostConfig = ../users/${hostName}/host;
+  HostConfig = ../users/${userName}/host;
   HomeConfig = ../users/${userName}/home;
 
   customFunctions = import ./utils.nix { inherit lib; };
@@ -30,13 +30,13 @@ let
         systemArch
         nixpkgs-old
         nixpkgs-latest
-        packagesConfig
+        userPackagesConfig
         ;
     }
     |> builtins.attrValues;
   overlays = baseOverlays ++ additionalOverlays;
 
-  userData = import ../users/${userName}/data.nix {
+  userData = import ../users/${userName}/data {
     inherit
       deviceName
       hostName
@@ -44,10 +44,18 @@ let
       systemArch
       ;
   };
+  userScripts = import ../users/${userName}/scripts;
 
-  userPackagesConfig = import ../users/${hostName}/packages_config.nix { inherit lib; };
+  userPackagesConfig = import ../users/${userName}/packages { inherit lib; };
 
-  additionalArgs = { inherit inputs customFunctions userData; };
+  additionalArgs = {
+    inherit
+      inputs
+      customFunctions
+      userData
+      userScripts
+      ;
+  };
 
   sops = {
     defaultSopsFormat = "yaml";
@@ -63,7 +71,6 @@ lib.nixosSystem {
     DeviceCustomOptions
     HostCustomOptions
 
-    CustomOptions
     DeviceConfig
     HostConfig
 
@@ -79,8 +86,12 @@ lib.nixosSystem {
     inputs.home-manager.nixosModules.home-manager
     {
       home-manager = {
-        users.${userName} = import HomeConfig;
-        users.${userName} = import HomeCustomOptions;
+        users.${userName} = {
+          imports = [
+            HomeConfig
+            HomeCustomOptions
+          ];
+        };
         useGlobalPkgs = true;
         useUserPackages = true;
         extraSpecialArgs = additionalArgs;