From 4bd849e534c7b9081adaff1c123ac59f1e71fe5e Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 28 Jun 2026 16:05:54 -0400 Subject: [PATCH] better cleaner containers --- hosts/hl-fwdesk.nix | 12 +++++++++++- .../common/containers/container-services/default.nix | 4 +++- .../common/containers/container-services/files.nix | 5 ++++- .../common/containers/container-services/lib.nix | 4 ++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index d96a890..3ae881e 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -181,7 +181,10 @@ in services.hermes = { image = "nousresearch/hermes-agent"; command = [ "gateway" "run" ]; - ports = [ "${toString ports.hermes}:8642" ]; + ports = [ + "${toString ports.hermes}:8642" + "${toString ports.hermesDashboard}:9119" + ]; volumes = [ "/var/lib/hermes:/opt/data" ]; environmentFiles = [ config.age.secrets.hermes-env.path ]; environment = { @@ -193,6 +196,13 @@ in "/opt/data/config.yaml" = '' terminal: backend: docker + gateway: + platforms: + telegram: + extra: + status_indicator: true + status_online: "🟢 Online" + status_offline: "🔴 Offline" ''; }; }; diff --git a/modules/nixos/common/containers/container-services/default.nix b/modules/nixos/common/containers/container-services/default.nix index ff4e815..6d873af 100644 --- a/modules/nixos/common/containers/container-services/default.nix +++ b/modules/nixos/common/containers/container-services/default.nix @@ -14,10 +14,12 @@ let runtimeService = containerLib.runtimeService isDocker; enabledGroups = lib.filterAttrs (_: g: g.enable) cfg; + optionsModule = import ./options.nix { inherit lib; }; in { - imports = [ ./options.nix ]; + options = optionsModule.options; + config = { assertions = lib.optionals (enabledGroups != { }) [ diff --git a/modules/nixos/common/containers/container-services/files.nix b/modules/nixos/common/containers/container-services/files.nix index 44a44dd..1746b2c 100644 --- a/modules/nixos/common/containers/container-services/files.nix +++ b/modules/nixos/common/containers/container-services/files.nix @@ -68,13 +68,16 @@ rec { mkFilesService = groupName: grpCfg: pkgs: let filesMap = getAllFiles grpCfg; + scriptFile = pkgs.writeShellScript "write-files-${groupName}" (mkFilesScript groupName grpCfg); in lib.optionalAttrs (filesMap != { }) { "container-services-${groupName}-files" = { description = "Write custom files for container service group '${groupName}'"; + before = [ "container-services-${groupName}.service" ]; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.bash}/bin/bash -c ${lib.escapeShellArg (mkFilesScript groupName grpCfg)}"; + RemainAfterExit = true; + ExecStart = scriptFile; }; }; }; diff --git a/modules/nixos/common/containers/container-services/lib.nix b/modules/nixos/common/containers/container-services/lib.nix index 6923bfe..87cb84f 100644 --- a/modules/nixos/common/containers/container-services/lib.nix +++ b/modules/nixos/common/containers/container-services/lib.nix @@ -27,7 +27,7 @@ # Sanitize a path into a valid filename pathToFilename = target: lib.strings.sanitizeDerivationName ( - lib.strings.removePrefix "/" target - | > builtins.replaceStrings [ "/" ] [ "-" ] + builtins.replaceStrings [ "/" ] [ "-" ] + (lib.strings.removePrefix "/" target) ); }