Merge pull request #95 from ryan4yin/fix-home-manager

fix: macosSystem & colmenaSystem
ryan4yin · Mar 13, 2024 · 532121e · 532121e
2 parents 1c65d16 + 31d83e8
commit 532121e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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;