From 82c476bd7578ed7fc163e8fd6216815760b4647f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Wed, 16 Oct 2024 14:43:00 +0200
Subject: [PATCH 1/3] refactor: reorder nextcloud.nix configurations

Reorganized the configuration blocks for better readability. The `enabledPreviewProviders` list and `phpOptions` section now follow a more logical structure.
---
 systems/x86_64-linux/mx/nextcloud.nix | 34 +++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/systems/x86_64-linux/mx/nextcloud.nix b/systems/x86_64-linux/mx/nextcloud.nix
index d5c9012..7fc68f4 100644
--- a/systems/x86_64-linux/mx/nextcloud.nix
+++ b/systems/x86_64-linux/mx/nextcloud.nix
@@ -16,6 +16,23 @@
       mail_smtpmode = "sendmail";
       mail_sendmailmode = "pipe";
       default_phone_region = "DE";
+      enabledPreviewProviders = [
+        "OC\\Preview\\BMP"
+        "OC\\Preview\\GIF"
+        "OC\\Preview\\HEIC"
+        "OC\\Preview\\JPEG"
+        "OC\\Preview\\Krita"
+        "OC\\Preview\\MP3"
+        "OC\\Preview\\MP4"
+        "OC\\Preview\\MarkDown"
+        "OC\\Preview\\Movie"
+        "OC\\Preview\\OpenDocument"
+        "OC\\Preview\\PDF"
+        "OC\\Preview\\PNG"
+        "OC\\Preview\\TXT"
+        "OC\\Preview\\WEBP"
+        "OC\\Preview\\XBitmap"
+      ];
     };
     phpOptions = {
       upload_max_filesize = lib.mkForce "1G";
@@ -27,23 +44,6 @@
     config.dbname = "nextcloud";
     config.dbhost = "/run/postgresql";
     config.dbuser = "nextcloud";
-    extraOptions.enabledPreviewProviders = [
-      "OC\\Preview\\BMP"
-      "OC\\Preview\\GIF"
-      "OC\\Preview\\HEIC"
-      "OC\\Preview\\JPEG"
-      "OC\\Preview\\Krita"
-      "OC\\Preview\\MP3"
-      "OC\\Preview\\MP4"
-      "OC\\Preview\\MarkDown"
-      "OC\\Preview\\Movie"
-      "OC\\Preview\\OpenDocument"
-      "OC\\Preview\\PDF"
-      "OC\\Preview\\PNG"
-      "OC\\Preview\\TXT"
-      "OC\\Preview\\WEBP"
-      "OC\\Preview\\XBitmap"
-    ];
   };
 
   services.postgresql = {

From 1e96221b75adae3fb01b8f1290e0f04c6ae46db6 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Wed, 16 Oct 2024 14:43:21 +0200
Subject: [PATCH 2/3] feat(homeprinter): enable Avahi service and configure
 firewall

Enable Avahi service to support mDNS for both IPv4 and IPv6. Add mDNS port 5353 to the allowed UDP ports in the firewall to ensure network discovery.
---
 modules/nixos/services/homeprinter/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/nixos/services/homeprinter/default.nix b/modules/nixos/services/homeprinter/default.nix
index 09fbaa5..c5ab726 100644
--- a/modules/nixos/services/homeprinter/default.nix
+++ b/modules/nixos/services/homeprinter/default.nix
@@ -16,6 +16,16 @@ in
       gutenprint
     ];
 
+    services.avahi = {
+      enable = true;
+      nssmdns4 = true;
+      nssmdns6 = true;
+      ipv6 = true;
+      ipv4 = true;
+    };
+
+    networking.firewall.allowedUDPPorts = [ 5353 ];
+
     hardware.printers.ensurePrinters = [
       {
         name = "Brother_DCP-L2530DW_series";

From 36cd114e72fc70cab4c451424eb70a551f480bfd Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Wed, 16 Oct 2024 14:43:36 +0200
Subject: [PATCH 3/3] feat(sgx): enable IPv4 and IPv6 support for Avahi

Updated Avahi service configuration to support both IPv4 and IPv6 addressing. This change includes enabling nssmdns4 and nssmdns6, along with setting ipv4 and ipv6 to true.
---
 systems/x86_64-linux/sgx/fileserver.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/systems/x86_64-linux/sgx/fileserver.nix b/systems/x86_64-linux/sgx/fileserver.nix
index e05672c..3a1ae2f 100644
--- a/systems/x86_64-linux/sgx/fileserver.nix
+++ b/systems/x86_64-linux/sgx/fileserver.nix
@@ -20,7 +20,10 @@
 
   services.avahi = {
     enable = true;
-    nssmdns = true;
+    nssmdns4 = true;
+    nssmdns6 = true;
+    ipv6 = true;
+    ipv4 = true;
     publish = {
       enable = true;
       userServices = true;