From 33275e894f6a2f1994ad95f1655776647143958f Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Tue, 21 Jan 2025 17:18:17 +0000
Subject: [PATCH] add rest of containers to merlin

---
 hosts/common/optional/nixos-containers/docker.nix          | 1 +
 hosts/common/optional/nixos-containers/pihole.nix          | 1 +
 .../common/optional/nixos-containers/semitamaps-worker.nix | 1 +
 hosts/merlin/default.nix                                   | 7 +++++++
 4 files changed, 10 insertions(+)

diff --git a/hosts/common/optional/nixos-containers/docker.nix b/hosts/common/optional/nixos-containers/docker.nix
index 1b4a228..af4e4a2 100644
--- a/hosts/common/optional/nixos-containers/docker.nix
+++ b/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 = [
           {
diff --git a/hosts/common/optional/nixos-containers/pihole.nix b/hosts/common/optional/nixos-containers/pihole.nix
index 6d9fcc2..781a4e9 100644
--- a/hosts/common/optional/nixos-containers/pihole.nix
+++ b/hosts/common/optional/nixos-containers/pihole.nix
@@ -90,6 +90,7 @@ in {
         pkgs.git
         pkgs.arion
         pkgs.lsof
+        pkgs.podman-compose
       ];
 
       virtualisation = {
diff --git a/hosts/common/optional/nixos-containers/semitamaps-worker.nix b/hosts/common/optional/nixos-containers/semitamaps-worker.nix
index 0800157..7e24e52 100644
--- a/hosts/common/optional/nixos-containers/semitamaps-worker.nix
+++ b/hosts/common/optional/nixos-containers/semitamaps-worker.nix
@@ -100,6 +100,7 @@ in {
         pkgs.vim
         pkgs.git
         pkgs.arion
+        pkgs.podman-compose
         pkgs.jdk
       ];
 
diff --git a/hosts/merlin/default.nix b/hosts/merlin/default.nix
index f75d465..9442dea 100644
--- a/hosts/merlin/default.nix
+++ b/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"];