diff --git a/flake.lock b/flake.lock index 5e16473..cbdc664 100644 --- a/flake.lock +++ b/flake.lock @@ -1400,15 +1400,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1792542070, - "narHash": "sha256-FI+AF5jFi/NqfbMmFZ/CfS6dLzguZi2Im4CgAqU/W28=", + "lastModified": 1793183825, + "narHash": "sha256-MMn1clKPz3FyrFEq39OqXZ2SO3QBaOOFtAFVIcO+VvU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c7216a9807a2683ce243f6ed14ae01e7e884c426", + "rev": "0aa6745f705f2c4b0a5004eb019ef76e5bbdb426", "type": "github" }, "original": { "owner": "hyprwm", + "ref": "v0.57.0", "repo": "Hyprland", "type": "github" } @@ -1903,11 +1904,11 @@ ] }, "locked": { - "lastModified": 1792422421, - "narHash": "sha256-PPFSrljjMij4EkXf5fDvKGwZZvVUlets3s1GpvJovr0=", + "lastModified": 1792673440, + "narHash": "sha256-7l2+xIZ7IU9r4h9ngSrGH7oQs8XZj0NR0V+96wkN8zk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "b6e5781af3716d2d401cfbee47fc2e961d479ccb", + "rev": "0d13d5a624eb093b600d1b2cbe448fb613c86424", "type": "github" }, "original": { @@ -3070,11 +3071,11 @@ "treefmt-nix": [] }, "locked": { - "lastModified": 1793121438, - "narHash": "sha256-/oPrlfJoMbRNvv9r9M2O9chx74UkxF9y0aV3C6TqSK8=", + "lastModified": 1793232093, + "narHash": "sha256-lH8MNrXEyWzkM+iA0ILRH3qoqSrE0ZJ76FeFoEHWgac=", "ref": "refs/heads/main", - "rev": "01e1d47856dae496ba7e30d8864ae3228e22612a", - "revCount": 2, + "rev": "c8a494361d085a355f63f98ec92c5aee58f3c51c", + "revCount": 4, "type": "git", "url": "ssh://gitea@gitea.app.internal:22/ari/robotnix.git" }, diff --git a/flake.nix b/flake.nix index 249e392..7d5be49 100644 --- a/flake.nix +++ b/flake.nix @@ -92,8 +92,11 @@ }; # Hyprland hyprlauncher.url = "github:hyprwm/hyprlauncher"; - # Hyprland compositor via flake (latest git). - hyprland.url = "github:hyprwm/Hyprland"; + # Hyprland compositor via flake — pinned to the latest stable release tag + # (was floating on main, 50 commits past v0.57.0, which caused a + # compositor render-spin episode on fwbook: ~4-core spin, 100°C, no + # suspend requested). Re-lock with: nix flake lock --update-input hyprland + hyprland.url = "github:hyprwm/Hyprland/v0.57.0"; # Secrets management agenix.url = "github:ryantm/agenix"; @@ -195,6 +198,7 @@ scrypted-envs = ./secrets/scrypted-envs.age; robots-shared = ./secrets/robots-shared.age; robots-sibli = ./secrets/robots-sibli.age; + robots-genix = ./secrets/robots-genix.age; }; inherit hyprlauncher diff --git a/hosts/fwbook/default.nix b/hosts/fwbook/default.nix index 02d81d2..f775941 100644 --- a/hosts/fwbook/default.nix +++ b/hosts/fwbook/default.nix @@ -19,6 +19,7 @@ laptop-power-mgr = { enable = true; enableTempMonitor = true; + enableLidSuspendWatchdog = true; }; amdgpu.enable = true; }; diff --git a/hosts/hl-fwdesk/services/robotnix.nix b/hosts/hl-fwdesk/services/robotnix.nix index a39a3c8..4c051a6 100644 --- a/hosts/hl-fwdesk/services/robotnix.nix +++ b/hosts/hl-fwdesk/services/robotnix.nix @@ -1,13 +1,25 @@ { config, lib, skyg-secrets, ... }: let apps = config.skyg.internalNetworkingMap.apps; - robotSecrets = [ "robots-shared" "robots-sibli" ]; + robotSecrets = [ "robots-shared" "robots-sibli" "robots-genix" ]; secret = name: config.age.secrets.${name}.path; ports = { ollama = 11434; ds4 = 8000; tracker = 1984; }; + # A robot's seed: its config plus the files it shares with the others. + # Each robot gets copies under /etc/nixos/seed (same layout as this repo), + # so a robot that rebuilds itself (genix) keeps working. + seedOf = file: { + root = ../../..; + configuration = file; + extraFiles = [ + ./robotnix/common.nix + ./robotnix/buzz.nix + ../../../pkgs/buzz-cli + ]; + }; in { age.secrets = lib.genAttrs robotSecrets (name: { @@ -47,7 +59,7 @@ in cpus = { min = 1; max = 4; }; memory = { min = "2G"; max = "16G"; }; disk = { rootSize = "100G"; homeSize = "60G"; }; - seed.configuration = ./robotnix/sibli.nix; + seed = seedOf ./robotnix/sibli.nix; hermes = { name = "Siblix"; environmentFiles = [ (secret "robots-sibli") ]; @@ -66,5 +78,47 @@ in access = { }; git.enable = false; }; + + # Persistent and self-managing: genix changes and applies its own system + # (robotnix-apply), pushes its flake to gitea, and pulls it back after a + # reseed. Add /var/lib/robotnix-git/id_ed25519.pub (inside genix) as a + # deploy key with write access on ari/genix. + robots.genix = { + id = 3; + address = apps.genix.ip; + cpus = { min = 1; max = 6; }; + memory = { min = "4G"; max = "24G"; }; + disk = { rootSize = "150G"; homeSize = "100G"; }; + seed = seedOf ./robotnix/genix.nix; + selfManage.enable = true; + git = { + remoteUrl = "gitea@gitea.app.internal:Hermenix/genix.git"; + interval = "hourly"; + }; + hermes = { + name = "Genix"; + environmentFiles = [ (secret "robots-genix") ]; + settings = { + model = { + provider = "commandcode"; + default = "deepseek/deepseek-v4.1-flash"; + }; + fallback_providers = [ + { provider = "anthropic"; model = "claude-haiku-5-5"; } + { provider = "openrouter"; model = "deepseek/deepseek-v4.1-flash"; } + ]; + }; + }; + allowDocker = true; + # Survive a reseed (root is rebuilt from the git remote). + persist = [ + "/var/lib/hermes" + "/var/lib/docker" + ]; + # Push/pull its flake over gitea's ssh. + access.lanAccess = [ + { address = apps.gitea.ip; port = 22; } + ]; + }; }; } diff --git a/hosts/hl-fwdesk/services/robotnix/buzz.nix b/hosts/hl-fwdesk/services/robotnix/buzz.nix new file mode 100644 index 0000000..8c7b6ec --- /dev/null +++ b/hosts/hl-fwdesk/services/robotnix/buzz.nix @@ -0,0 +1,77 @@ +# Buzz for a robot's Hermes: the `buzz` CLI and a profile for its key. +# Shared by this host's robots (copied into each under /etc/nixos/seed). +# Needs a Buzz identity in the robot's secret: `skyg buzz identity `. +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.robot.buzz; + # Built from this repo; the robot gets a copy of pkgs/buzz-cli with this file. + buzz-cli = pkgs.callPackage ../../../../pkgs/buzz-cli { }; +in +{ + options.skyg.robot.buzz = { + enable = lib.mkEnableOption "Buzz for this robot's Hermes"; + homeChannel = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = "BUZZ_HOME_CHANNEL (not secret, so it lives here, not in the secret)."; + }; + profileName = lib.mkOption { + type = lib.types.str; + default = config.services.hermes-agent.environment.API_SERVER_MODEL_NAME or config.networking.hostName; + defaultText = lib.literalExpression "the Hermes gateway model name, else the host name"; + description = "Name published for a new key that has no Buzz profile yet."; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ buzz-cli ]; + + # The Hermes service PATH has no system packages. + services.hermes-agent.environment = { + BUZZ_CLI_PATH = "${buzz-cli}/bin/buzz"; + } // lib.optionalAttrs (cfg.homeChannel != null) { + BUZZ_HOME_CHANNEL = cfg.homeChannel; + }; + + # A new Buzz key has no profile, and Hermes won't connect without one. + # Publish one at start if missing; the relay keeps it. + systemd.services.buzz-profile = { + description = "Publish the Buzz profile if missing"; + wantedBy = [ "multi-user.target" ]; + before = [ "hermes-agent.service" ]; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; + path = [ buzz-cli pkgs.jq ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "hermes"; + EnvironmentFile = config.systemd.services.hermes-agent.serviceConfig.EnvironmentFile; + }; + script = '' + if [ -z "''${BUZZ_PRIVATE_KEY:-}" ] || [ -z "''${BUZZ_RELAY_URL:-}" ]; then + echo "No Buzz creds, skipping." + exit 0 + fi + # Retry: the relay may not be reachable yet. Failure is not fatal. + for _ in 1 2 3 4 5; do + n="" + if out=$(buzz users get); then + n=$(jq 'length' <<<"$out") || n="" + fi + if [ "$n" = "0" ]; then + if buzz users set-profile --name ${lib.escapeShellArg cfg.profileName}; then + echo "Published Buzz profile." + exit 0 + fi + elif [ -n "$n" ]; then + echo "Buzz profile exists." + exit 0 + fi + sleep 5 + done + echo "Could not check or publish the Buzz profile." >&2 + ''; + }; + }; +} diff --git a/hosts/hl-fwdesk/services/robotnix/common.nix b/hosts/hl-fwdesk/services/robotnix/common.nix new file mode 100644 index 0000000..d28c0b6 --- /dev/null +++ b/hosts/hl-fwdesk/services/robotnix/common.nix @@ -0,0 +1,45 @@ +# Shared base for this host's robots (sibli, genix). Robots get a copy under +# /etc/nixos/seed (see seedOf in ../robotnix.nix), so a robot that rebuilds +# itself keeps working; edit it here for new installs and ephemeral robots. +{ config, lib, pkgs, ... }: +let + user = config.robotnix.user; +in +{ + # The user has no password; ssh keys only. + security.sudo.wheelNeedsPassword = false; + + environment.systemPackages = with pkgs; [ + git + vim + curl + htop + claude-code + devenv + direnv + (python3.withPackages (ps: [ ps.pip ])) + nodejs + docker-compose + zellij + ]; + nixpkgs.config.allowUnfree = true; + + # direnv: hook into bash so the repo's devenv shims work. + programs.bash = { + enable = true; + interactiveShellInit = '' + eval "$(direnv hook bash)" + ''; + }; + + # Docker + compose. Needs allowDocker = true on the host. + virtualisation.docker.enable = true; + users.users.${user}.extraGroups = [ "docker" ]; + users.users.hermes.extraGroups = lib.mkIf config.robotnix.hermes.enable [ "docker" ]; + + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 14d"; + }; +} diff --git a/hosts/hl-fwdesk/services/robotnix/genix.nix b/hosts/hl-fwdesk/services/robotnix/genix.nix new file mode 100644 index 0000000..66a4206 --- /dev/null +++ b/hosts/hl-fwdesk/services/robotnix/genix.nix @@ -0,0 +1,13 @@ +# genix's starting config. It is persistent and manages itself: after the +# first install this (copied to /etc/nixos/seed/...) belongs to genix, which +# changes and applies its own system with robotnix-apply. Edits here only +# matter for a fresh install with nothing on its git remote. +{ ... }: +{ + imports = [ + ./common.nix + ./buzz.nix + ]; + + skyg.robot.buzz.enable = true; +} diff --git a/hosts/hl-fwdesk/services/robotnix/sibli.nix b/hosts/hl-fwdesk/services/robotnix/sibli.nix index a849989..c466769 100644 --- a/hosts/hl-fwdesk/services/robotnix/sibli.nix +++ b/hosts/hl-fwdesk/services/robotnix/sibli.nix @@ -1,92 +1,29 @@ # sibli is ephemeral: root resets to this config on every start, so change # things here (then rebuild the host), not inside the robot. -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let - buzz-cli = pkgs.callPackage ../../../../pkgs/buzz-cli { }; robotoName = config.services.hermes-agent.environment.API_SERVER_MODEL_NAME; in { - # The user has no password; ssh keys only. - security.sudo.wheelNeedsPassword = false; - - environment.systemPackages = with pkgs; [ - git - vim - curl - htop - claude-code - devenv - direnv - (python3.withPackages (ps: [ ps.pip ])) - nodejs - docker-compose - zellij - buzz-cli + imports = [ + ./common.nix + ./buzz.nix ]; - nixpkgs.config.allowUnfree = true; - # direnv: hook into bash so the repo's devenv shims work. - programs.bash = { + skyg.robot.buzz = { enable = true; - interactiveShellInit = '' - eval "$(direnv hook bash)" - ''; + homeChannel = "a8969cdc-7ba2-4e25-ae18-b898ab59003d"; }; - services.hermes-agent.environment = { - BUZZ_CLI_PATH = "${buzz-cli}/bin/buzz"; - BUZZ_HOME_CHANNEL = "a8969cdc-7ba2-4e25-ae18-b898ab59003d"; - }; - - # A new Buzz key has no profile, and Hermes won't connect without one. - # Publish one at start if missing; the relay keeps it across resets. - systemd.services.buzz-profile = { - description = "Publish the Buzz profile if missing"; - wantedBy = [ "multi-user.target" ]; - before = [ "hermes-agent.service" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - path = [ buzz-cli pkgs.jq ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - User = "hermes"; - EnvironmentFile = config.systemd.services.hermes-agent.serviceConfig.EnvironmentFile; + services.hermes-agent = { + extraPackages = [ pkgs.nodejs ]; + mcpServers.shortcut = { + command = "${pkgs.nodejs}/bin/npx"; + args = [ "-y" "@shortcut/mcp@latest" ]; + env.SHORTCUT_API_TOKEN = "\${SHORTCUT_API_KEY}"; }; - script = '' - if [ -z "''${BUZZ_PRIVATE_KEY:-}" ] || [ -z "''${BUZZ_RELAY_URL:-}" ]; then - echo "No Buzz creds, skipping." - exit 0 - fi - # Retry: the relay may not be reachable yet. Failure is not fatal. - for _ in 1 2 3 4 5; do - n="" - if out=$(buzz users get); then - n=$(jq 'length' <<<"$out") || n="" - fi - if [ "$n" = "0" ]; then - if buzz users set-profile --name ${lib.escapeShellArg robotoName}; then - echo "Published Buzz profile." - exit 0 - fi - elif [ -n "$n" ]; then - echo "Buzz profile exists." - exit 0 - fi - sleep 5 - done - echo "Could not check or publish the Buzz profile." >&2 - ''; }; - # Docker + compose. Needs allowDocker = true on the host. - virtualisation.docker.enable = true; - users.users.ari.extraGroups = [ "docker" ]; - users.users.hermes.extraGroups = [ "docker" ]; - - # Own tailnet machine. Needs allowTun = true on the host. - # Logs in by itself with TS_AUTHKEY from the robots-sibli secret. - # State is kept via persist on the host, so this only matters once. services.tailscale.enable = true; services.tailscale.openFirewall = true; networking.firewall.trustedInterfaces = [ "tailscale0" ]; @@ -131,9 +68,4 @@ in echo "Could not log in to Tailscale." >&2 ''; }; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 14d"; - }; } diff --git a/modules/main.nix b/modules/main.nix index 761cbc6..d87e1d2 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -113,6 +113,7 @@ in immich-ml = { ip = "10.0.101.11"; }; gilix = { ip = "10.0.101.13"; }; sibli = { ip = "10.0.101.14"; }; + genix = { ip = "10.0.101.12"; }; jellyfin = { ip = "10.0.101.5"; }; nvr = { ip = "10.0.101.6"; }; portainer = { ip = "10.0.101.241"; }; diff --git a/modules/nixos/common/hardware/laptop-power.nix b/modules/nixos/common/hardware/laptop-power.nix index e321ad4..a5da45a 100644 --- a/modules/nixos/common/hardware/laptop-power.nix +++ b/modules/nixos/common/hardware/laptop-power.nix @@ -136,11 +136,63 @@ let print("Lid event monitor stopped", file=sys.stderr, flush=True) EOFPYTHON ''; + + # Safety net: if the lid is closed but the machine is still awake, force a + # suspend. Runs every minute via lid-suspend-watchdog.timer. Rescues the + # "closed laptop in a bag, sitting awake and overheating" failure mode where + # logind missed the lid event or the compositor wedged before sleep. + lid-suspend-watchdog-script = pkgs.writeShellScript "lid-suspend-watchdog" '' + set -u + LID_GLOB="/proc/acpi/button/lid/*/state" + STAMP="/run/lid-suspend-watchdog.stamp" + COOLDOWN=90 + + lid_closed() { + for f in $LID_GLOB; do + [ -f "$f" ] || continue + grep -q "closed" "$f" && return 0 + done + return 1 + } + + if ! lid_closed; then + rm -f "$STAMP" + exit 0 + fi + + # Already suspending/suspended, or a suspend job is queued: nothing to do. + if systemctl is-active --quiet suspend.target; then + exit 0 + fi + if systemctl list-jobs --no-legend 2>/dev/null | grep -q "suspend.target"; then + exit 0 + fi + + now=$(date +%s) + last=$(cat "$STAMP" 2>/dev/null || echo 0) + if [ $((now - last)) -ge "$COOLDOWN" ]; then + echo "$now" > "$STAMP" + echo "lid-suspend-watchdog: lid closed and system still awake — forcing suspend" + systemctl suspend + fi + ''; in { options.skyg.nixos.common.hardware.laptop-power-mgr = with lib; { enable = mkEnableOption "Settings for laptop power management"; + enableLidSuspendWatchdog = mkOption { + type = types.bool; + default = false; + description = '' + Enable a safety-net watchdog that periodically checks the lid switch + and forces a suspend whenever the lid is closed but the machine is + still awake (e.g. logind missed the lid event, or the compositor + wedged on s2idle). Without this, a laptop can sit closed in a bag, + fully awake, and overheat. + ''; + }; + enableTempMonitor = mkOption { type = types.bool; default = false; @@ -300,5 +352,26 @@ in StandardError = "journal"; }; }; + + # Safety-net suspend watchdog: periodically check the lid, suspend if the + # lid is closed but the machine is still awake. Only enabled if + # enableLidSuspendWatchdog is true. + systemd.services.lid-suspend-watchdog = lib.mkIf cfg.enableLidSuspendWatchdog { + description = "Force suspend when the lid is closed but the system is still awake"; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lid-suspend-watchdog-script}"; + }; + }; + + systemd.timers.lid-suspend-watchdog = lib.mkIf cfg.enableLidSuspendWatchdog { + description = "Periodic lid-closed suspend check"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "2m"; + OnUnitActiveSec = "1m"; + AccuracySec = "10s"; + }; + }; }; } diff --git a/modules/nixos/server/robotnix/ABOUTME.md b/modules/nixos/server/robotnix/ABOUTME.md index a5ffd81..8c1a8dd 100644 --- a/modules/nixos/server/robotnix/ABOUTME.md +++ b/modules/nixos/server/robotnix/ABOUTME.md @@ -21,11 +21,12 @@ This folder only holds `default.nix`, which: hermenix: the options belong to an external flake. - **hermes-agent pin**: the input follows this repo's `hermes-agent`, so robots pin the same revision the host locked. -- **Buzz stays here**: robotnix knows nothing about Buzz. A robot's seed - config (e.g. `hosts/hl-fwdesk/services/robotnix/sibli.nix`) builds - `pkgs/buzz-cli` from this repo and sets `BUZZ_CLI_PATH` itself. That - relative path works for the seed build only, which is fine for ephemeral - robots; a persistent robot that rebuilds itself would need its own copy. +- **Buzz stays here**: robotnix knows nothing about Buzz. The robots' shared + `hosts/hl-fwdesk/services/robotnix/buzz.nix` builds `pkgs/buzz-cli` from + this repo and sets `BUZZ_CLI_PATH`. Robots get copies of it, `common.nix` + and `pkgs/buzz-cli` under `/etc/nixos/seed` (robotnix `seed.extraFiles`, + `seedOf` in the host file), so a robot that rebuilds itself (genix) has + its own copy. - **nspawn, not `oci-containers`**: the oci-containers rule targets Docker/Podman. nspawn robots need their own store for self-rebuilds, which the `containers.*` module can't give. diff --git a/pkgs/delta-editor/default.nix b/pkgs/delta-editor/default.nix index 764fc11..80949d2 100644 --- a/pkgs/delta-editor/default.nix +++ b/pkgs/delta-editor/default.nix @@ -29,7 +29,7 @@ let pname = "delta-editor"; - version = "0.22.0"; + version = "0.23.0"; apiUrl = "https://delta.dev/api/releases/nightly/${version}/asset?asset=delta&os=linux&arch=x86_64"; @@ -38,7 +38,7 @@ let inherit version; outputHashMode = "flat"; - outputHash = "sha256-eFNXRH+N9CQkTxF2pE9LLVAMmoOuAB+39MJf8CKclEQ="; + outputHash = "sha256-3j2W4+JAo0hq3+mZZbnJPfEjpP+HQjKMFAp1+jUuZcY="; nativeBuildInputs = [ curl jq cacert ]; SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; diff --git a/secrets/buildbot-gitea-oauth-secret.age b/secrets/buildbot-gitea-oauth-secret.age index 535eeeb..078c5e9 100644 --- a/secrets/buildbot-gitea-oauth-secret.age +++ b/secrets/buildbot-gitea-oauth-secret.age @@ -1,7 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA yA389uEEsiFMZdIj0wo9ApYRHIXNL6JNvISM/m2eQRQ -Tp8Tq7IUuWHR8OG0WO9/GW5osuIBnJb7Ux+idZJlPS8 --> ssh-ed25519 So2Y2A JzSxJQD52xKzM/PeFvwDajaTEOejhqSS2u02033R8TU -b1wEH7Jth7xwyVRqLTKhX3UfYlV4ejBPrKYrdSynHx0 ---- 2udfna1kkWB9BQe7/0rIRZIMMHdrFe2ZwV0e3MLfPCI -�hÖLí®L³a‹¸.«Ýì„ɲTã³펡ü�ñÂ+¨…LéÏ��vâ7:ýþË §Obº•èÖ[ºôI÷ß‚`g› â]Îïò‚N#ýÑCÙ,c“f³Hn \ No newline at end of file +-> ssh-ed25519 CIR0mA Am3VCTpeXCzalhNV06l/fF/+niw2mX86ptuGXQ+CJHQ +9bGkS4EeJhE5/NyDNYYjBbpIIFGA2+KMCq69G1ETP9c +-> ssh-ed25519 So2Y2A lVYea1oA/zmEI5+RPk0JKhXoMKKdkK4k8WKzcxQ8Ex8 +8gIP2mJ//+SvQNnnKrDhlAp30e7+amZR8o+n6vjHqpI +--- q40DG435SAHcH9ATRJqOQIqApdpdruruERl8siGUE+4 +Ü¿_É8-_nÉÙÐÍÑí°I'áÉ…rü´ÁVvŠpw—_ÍŒQýÔÝ„ù«ÖŽ…Í +xÄcÿ+âø+W9–|‹‚³*@ƒ³ò†Mž¤âÁ™usTüñjXßtÝ \ No newline at end of file diff --git a/secrets/buildbot-gitea-token.age b/secrets/buildbot-gitea-token.age index 4e0e67b..822700f 100644 --- a/secrets/buildbot-gitea-token.age +++ b/secrets/buildbot-gitea-token.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA ddS+UlwfKXEeQ3wbcfCG8TFtEgYqYapDpt9Smspi/QQ -Q8qzvoRYsp47i2XoKgy1oo5AXjAFDrkqqkBc/v6csrk --> ssh-ed25519 So2Y2A AGxiOS/0KVJ4PxJs1T4FaJ10HeVBbOvAgwDH8s8aR2k -n9eSU6I60/fkT6DDt1irCXzyGDZXFrcgDx5zngvpdKU ---- EMpxyGxeaaVt2Sfau5koiKbk86IXzrH3VUq6kabeWek -6X�Õì‹ZÚMK„ þ)Ç,ùlLØt"TÍ >Âì!ªzMë©�Ú½.y;V«#CÖ°/º ˜¾°É%ýIM£#•0”=>#¾±N \ No newline at end of file +-> ssh-ed25519 CIR0mA Hp6stYBjMieY337cWSMPEqiEx5ddXJyY/SaF8F7ekm4 +/bnLzy1y0hFhNaOXEO3/BJ3ycq6PMxKY5xGq5v678lU +-> ssh-ed25519 So2Y2A NQRnCImjwy/d+lBiyXeTeFKFhtUMe3LWK8BX0cnus04 +Ar7s2Ab/73/oFttxNn88kkn49RMpfWesKH1mKyqKFnE +--- UxBI/fAn1gDgcznnCoOCCgRLev0VOIIwL0vPrOa0ls8 +é\/…A8"©çtõO& æ|À+>³Jµ€è“dh éþ—ãë’ÞÀ&]Ža<À´x"Z”|lÌ@Fž3á?”¼"ÉÃÎk \ No newline at end of file diff --git a/secrets/buildbot-gitea-webhook-secret.age b/secrets/buildbot-gitea-webhook-secret.age index ce8ab80..339ef3c 100644 Binary files a/secrets/buildbot-gitea-webhook-secret.age and b/secrets/buildbot-gitea-webhook-secret.age differ diff --git a/secrets/buildbot-worker-password-fwdesk.age b/secrets/buildbot-worker-password-fwdesk.age index f53d077..53ed9bd 100644 --- a/secrets/buildbot-worker-password-fwdesk.age +++ b/secrets/buildbot-worker-password-fwdesk.age @@ -1,12 +1,10 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA aNh6NjXf/9V8Dlykj0g6NXmQXD529szRZ1hbRW6Jxhw -GbJs10uDTHqhVNOOv7MqxS/ymHyB1HvSRw3Gp6r3UnA --> ssh-ed25519 So2Y2A BRxffZ1aBBTECZwdvtSwDAWyMq02kzEQQVRZBb3W11U -ApH/fbFO5byboULmI8gW7FYwMCy5zwQ6SgKkvHMmy/c --> ssh-ed25519 gzLTww lpCn4SQCyUArV3L7hsduc82LVWQHn2ppwpvUIoP7TDU -x2kD4rEio7A6UNYAqJIqi5+TstrCCWuUhd9h4HCUWrY ---- 1rpumFBTOiKdOYVlZqKRMuvuHxhE22Hr/n172i7exNE -^D8>,¥‘K, Û—4 - -¯¬Í—#TjPHtÑŽV9úF�Áa;jOžäàþÆ~~Ë5íŸac;h#ƒÜÀ†: IÖrÉã‘j/œ�GŽï¹ì9 -DZ™ÐZ/M \ No newline at end of file +-> ssh-ed25519 CIR0mA aL3OSe7lrecALOMXm2yvtdmy3bd5nup/hukgkbskATQ +kLul4ghy3RifrugvmeaX8zSB6j/0tpZFoH9Cm/Axtbg +-> ssh-ed25519 So2Y2A uR2vrH0g4okDxYQPwC07o3rouMFrgO5kAkkC2sCP2nk +/i+PQe2CIA7VMfMPmIilVuxJSn5Kq6uL6P2h4+cuvZc +-> ssh-ed25519 gzLTww qCdAhmhv97LaFFA+/R5YPB3siKg2XrEaUIVYbgutGm8 +9l3dQfpUnJlUksk3kK8/4J1E+9fuDwxTQBwsWaCbi4o +--- QOHmj+XRygVaUuuHbY+kb/AXT5/1yyPW3s8CQpk91vs +j±˜Td)’�Õ(ýÂãI¦Öa}‡ÃùðtÀ] AíÊöI–ŒÍÔ-t�ËÇlkð”R/5¬ˆ�{ÇÅÛ//Éâ4Êš$Y2©•Ì«rÂÒ‰ +Þ!LúµGdê Nþ_&Ë«{[î \ No newline at end of file diff --git a/secrets/buildbot-worker-password-minipc3.age b/secrets/buildbot-worker-password-minipc3.age index 8467be2..8b64ec3 100644 Binary files a/secrets/buildbot-worker-password-minipc3.age and b/secrets/buildbot-worker-password-minipc3.age differ diff --git a/secrets/buzz-env.age b/secrets/buzz-env.age index e33c2d9..fda5555 100644 Binary files a/secrets/buzz-env.age and b/secrets/buzz-env.age differ diff --git a/secrets/buzz-tls-key.age b/secrets/buzz-tls-key.age index 63372eb..e35a53f 100644 Binary files a/secrets/buzz-tls-key.age and b/secrets/buzz-tls-key.age differ diff --git a/secrets/cloudflare-ddclient.age b/secrets/cloudflare-ddclient.age index 2b4a0a2..c4cfa77 100644 Binary files a/secrets/cloudflare-ddclient.age and b/secrets/cloudflare-ddclient.age differ diff --git a/secrets/cloudflare-dns.age b/secrets/cloudflare-dns.age index b6c89c9..6aa9735 100644 Binary files a/secrets/cloudflare-dns.age and b/secrets/cloudflare-dns.age differ diff --git a/secrets/dns-addresses.conf.age b/secrets/dns-addresses.conf.age index abb3dfd..78955e2 100644 Binary files a/secrets/dns-addresses.conf.age and b/secrets/dns-addresses.conf.age differ diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index 7967fc3..47a0f5b 100644 Binary files a/secrets/glmain.json.age and b/secrets/glmain.json.age differ diff --git a/secrets/grafana-secret-key.age b/secrets/grafana-secret-key.age index f51912d..3c335e6 100644 Binary files a/secrets/grafana-secret-key.age and b/secrets/grafana-secret-key.age differ diff --git a/secrets/hermes-env.age b/secrets/hermes-env.age index 3697952..6e1a703 100644 Binary files a/secrets/hermes-env.age and b/secrets/hermes-env.age differ diff --git a/secrets/immich-shared.age b/secrets/immich-shared.age index e32af05..f2eb9ae 100644 --- a/secrets/immich-shared.age +++ b/secrets/immich-shared.age @@ -1,7 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA ybT0mdfe89k+mS86pw8xyQ8k3oQrQV8a7QklLhQnVAg -fssQSayWYOFEvT3/5G+zZEIDCcreAMje01uHMs20YXE --> ssh-ed25519 r2L45w FXuQaJ55g2D+29bWD5cHKinJtugS2e2BipeHYFi9li8 -oejCgTD/HP0HkdFgfoXDV4rThqh5/XIKHhvtwQxqOIU ---- 7jannyparCB2JeT9w6oqjVIpbIAni0FnxSYhBcA0fsA -¾Î +jîõeâå/\}½ Uñ/Þº‹{êZÀÓM¥¬H³Ãÿ’I×±}nˆZ@ïÙó¯)¥ÿÁªé�éêýöï8iÓŒ�xèpþñÔ1fÝÀ}]°“Á "˜æ"4«s \ No newline at end of file +-> ssh-ed25519 CIR0mA 8SYJdmbhzzhvGdSx9yca60kR4xn9JlcHB2OFqNIpGhs +VwHZjG0BLICemlYzK2huuI6KiDy65RvWwSv6CAL9jck +-> ssh-ed25519 r2L45w Hb/TqUhctBXxmCQBwvIqJnMi7IK6hVtw9TgORMK8VFA +3HkhttuwUDpjBwHrb0eW0Jj27nYZ7cJ/QFiyjPgbkCk +--- 1gsEIYu0YV0wNUFRXCCIEaCujT/bu0GLrD7pH4gGL1o +j®æ#DUS¢‡¶SàE¸¾?‹œÖ×gžÓÃfn +oŒáªÚ–j2ý‰¤/w=‚ ëjèÅHyí˜ xI𑇨‚Snµ±¨)ÑŽ ânZÊT0tt$ýcTµ€ \ No newline at end of file diff --git a/secrets/iu-project.age b/secrets/iu-project.age index 9c2f58a..8de659a 100644 Binary files a/secrets/iu-project.age and b/secrets/iu-project.age differ diff --git a/secrets/lab-ca-key.age b/secrets/lab-ca-key.age index 8237776..2984d35 100644 Binary files a/secrets/lab-ca-key.age and b/secrets/lab-ca-key.age differ diff --git a/secrets/linux-tracker-peer-bigbox1.age b/secrets/linux-tracker-peer-bigbox1.age index fa047ca..e724c9a 100644 --- a/secrets/linux-tracker-peer-bigbox1.age +++ b/secrets/linux-tracker-peer-bigbox1.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA s2qeuU6MhDft+XEnGg7OVWAnYlkYkhznPXoWXevcSCA -mb4Hu5orC83HXZL0eavHR3EdQcvQRBnvBUwz2BjiYYE --> ssh-ed25519 gzLTww bR4iwukSyJO4YPj3VFeZSXlSTwJl5Q330H32FaEO2Cs -YmsRux2xB/+heCCVf6Cu46BpvaHigoTWfTtYvXW22ro ---- vs1L6JH62VNwFENtc3OeUByh5o3Zhq8wMkFj4pv7dtc -ìÇâ+Û~3O‹¿õñM?@¶vÆÝQ‰ÔJ¯W–´XFâ¤{B‹€zèw#a6¤EjEc^´òE›!doú‰O¸Öé@Íwj�M�©A*k9A–Müb \ No newline at end of file +-> ssh-ed25519 CIR0mA r0eFgJ+9+pAH23vafEXJ0IhKKCU5DnYyyjsUlPHsGHg +t1hOgieF6CPR/jsMiiPQiNn8OnHZnHpVDHBhMtiLuY4 +-> ssh-ed25519 gzLTww E0D8FzlffIAIGyqsJtQe/ipBhW55MHZGaNu9nBCgiA8 +JA5SkLzXmNE4N3+N6eooUeIH9G3la3S485LbvN4PalE +--- wK7uImoBYty41HhOF+BKljSv+FmKkrFpSrkwYZ0Ah1o +.§ÀHå`øI£°½¡ÅwJ_Ÿ€aCΈÁCù ),°#–2êÕPwÖmVY&³fà˜n ¥+<Ì PV_?!®¢ÆÙŽÐSÕ»6)#ùù \ No newline at end of file diff --git a/secrets/linux-tracker-peer-bigbox2.age b/secrets/linux-tracker-peer-bigbox2.age index fe63535..779afe6 100644 --- a/secrets/linux-tracker-peer-bigbox2.age +++ b/secrets/linux-tracker-peer-bigbox2.age @@ -1,7 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA t/NPglRW3eRCRdYf3xRmCve293tkU9loL3GD8t/1hiQ -uHE1TcBFDLzrZh+XV5yL3x+aU0CCHeL9Lk/TCduRGt0 --> ssh-ed25519 gzLTww FYXyP3VuR33nuRZL/KbLJjv9bjbrmyvtaxP+yBFC6gc -UJl0atknE34QY4ps/7NkSni2JqOPBdUXdgWW94hQpBw ---- uaj/aKmQMD3dUqYf5OuzKMJl77kFvpS63xWdhPc3alk -³)àø‡4Ö�S¼fH�”‚Μ=ÚZtcÐùþÜÔ]fe �’?«,;VGÖ¶˜hW0þ=ÉÒÒ¹V3Œ�Ã$ø�‡U¬âÝÎ;âõâˆüal÷Gv \ No newline at end of file +-> ssh-ed25519 CIR0mA rXQFfThT+zPvRdgfFJDlQxR8DwMhWKr2S+sq/xU/9RE +72+wKg3NOq/PXkdbfYThF9mqG5UvL6Ij0lnn3D/XRZY +-> ssh-ed25519 gzLTww ZDDD9GChbSiIBcLbeLsyD830o8Uea/O3aLLSN06Spw8 +Y3oOPh0kvvPXxA4rZmNE1+rXjJaoECRvBBW97if1YxM +--- blc3Pc9OYaXFn/0Il3ga+gjJQWjLtT9JwZOFiwYoBMo +ýÀ»´ñÁgjQÄÁý¦Ù» +½WöžK.Ú”žàÖ^ޏVeûzÍ!âÿŽÂìÙîœ:FQ®D7 Bqšö|×qĵ°×GœÏ\"ósK¶Tþ¸¡á\O˜ \ No newline at end of file diff --git a/secrets/linux-tracker-peer-minipc1.age b/secrets/linux-tracker-peer-minipc1.age index 549fcb9..268071e 100644 Binary files a/secrets/linux-tracker-peer-minipc1.age and b/secrets/linux-tracker-peer-minipc1.age differ diff --git a/secrets/linux-tracker-peer-minipc2.age b/secrets/linux-tracker-peer-minipc2.age index 5573e02..3a7c419 100644 --- a/secrets/linux-tracker-peer-minipc2.age +++ b/secrets/linux-tracker-peer-minipc2.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA ksuXpra2Ji+OQAMUJCKJ9Kvcwm/6+BhqFLKe/aYNB0I -Y4uFhELFHr5ZgP1HXMfGpLfqQX1QQN3Q4uU6D5Koegg --> ssh-ed25519 gzLTww j9f8B7KsqBA5u4MSU9atfIRYigQhjtzswNaFjiw84Co -4+LqBilhGoGzUovt3NFShwfvjwEuALbv7Pi3vk/HGxE ---- /LeItnfe8bkv9hufvynom955304VWk2j4mcwiH/wrj0 -Õ6ë<”žÑÎQWj”ûâÔj…Àþ™E�ÖÏP»7)^Åö� ×ú\D’ЯÂ�*Ï“aFÏ[¿ ÙÑÕÁ(BV“H§öÆAv‚hDU -†‡AfsF \ No newline at end of file +-> ssh-ed25519 CIR0mA cRBdx6Gt1CNRP/naNGo2lk0GhJ8ZfF8OPotflVA7kRA +osNPo+1rFnvLt5AOxcT5scDN6Ay34e0heSk6O8yhUao +-> ssh-ed25519 gzLTww RteRT9OPJ283vYeLafQwVc61cm78/Z8Bi1gJlT4QknY +wbnnaHSg/uvsu4MIU0gwtbelhfhmRWrloPd37cCU7WI +--- dx994+Frdl2uTbWD6SKOZ3X8tJz5pNQO6R3NNXkIJG0 +néì½ $…z&(�ÞÊz?OÈ:|yHA&7`FU©#åŠÄM™øƒ©Û×Ä$î Û(Ÿûn­I&µ€XÀCÞÿ@ò=…"£~Æá,Oå U•¼± \ No newline at end of file diff --git a/secrets/linux-tracker-peer-minipc3.age b/secrets/linux-tracker-peer-minipc3.age index 155b883..a693f88 100644 --- a/secrets/linux-tracker-peer-minipc3.age +++ b/secrets/linux-tracker-peer-minipc3.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA Ndvt/RETH+9FfBg1RnrbdLUZoRrPaIjeGRJBii6GjWY -UUboXTCPvIB+8OJpXHYza+6RO8mHmABCPmgUX73cL5A --> ssh-ed25519 gzLTww kNlQFInn9kuuEnuf0t6XFMlNnZgXMA37R8w0QQYGhSE -5Go7RKoRh5zcnoQcHaSMWVTm1PYjqA4wYRNyvQxaIx0 ---- xv8RfKhkdB3YP8KsAZ1fKq5fti7PA3AY8QjDVXCx/nA -§tÅ—õyoÇ?Æä“ÝŸ”ä•oðéL}b‰ïi2ëhlÉõ¼=g?ùy#–}vïž‘�¢{¶ëW‚À(nFuw_(€â­Èx .¸ž@JG­ÔL \ No newline at end of file +-> ssh-ed25519 CIR0mA 8wiQgX9Pf74xtsD7VW/BZJ+jYerfMolIqQRxCpA2FAQ +js799WDb9KnnwMfWNgJiSJMNe4tnzLLIcJ+fMGF0PFE +-> ssh-ed25519 gzLTww vIO1RnDnwBkBQbb4aRBQ97SMkRGi+wL8dbNpZSfO3C0 +YRpUen7dOo479+IpjIqBGZ9cpSZa+U9J8x1/J6kEOzw +--- R8vfQQkPtWmCua11rvxNOpd8e1JpVbXoQh3gSL8Kpcg +-TÎy²ÿU­áæ¶ %×ðP4á-‰E¿Š¢SÌÑÅ“*"I¼Ö¡óðÌø>ïžH}n…¡î.:ëäýl(f5¨‰ÿ!0¥Få™=FÛI \ No newline at end of file diff --git a/secrets/linux-tracker-peer-terra1.age b/secrets/linux-tracker-peer-terra1.age index 41aa604..f500fc6 100644 Binary files a/secrets/linux-tracker-peer-terra1.age and b/secrets/linux-tracker-peer-terra1.age differ diff --git a/secrets/portainer-agent-bigbox1.age b/secrets/portainer-agent-bigbox1.age index 795e24d..ddb5b1d 100644 Binary files a/secrets/portainer-agent-bigbox1.age and b/secrets/portainer-agent-bigbox1.age differ diff --git a/secrets/portainer-agent-minipc1.age b/secrets/portainer-agent-minipc1.age index b26efeb..cbe96e6 100644 Binary files a/secrets/portainer-agent-minipc1.age and b/secrets/portainer-agent-minipc1.age differ diff --git a/secrets/portainer-agent-minipc3.age b/secrets/portainer-agent-minipc3.age index 1307920..1def1cc 100644 Binary files a/secrets/portainer-agent-minipc3.age and b/secrets/portainer-agent-minipc3.age differ diff --git a/secrets/portainer-tls-key.age b/secrets/portainer-tls-key.age index 84e825c..1c1498f 100644 Binary files a/secrets/portainer-tls-key.age and b/secrets/portainer-tls-key.age differ diff --git a/secrets/robots-genix.age b/secrets/robots-genix.age index 423eabd..c39a439 100644 Binary files a/secrets/robots-genix.age and b/secrets/robots-genix.age differ diff --git a/secrets/robots-shared.age b/secrets/robots-shared.age index f04e556..624fe15 100644 Binary files a/secrets/robots-shared.age and b/secrets/robots-shared.age differ diff --git a/secrets/robots-sibli.age b/secrets/robots-sibli.age index 6f329b8..00ccff5 100644 Binary files a/secrets/robots-sibli.age and b/secrets/robots-sibli.age differ diff --git a/secrets/scrypted-envs.age b/secrets/scrypted-envs.age index a9e8fe2..f497e3f 100644 --- a/secrets/scrypted-envs.age +++ b/secrets/scrypted-envs.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 CIR0mA NwlaiW1FI7wjs22S46c+4SnrhUSCX92X7moZEsvWRkc -xglR+ykzeSHj/Uay6TL9EIUE5YZD0eeFY3MiPuleyWs --> ssh-ed25519 ug+sMw lpH41CSGZsWxivgh7toLEds1elTd24Ls4Ep3/Sztpj4 -kOmn9KFQexCjeh9yvfN6whD4oUjzoEPNaQ36B2ao7SE ---- OEX+H/jLN16ZJMJMIHlRBJcYMouowPaW1h/nM6Sa6I0 -·NV’û¸³æ´î˜�ÞZ�çM֨܍ÎGŇ’CÁh³è½8Œ£ŸèOW}ºáI¤˜p�B bù� ¸ÕìÚÆ:pŠ7T1~¼Ä>W'x‰ \ No newline at end of file +-> ssh-ed25519 CIR0mA rNEOajeHsXK1JO3Q8/MGiN1eKXPxALScXutugCF6mVg +hZGOcOVOJ+0ojK1H3p9CGe3hFvydiIg8GqOTxwEBBBs +-> ssh-ed25519 ug+sMw 6CKG7RgKao4w2nIiuSvluegftnq22CKdgh2NZE4GQg4 +tawPeD27HGvfqvu8hyJ3cXTO9FjNGotdF4cM2iAtNKw +--- FDNhSBY54qkuZw2ArnLbwVkybTAmkR5lfzQFKVraA98 +”3BP™"N ‰Ž:x&Ôº7N¨ÑûÛ•ÜYïÆ™|Õ �þ’ÁÚy*œ³‚Ò¸O«Ò/ĪUU[N¼B@½BÈ®Ü[ w\M$[$X4µ” \ No newline at end of file diff --git a/secrets/stack1.age b/secrets/stack1.age index a5f85e8..349e7eb 100644 Binary files a/secrets/stack1.age and b/secrets/stack1.age differ diff --git a/secrets/stack2.age b/secrets/stack2.age index 29916bc..3fbdd57 100644 Binary files a/secrets/stack2.age and b/secrets/stack2.age differ