From 75efe1bf99efc34d4c6727d3b8b9641c7253c482 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Fri, 17 Jan 2025 21:23:01 +0000
Subject: [PATCH] Group containers into their own directory
---
.../features/homelab/{ => containers}/beaverhabits.nix | 0
nix/modules/nixos/features/homelab/containers/default.nix | 8 ++++++++
.../nixos/features/homelab/{ => containers}/freshrss.nix | 0
.../nixos/features/homelab/{ => containers}/pi-hole.nix | 2 ++
.../tubearchivist.nix} | 0
nix/modules/nixos/features/homelab/default.nix | 5 +----
6 files changed, 11 insertions(+), 4 deletions(-)
rename nix/modules/nixos/features/homelab/{ => containers}/beaverhabits.nix (100%)
create mode 100644 nix/modules/nixos/features/homelab/containers/default.nix
rename nix/modules/nixos/features/homelab/{ => containers}/freshrss.nix (100%)
rename nix/modules/nixos/features/homelab/{ => containers}/pi-hole.nix (96%)
rename nix/modules/nixos/features/homelab/{tubearchivist-container.nix => containers/tubearchivist.nix} (100%)
diff --git a/nix/modules/nixos/features/homelab/beaverhabits.nix b/nix/modules/nixos/features/homelab/containers/beaverhabits.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/beaverhabits.nix
rename to nix/modules/nixos/features/homelab/containers/beaverhabits.nix
diff --git a/nix/modules/nixos/features/homelab/containers/default.nix b/nix/modules/nixos/features/homelab/containers/default.nix
new file mode 100644
index 00000000..41013da6
--- /dev/null
+++ b/nix/modules/nixos/features/homelab/containers/default.nix
@@ -0,0 +1,8 @@
+{
+ imports = [
+ ./beaverhabits.nix
+ ./freshrss.nix
+ ./pi-hole.nix
+ ./tubearchivist.nix
+ ];
+}
diff --git a/nix/modules/nixos/features/homelab/freshrss.nix b/nix/modules/nixos/features/homelab/containers/freshrss.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/freshrss.nix
rename to nix/modules/nixos/features/homelab/containers/freshrss.nix
diff --git a/nix/modules/nixos/features/homelab/pi-hole.nix b/nix/modules/nixos/features/homelab/containers/pi-hole.nix
similarity index 96%
rename from nix/modules/nixos/features/homelab/pi-hole.nix
rename to nix/modules/nixos/features/homelab/containers/pi-hole.nix
index 80a6f8d1..2a3bf836 100644
--- a/nix/modules/nixos/features/homelab/pi-hole.nix
+++ b/nix/modules/nixos/features/homelab/containers/pi-hole.nix
@@ -27,6 +27,8 @@ in
image = "pihole/pihole:latest";
environment = {
+ "PIHOLE_DNS_1" = "8.8.8.8";
+ "PIHOLE_DNS_2" = "8.8.4.4";
"TZ" = "Europe/London";
};
diff --git a/nix/modules/nixos/features/homelab/tubearchivist-container.nix b/nix/modules/nixos/features/homelab/containers/tubearchivist.nix
similarity index 100%
rename from nix/modules/nixos/features/homelab/tubearchivist-container.nix
rename to nix/modules/nixos/features/homelab/containers/tubearchivist.nix
diff --git a/nix/modules/nixos/features/homelab/default.nix b/nix/modules/nixos/features/homelab/default.nix
index 897465c5..56d4b531 100644
--- a/nix/modules/nixos/features/homelab/default.nix
+++ b/nix/modules/nixos/features/homelab/default.nix
@@ -1,15 +1,12 @@
{
imports = [
./audiobookshelf.nix
- ./beaverhabits.nix
+ ./containers
./forgejo.nix
- ./freshrss.nix
./gitea.nix
./immich.nix
./jellyfin.nix
./paperless.nix
- ./pi-hole.nix
- ./tubearchivist-container.nix
./vaultwarden.nix
];
}