From 7b9ac7400ce29c8df44f726ead2510dded0c24ff Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Wed, 24 May 2023 22:25:12 +0800
Subject: [PATCH] restructure container directory

---
 nixos/lavender/configuration.nix              | 25 ++----------------
 nixos/lavender/containers/default.nix         | 26 +++++++++++++++++++
 .../{homepage.nix => homepage/default.nix}    |  0
 .../{nginx.nix => nginx/default.nix}          |  0
 .../{pihole.nix => pihole/default.nix}        |  0
 .../containers/{plex.nix => plex/default.nix} |  0
 .../{prowlarr.nix => prowlarr/default.nix}    |  0
 .../default.nix}                              |  0
 .../{radarr.nix => radarr/default.nix}        |  0
 .../{sonarr.nix => sonarr/default.nix}        |  0
 .../{traefik.nix => traefik/default.nix}      |  0
 11 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 nixos/lavender/containers/default.nix
 rename nixos/lavender/containers/{homepage.nix => homepage/default.nix} (100%)
 rename nixos/lavender/containers/{nginx.nix => nginx/default.nix} (100%)
 rename nixos/lavender/containers/{pihole.nix => pihole/default.nix} (100%)
 rename nixos/lavender/containers/{plex.nix => plex/default.nix} (100%)
 rename nixos/lavender/containers/{prowlarr.nix => prowlarr/default.nix} (100%)
 rename nixos/lavender/containers/{qbittorrent.nix => qbittorrent/default.nix} (100%)
 rename nixos/lavender/containers/{radarr.nix => radarr/default.nix} (100%)
 rename nixos/lavender/containers/{sonarr.nix => sonarr/default.nix} (100%)
 rename nixos/lavender/containers/{traefik.nix => traefik/default.nix} (100%)

diff --git a/nixos/lavender/configuration.nix b/nixos/lavender/configuration.nix
index 9f4f2c5..e68d946 100644
--- a/nixos/lavender/configuration.nix
+++ b/nixos/lavender/configuration.nix
@@ -12,27 +12,7 @@
     # inputs.hardware.nixosModules.common-ssd
 
     # You can also split up your configuration and import pieces of it here:
-
-    # Homepage
-    ./containers/homepage.nix
-
-    # Reverse proxy
-    ./containers/traefik.nix
-
-    # Website
-    ./containers/nginx.nix
-
-    # Multimedia
-    ./containers/plex.nix
-    ./containers/sonarr.nix
-    ./containers/radarr.nix
-    ./containers/prowlarr.nix
-
-    # Documents & Files
-    ./containers/qbittorrent.nix
-
-    # Utilities
-    ./containers/pihole.nix
+    ./containers
 
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
@@ -100,8 +80,7 @@
 
   boot = {
     # Kernel to install  
-    kernelPackages = pkgs.linuxPackages_rpi4;
-    
+    kernelPackages = pkgs.linuxPackages_rpi4;    
     # ttyAMA0 is the serial console broken out to the GPIO
     kernelParams = [
       "8250.nr_uarts=1"
diff --git a/nixos/lavender/containers/default.nix b/nixos/lavender/containers/default.nix
new file mode 100644
index 0000000..57cfdab
--- /dev/null
+++ b/nixos/lavender/containers/default.nix
@@ -0,0 +1,26 @@
+{ ... }:
+
+{
+  imports = [
+    # Dashboard
+    ./homepage
+
+    # Website
+    ./nginx
+
+    # Dns blackhole
+    ./pihole
+
+    # Multimedia
+    ./plex
+    ./sonarr
+    ./radarr
+    ./prowlarr
+
+    # Documents & Files
+    ./qbittorrent
+
+    # Reverse proxy
+    ./traefik
+  ];
+}
diff --git a/nixos/lavender/containers/homepage.nix b/nixos/lavender/containers/homepage/default.nix
similarity index 100%
rename from nixos/lavender/containers/homepage.nix
rename to nixos/lavender/containers/homepage/default.nix
diff --git a/nixos/lavender/containers/nginx.nix b/nixos/lavender/containers/nginx/default.nix
similarity index 100%
rename from nixos/lavender/containers/nginx.nix
rename to nixos/lavender/containers/nginx/default.nix
diff --git a/nixos/lavender/containers/pihole.nix b/nixos/lavender/containers/pihole/default.nix
similarity index 100%
rename from nixos/lavender/containers/pihole.nix
rename to nixos/lavender/containers/pihole/default.nix
diff --git a/nixos/lavender/containers/plex.nix b/nixos/lavender/containers/plex/default.nix
similarity index 100%
rename from nixos/lavender/containers/plex.nix
rename to nixos/lavender/containers/plex/default.nix
diff --git a/nixos/lavender/containers/prowlarr.nix b/nixos/lavender/containers/prowlarr/default.nix
similarity index 100%
rename from nixos/lavender/containers/prowlarr.nix
rename to nixos/lavender/containers/prowlarr/default.nix
diff --git a/nixos/lavender/containers/qbittorrent.nix b/nixos/lavender/containers/qbittorrent/default.nix
similarity index 100%
rename from nixos/lavender/containers/qbittorrent.nix
rename to nixos/lavender/containers/qbittorrent/default.nix
diff --git a/nixos/lavender/containers/radarr.nix b/nixos/lavender/containers/radarr/default.nix
similarity index 100%
rename from nixos/lavender/containers/radarr.nix
rename to nixos/lavender/containers/radarr/default.nix
diff --git a/nixos/lavender/containers/sonarr.nix b/nixos/lavender/containers/sonarr/default.nix
similarity index 100%
rename from nixos/lavender/containers/sonarr.nix
rename to nixos/lavender/containers/sonarr/default.nix
diff --git a/nixos/lavender/containers/traefik.nix b/nixos/lavender/containers/traefik/default.nix
similarity index 100%
rename from nixos/lavender/containers/traefik.nix
rename to nixos/lavender/containers/traefik/default.nix