fix: Temporarily rely on parent module name to get the homeModules …

…working
juspay · Feb 14, 2025 · 7b5d728 · 7b5d728
1 parent d421ffe
commit 7b5d728
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/nix/lib.nix b/nix/lib.nix
@@ -4,7 +4,7 @@
   # where module filename is of form `${name}.nix`. The submodule takes this
   # 'name' parameter, and is expected to set the final process-compose config in
   # its `outputs.settings` option.
-  multiService = process-manager-name: mod:
+  multiService = name: mod:
     { config, pkgs, lib, ... }:
     let
       # Derive name from filename
@@ -87,19 +87,17 @@
           });
         };
       };
-      config = lib.optionalAttrs (process-manager-name == "launchd")
+      config = lib.optionalAttrs (name == "homeModules")
         {
+          systemd.user.services = lib.pipe config.services.${service} [
+            (lib.filterAttrs (_: cfg: cfg.enable))
+            (lib.concatMapAttrs (_: cfg: cfg.outputs.systemd))
+          ];
           launchd.agents = lib.pipe config.services.${service} [
             (lib.concatMapAttrs (_: cfg: lib.mapAttrs (_: cf: { ... }: { imports = [ cf ]; }) cfg.outputs.launchd))
           ];
         }
-      // lib.optionalAttrs (process-manager-name == "systemd") {
-        systemd.user.services = lib.pipe config.services.${service} [
-          (lib.filterAttrs (_: cfg: cfg.enable))
-          (lib.concatMapAttrs (_: cfg: cfg.outputs.systemd))
-        ];
-      }
-      // lib.optionalAttrs (process-manager-name == "process-compose") {
+      // lib.optionalAttrs (name == "processComposeModules") {
         settings = {
           imports =
             lib.pipe config.services.${service} [

diff --git a/nix/services/default.nix b/nix/services/default.nix
@@ -28,10 +28,15 @@ let
 in
 {
   processComposeModules = {
-    imports = (builtins.map (multiService "process-compose") services) ++ [ ./devShell.nix ];
+    imports = (builtins.map (multiService "processComposeModules") services) ++ [ ./devShell.nix ];
   };
 
   homeModules = {
-    imports = (builtins.map (multiService "systemd") services) ++ (builtins.map (multiService "launchd") services);
+    imports = (builtins.map (multiService "homeModules") services);
+    # imports = lib.pipe services [
+    #   (map (multiService "systemd"))
+    #   (map (multiService "launchd"))
+    # ];
+    # imports = (builtins.map (multiService "systemd") services) ++ (builtins.map (multiService "launchd") services);
   };
 }