Compare commits

..

15 Commits

Author SHA1 Message Date
ff129019e0 Revert "fix: update compose submodule — hermes-workspace HOST fix"
This reverts commit 8025607a53.
2026-05-20 14:10:11 -04:00
8025607a53 fix: update compose submodule — hermes-workspace HOST fix 2026-05-20 14:08:08 -04:00
a322ed0884 feat(secrets): add HERMES_WORKSPACE_PASSWORD to containers.env 2026-05-20 14:06:56 -04:00
68b7c40a9e fix(compose): update submodule to fix/hermes-build (dashboard + auth) 2026-05-20 14:06:32 -04:00
146c164c91 fix: update compose submodule — hermes-workspace HOST fix and entrypoint improvements 2026-05-20 14:05:58 -04:00
8e896e4c0d Revert "fix(compose): update compose submodule to feat/hermes-workspace-combined (dashboard + auth)"
This reverts commit 1898f39d24.
2026-05-20 14:05:44 -04:00
1898f39d24 fix(compose): update compose submodule to feat/hermes-workspace-combined (dashboard + auth) 2026-05-20 14:04:23 -04:00
c7a0a4dae4 Revert "feat(hermes): update compose submodule — drop fork overlay for v0.12.0 kanban"
This reverts commit b85513ade2.
2026-05-19 21:29:53 -04:00
b85513ade2 feat(hermes): update compose submodule — drop fork overlay for v0.12.0 kanban 2026-05-19 21:23:13 -04:00
d064bfb770 feat: add combined Hermes Workspace image with Swarm support
- Update compose submodule to feat/hermes-workspace-combined
- New ai/hermes-workspace/ Dockerfile combining our Hermes fork
  + workspace web UI + tmux (Swarm workers)
- Hermes dashboard enabled on port 9119
- Existing hermes/ Dockerfile preserved as fallback
2026-05-19 20:50:15 -04:00
36359de6aa Merge pull request 'feat: add Syncthing firewall port and update compose submodule' (#47) from feat/syncthing-org-sync into master
Reviewed-on: #47
2026-05-19 00:34:42 +00:00
Robert
10b8565fd6 Merge branch 'master' into feat/syncthing-org-sync 2026-05-18 20:33:29 -04:00
Robert
f672696b8e Update submodule for syncthing 2026-05-18 20:31:07 -04:00
0980dca455 fix: update compose submodule to Traefik-routed Syncthing 2026-05-14 21:40:12 -04:00
96bc20ab70 feat: add Syncthing firewall port and update compose submodule 2026-05-14 21:36:26 -04:00
6 changed files with 7 additions and 10 deletions

View File

@@ -25,12 +25,3 @@ This document outlines the development conventions for this NixOS-based infrastr
- **Secrets:** Secrets are managed with `agenix`. Edit encrypted files with `agenix -e <file>`. - **Secrets:** Secrets are managed with `agenix`. Edit encrypted files with `agenix -e <file>`.
- **Modularity:** Structure configurations into logical, reusable modules under `modules/`. New modules should be registered in `modules/nixos/default.nix` to be available to all hosts. - **Modularity:** Structure configurations into logical, reusable modules under `modules/`. New modules should be registered in `modules/nixos/default.nix` to be available to all hosts.
- **Error Handling:** Ensure Nix expressions are robust and handle potential evaluation errors gracefully. - **Error Handling:** Ensure Nix expressions are robust and handle potential evaluation errors gracefully.
## Workflow
- New feature → clean branch from `origin/master` → push → PR on Gitea
- Branch naming: `feat/description` (features), `fix/description` (bugs/docs)
- Always branch from `origin/master`, never from another feature branch
- Submodule changes: commit submodule update in parent repo (the parent commit pins the submodule commit)
- PR title should describe the change; body should explain motivation + summary
- After PR merge, delete the feature branch

View File

@@ -207,6 +207,7 @@
ai = { ai = {
path = self + "/assets/compose/ai"; path = self + "/assets/compose/ai";
envFile = config.age.secrets.containers_env.path; envFile = config.age.secrets.containers_env.path;
ports = [ 22000 ]; # Syncthing TCP sync
}; };
cloudstorage = { cloudstorage = {

View File

@@ -9,6 +9,10 @@
ai-worker = { ai-worker = {
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf"; main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf";
}; };
hermes_agent = {
age = "age178ypgaxn3fldh2aeqz37ncpk7jrplaxacrca8kkcycre3ahjef4s2dp3rp";
};
}; };
hosts = { hosts = {

Binary file not shown.

View File

@@ -4,6 +4,7 @@ let
keys.users.gortium.main keys.users.gortium.main
keys.hosts.lazyworkhorse.main keys.hosts.lazyworkhorse.main
keys.hosts.lazyworkhorse.bootstrap keys.hosts.lazyworkhorse.bootstrap
keys.users.hermes_agent.age
]; ];
in in
{ {