Fix import strategy

configuration.nix

@@ -8,7 +8,7 @@
       ./common
       ./common/sites/gifford
       ./common/server
-      ./services.nix
+      ./services
     ];
   boot.loader = {
     grub = {

services.nix

@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  environment.etc."srv/docker-compose.yml" = builtins.readFile ./docker-compose.yml;
-
-  systemd.services.load-balancer = let dataset = "gc1_srv";
-  in {
-    wantedBy      = ["multi-user.target"];
-    requires      = ["public-network.service"
-                     "zfs-import-${dataset}.service"];
-    after         = ["public-network.service"
-                     "zfs-import-${dataset}.service"];
-    serviceConfig = {
-      ExecStart        = "${pkgs.docker}/bin/docker compose up";
-      WorkingDirectory = "/etc/srv/load-balancer";
-    };
-  };
-
-}
-# '//' in nix means "merge attribute sets". We're importing a function at the
-# path, then calling it with the attr set as an argument, and merging the
-# results with the config above
-// import ./common/services/load-balancer { dataset = "gc1_srv"; pkgs = pkgs; }
-// import ./common/services/conduit.nix {
-    dataset = "gc1_srv";
-    pkgs = pkgs;
-    domain = "chat.techwork.zone";
-}

services/conduit.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: import ../common/services/conduit.nix {
+    dataset = "gc1_srv";
+    pkgs = pkgs;
+    domain = "chat.techwork.zone";
+}

services/default.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  imports = [
+    ./load-balancer.nix
+    ./conduit.nix
+  ];
+}

services/load-balancer.nix

@@ -0,0 +1 @@
+{pkgs, ...}: import ../common/services/load-balancer { dataset = "gc1_srv"; pkgs = pkgs; }