From 31d83e8afe01931eaa64e642781cd0e6fed423bd Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Thu, 14 Mar 2024 00:58:33 +0800
Subject: [PATCH] fix: macosSystem & colmenaSystem

---
 lib/colmenaSystem.nix | 10 +++++-----
 lib/macosSystem.nix   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/colmenaSystem.nix b/lib/colmenaSystem.nix
index 7e58360ee..3680fb7ad 100644
--- a/lib/colmenaSystem.nix
+++ b/lib/colmenaSystem.nix
@@ -1,8 +1,9 @@
 # colmena - Remote Deployment via SSH
 {
+  lib,
   inputs,
   nixos-modules,
-  home-module ? null,
+  home-modules ? null,
   myvars,
   system,
   tags,
@@ -23,17 +24,16 @@ in
     imports =
       nixos-modules
       ++ (
-        if (home-module != null)
-        then [
+        lib.optionals ((lib.lists.length home-modules) > 0)
+        [
           home-manager.nixosModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
 
             home-manager.extraSpecialArgs = specialArgs;
-            home-manager.users."${myvars.username}" = home-module;
+            home-manager.users."${myvars.username}".imports = home-modules;
           }
         ]
-        else []
       );
   }
diff --git a/lib/macosSystem.nix b/lib/macosSystem.nix
index fd553a791..347c919d9 100644
--- a/lib/macosSystem.nix
+++ b/lib/macosSystem.nix
@@ -30,7 +30,7 @@ in
       ++ (
         lib.optionals ((lib.lists.length home-modules) > 0)
         [
-          home-manager.nixosModules.home-manager
+          home-manager.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;