sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add rest of containers to merlin

This commit is contained in:
Sam 2025-01-21 17:18:17 +00:00
parent 4e57f67e92
commit 33275e894f
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/common/optional/nixos-containers/docker.nix
View File

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

1
hosts/common/optional/nixos-containers/pihole.nix
View File

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

1
hosts/common/optional/nixos-containers/semitamaps-worker.nix
View File

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

7
hosts/merlin/default.nix
View File

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