diff --git a/hosts/hl-fwdesk/networking.nix b/hosts/hl-fwdesk/networking.nix index 2cd96b3..ca6e7cf 100644 --- a/hosts/hl-fwdesk/networking.nix +++ b/hosts/hl-fwdesk/networking.nix @@ -1,4 +1,9 @@ { ... }: { services.tailscale.enable = true; + + systemd.network.wait-online.ignoredInterfaces = [ + "hermes-br" + "vm-hermes" + ]; } diff --git a/hosts/hl-minipc2/services/scrypted.nix b/hosts/hl-minipc2/services/scrypted.nix index 659640f..8b86d30 100644 --- a/hosts/hl-minipc2/services/scrypted.nix +++ b/hosts/hl-minipc2/services/scrypted.nix @@ -16,6 +16,7 @@ in "/opt/homelab/scrypted/db:/server/volume" "scrypted-nvr:/nvr" ]; + devices = [ "/dev/dri:/dev/dri" ]; environment.SCRYPTED_NVR_VOLUME = "/nvr"; }; volumes.scrypted-nvr = { diff --git a/hosts/hl-minipc2/systemd.nix b/hosts/hl-minipc2/systemd.nix index 0057ccf..6a1f2ea 100644 --- a/hosts/hl-minipc2/systemd.nix +++ b/hosts/hl-minipc2/systemd.nix @@ -2,4 +2,8 @@ { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + + services.journald.extraConfig = '' + SystemMaxUse=1G + ''; } diff --git a/modules/nixos/server/robotnix/ABOUTME.md b/modules/nixos/server/robotnix/ABOUTME.md index d472fd0..8097986 100644 --- a/modules/nixos/server/robotnix/ABOUTME.md +++ b/modules/nixos/server/robotnix/ABOUTME.md @@ -104,6 +104,10 @@ Runtime state comes from `/etc/robotnix.json`, written by the module. the `containers.*` module: that module shares the host store, which would break the robot's self-rebuilds. The unit mirrors `nixos-containers.nix` (`Type=notify`, SIGRTMIN+3, exit status 133, `machine.slice`). +- The robot's root gets `/usr/bin` before its first start: `systemd-nspawn` + refuses a tree without `/usr` ("doesn't look like it has an OS tree"), the + same reason `nixos-containers.nix` creates it. The seed's tail block runs on + every start, so no reseed is needed after this landed. - `systemd-nspawn` runs in `machine.slice` (systemd's nspawn home), not `system.slice`. - Timers use `skyg.server.timers`; eval asserts unique robot ids/IPs, name diff --git a/modules/nixos/server/robotnix/robots.nix b/modules/nixos/server/robotnix/robots.nix index a6474db..9183d1b 100644 --- a/modules/nixos/server/robotnix/robots.nix +++ b/modules/nixos/server/robotnix/robots.nix @@ -224,6 +224,7 @@ let fi # What nspawn and NixOS's init expect (same as nixos-containers). mkdir -p "$root/etc" "$root/var/lib" "$root/root" "$root/home" + mkdir -p -m 0755 "$root/usr/bin" chmod 0700 "$root/root" [ -e "$root/etc/os-release" ] || [ -L "$root/etc/os-release" ] || touch "$root/etc/os-release" [ -e "$root/etc/machine-id" ] || touch "$root/etc/machine-id" diff --git a/secrets.nix b/secrets.nix index 66cbabb..b348bc6 100644 --- a/secrets.nix +++ b/secrets.nix @@ -7,6 +7,7 @@ let fwdesk = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHbBcdMpNPaELUzHRIoRkTUQde+mBQ87Ra2R+974FuUy root@hl-fwdesk"; bigbox1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFl5xiH4aFlmDWdoU+KmERLYOeOQK2aKP7jenY2G3rFb root@nixos"; bigbox2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6l6VqQ23PkGkWVABBoLp1KA6PzkX5oKTy5RBHbQXet root@hl-bigbox2"; + hermenix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfMrT6dDPw3+J22k3X5aR9ERQ8RMRLeBGgqQjmuL7EI hermenix@lab"; in { "secrets/dns-addresses.conf.age".publicKeys = [