add rest of containers to merlin

hosts/common/optional/nixos-containers/docker.nix

@@ -108,6 +108,7 @@ in {
       secretsFile = "${secretsDirectory}/secrets.yaml";
     in {
       networking = {
+        enableIPv6 = false;
         defaultGateway = "${gatewayIp}";
         interfaces.eth0.ipv4.addresses = [
           {

hosts/common/optional/nixos-containers/pihole.nix

@@ -90,6 +90,7 @@ in {
         pkgs.git
         pkgs.arion
         pkgs.lsof
+        pkgs.podman-compose
       ];
 
       virtualisation = {

hosts/common/optional/nixos-containers/semitamaps-worker.nix

@@ -100,6 +100,7 @@ in {
         pkgs.vim
         pkgs.git
         pkgs.arion
+        pkgs.podman-compose
         pkgs.jdk
       ];
 

hosts/merlin/default.nix

@@ -45,12 +45,18 @@ in {
     ../common/optional/restic-backup.nix
     ../common/optional/docker.nix
     ../common/optional/nix-ld.nix
+    ../common/optional/fileserver/nfs-server/homeshare.nix
 
     # Nixos containers
     ../common/optional/nixos-containers/docker.nix
     ../common/optional/nixos-containers/baseddata-worker.nix
     ../common/optional/nixos-containers/pihole.nix
     ../common/optional/nixos-containers/semitamaps-worker.nix
+    ../common/optional/nixos-containers/nix-bitcoin.nix
+    ../common/optional/nixos-containers/postgres.nix
+    ../common/optional/nixos-containers/baseddata-worker.nix
+    ../common/optional/nixos-containers/backup-server.nix
+    ../common/optional/nixos-containers/metrics-server.nix
 
     # This machine is used for remote building
     ../common/optional/distributed-builds/remote-builder-machine.nix
@@ -81,6 +87,7 @@ in {
     nameservers = ["${piholeIp}" "${gatewayIp}" "8.8.8.8"];
     defaultGateway = "${gatewayIp}";
     useDHCP = false;
+    enableIPv6 = false;
     bridges = {
       br0 = {
         interfaces = ["eth0"];