From 39693c49180c45de02a7efdb8237a3f7d4806399 Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@helcel>
Date: Sun, 7 Jun 2026 22:16:41 +0200
Subject: [PATCH] 2step setup

---
 modules/server/containers/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/server/containers/default.nix b/modules/server/containers/default.nix
index 9f77026..1a582d4 100644
--- a/modules/server/containers/default.nix
+++ b/modules/server/containers/default.nix
@@ -13,9 +13,9 @@ let
   mergedContainers = lib.concatMapAttrs (appName: app:
     lib.mapAttrs' (cName: cCfg: lib.nameValuePair "${appName}-${cName}" cCfg) app.runtime.containers
   ) loadedContainers;
-  allPathConfigs =
-    (lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path))
-    ++ concatRuntimeLists "paths";
+  basePathConfigs =
+    lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path);
+  runtimePathConfigs = concatRuntimeLists "paths";
   allSetupConfigs = map (app: ({ name = app.name; envFile = ""; } // app.runtime.setup)) appsList;
   allCronsConfigs = concatRuntimeLists "cron";
   allVMConfigs = builtins.filter (app: app.runtime.vm != null) appsList;
@@ -40,9 +40,13 @@ in {
         backend = "podman";
         containers = mergedContainers;
       };
-      system.activationScripts.container-setup-dirs = {
+      system.activationScripts.container-setup-base-dirs = {
         deps = [ "users" "groups" ];
-        text = lib.concatStringsSep "\n" (map mkPathSetup allPathConfigs);
+        text = lib.concatStringsSep "\n" (map mkPathSetup basePathConfigs);
+      };
+      system.activationScripts.container-setup-runtime-dirs = {
+        deps = [ "container-setup-base-dirs" ];
+        text = lib.concatStringsSep "\n" (map mkPathSetup runtimePathConfigs);
       };
 
       systemd.services = {