diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix index 82a796f..3673b71 100755 --- a/modules/nixos/services/forgejo/default.nix +++ b/modules/nixos/services/forgejo/default.nix @@ -4,7 +4,9 @@ ... }: let - inherit (flake.config.machines.devices) ceres; + inherit (flake.config.machines.devices) + ceres + ; inherit (flake.config.services.instances) smtp forgejo web; service = forgejo; localhost = web.localhost.address0; diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix index 4a8a209..19ed901 100755 --- a/systems/ceres/config/comfyui.nix +++ b/systems/ceres/config/comfyui.nix @@ -6,7 +6,6 @@ }: let - inherit (flake.config.machines.devices) ceres; inherit (flake.config.services.instances) comfyui web; service = comfyui; localhost = web.localhost.address1; @@ -54,20 +53,11 @@ in }; }; }; - - fileSystems."/var/lib/${service.name}/models" = { - device = "${service.paths.path0}/models"; - fsType = "none"; - options = [ - "bind" - ]; - depends = [ - ceres.storage0.mount - ]; - }; systemd.tmpfiles.rules = [ - "Z ${service.paths.path0}/models 755 root root -" "Z ${service.sops.path0} 755 caddy caddy -" + "d ${service.paths.path0}/custom_nodes 0755 ${service.name} ${service.name} -" + "r ${config.services.comfyui.package}/custom_nodes" + "L+ ${config.services.comfyui.package}/custom_nodes - - - - ${service.paths.path0}/custom_nodes" ]; users.users.${service.name}.extraGroups = [