From ca8142a1e0d4949bebb519238c636dc4b6c26b63 Mon Sep 17 00:00:00 2001
From: pazpi <davide@pasetto.me>
Date: Sun, 17 Aug 2025 12:07:59 +0200
Subject: [PATCH] Update readme and small things

---
 README.md                    | 24 ++++++++++++++-------
 hosts/default.nix            | 42 ++++++++++++++++++------------------
 modules/networking/caddy.nix | 33 ++++++++++++++--------------
 3 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 14c3b17..364e766 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,29 @@
 # Papzi homelab configurations
 
-L'homelab è suddiviso in vari host configurati come container LXC su una macchina Proxmox 8.2.
+L'homelab è suddiviso in vari host configurati come container LXC su una macchina Proxmox
 
 ## IP
 
-La rete di casa è suddivisa in due parti, la prima gestita in DHCP ha IP fino al `.149` (compreso), mentre gli altri sono riservati per indirizzi statici.
 Per comodità una volta assegnato un IP questo deve essere impostato su PiHole con dominio `.internal` per facilitare il routing.
 
-## Hosts
+## Services up and running
 
-### Caddy
+- Caddy
+- Nextcloud
+- Paperless-ngx
+- Vaultwarden
+- Authentik
+- Immich
+- Technitium DNS
+- Plex
+- Docker
+- Searxng
+- Zigbee2Mqtt
+- Metrics: Grafana and Promethus
 
-### Arr
+## Services missing
 
-### Metrics
-
-### Deadbeef
+- Uptime Kuma
 
 ## How to
 
diff --git a/hosts/default.nix b/hosts/default.nix
index e70e631..060829d 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -39,9 +39,9 @@ let
       config.allowUnfree = true;
     };
 
-  myModules = {
+  nodeBaseModules = {
     imports = [
-      lix-module.nixosModules.default
+      # lix-module.nixosModules.default
       authentik-nix.nixosModules.default
       ../modules
     ];
@@ -58,7 +58,7 @@ in
   # deadbeef = nixpkgs.lib.nixosSystem {
   #   pkgs = pkgs "x86_64-linux";
   #   modules = [
-  #     myModules
+  #     nodeBaseModules
   #     ./deadbeef
   #     nixos-hardware.nixosModules.dell-xps-15-9560
   #     home-manager.nixosModules.home-manager
@@ -70,7 +70,7 @@ in
   baseLXC = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./base-lxc.nix
       agenix.nixosModules.default
@@ -83,7 +83,7 @@ in
   arr = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./arr
       agenix.nixosModules.default
@@ -94,7 +94,7 @@ in
   caddy = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./caddy
       agenix.nixosModules.default
@@ -105,7 +105,7 @@ in
   metrics = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./metrics
       agenix.nixosModules.default
@@ -116,7 +116,7 @@ in
   nextcloud = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./nextcloud
       agenix.nixosModules.default
@@ -127,7 +127,7 @@ in
   plex = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./plex
       agenix.nixosModules.default
@@ -138,7 +138,7 @@ in
   vaultwarden = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./vaultwarden
       agenix.nixosModules.default
@@ -149,7 +149,7 @@ in
   portainer = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./portainer
       agenix.nixosModules.default
@@ -160,7 +160,7 @@ in
   authentik = nixpkgs.lib.nixosSystem {
     pkgs = pkgs-unstable "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./authentik
       agenix.nixosModules.default
@@ -171,7 +171,7 @@ in
   colmena = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./colmena
       agenix.nixosModules.default
@@ -182,7 +182,7 @@ in
   dns01 = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./dns/dns-01.nix
       agenix.nixosModules.default
@@ -193,7 +193,7 @@ in
   dns02 = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./dns/dns-02.nix
       agenix.nixosModules.default
@@ -204,7 +204,7 @@ in
   shadowsocks = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./shadowsocks
       agenix.nixosModules.default
@@ -215,7 +215,7 @@ in
   immich = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./immich
       agenix.nixosModules.default
@@ -226,7 +226,7 @@ in
   firefly-iii = nixpkgs.lib.nixosSystem {
     pkgs = pkgs "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./firefly-iii
       agenix.nixosModules.default
@@ -237,7 +237,7 @@ in
   open-webui = nixpkgs-unstable.lib.nixosSystem {
     pkgs = pkgs-unstable "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./open-webui/docker.nix
       agenix.nixosModules.default
@@ -248,7 +248,7 @@ in
   paperless = nixpkgs-unstable.lib.nixosSystem {
     pkgs = pkgs-unstable "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./paperless
       agenix.nixosModules.default
@@ -259,7 +259,7 @@ in
   zigbee2mqtt = nixpkgs-unstable.lib.nixosSystem {
     pkgs = pkgs-unstable "x86_64-linux";
     modules = [
-      myModules
+      nodeBaseModules
       proxmoxModule
       ./zigbee2mqtt
       agenix.nixosModules.default
diff --git a/modules/networking/caddy.nix b/modules/networking/caddy.nix
index 5d1cfd3..2af5fdd 100644
--- a/modules/networking/caddy.nix
+++ b/modules/networking/caddy.nix
@@ -125,24 +125,23 @@ in
         vendorHash = "sha256-7JfEZjHeQ8F/+OltCrBUO/Cf8+GwF9d3UDcSd17pcxU=";
       };
 
-      globalConfig =
-        ''
-          admin :2024
-          servers {
-            metrics
-          }
-        ''
-        + lib.concatStringsSep "\n" (
-          map (dynamicdnsDomain: ''
-            dynamic_dns {
-              provider cloudflare {env.${dynamicdnsDomain.cloudflareApiEnvName}}
-              domains {
-                ${dynamicdnsDomain.domain} @
-              }
-              dynamic_domains
+      globalConfig = ''
+        admin :2024
+        servers {
+          metrics
+        }
+      ''
+      + lib.concatStringsSep "\n" (
+        map (dynamicdnsDomain: ''
+          dynamic_dns {
+            provider cloudflare {env.${dynamicdnsDomain.cloudflareApiEnvName}}
+            domains {
+              ${dynamicdnsDomain.domain} @
             }
-          '') cfg.dynamicdnsDomains
-        );
+            dynamic_domains
+          }
+        '') cfg.dynamicdnsDomains
+      );
 
       extraConfig =
         lib.concatStringsSep "\n" (