From 0d2a3e26a8a9593cd70e14ade62c46ad3f69c338 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 27 Aug 2025 21:21:39 -0500
Subject: [PATCH] moved network mounts out of main config and into their own
 file

---
 .../nixos/horizon/configuration.nix           | 76 -------------------
 configurations/nixos/horizon/default.nix      |  1 +
 .../nixos/horizon/network-mount.nix           | 76 +++++++++++++++++++
 .../nixos/twilight/configuration.nix          | 71 -----------------
 configurations/nixos/twilight/default.nix     |  1 +
 .../nixos/twilight/network-mount.nix          | 72 ++++++++++++++++++
 6 files changed, 150 insertions(+), 147 deletions(-)
 create mode 100644 configurations/nixos/horizon/network-mount.nix
 create mode 100644 configurations/nixos/twilight/network-mount.nix

diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix
index adaab1c..731c6b0 100644
--- a/configurations/nixos/horizon/configuration.nix
+++ b/configurations/nixos/horizon/configuration.nix
@@ -135,82 +135,6 @@
     };
   };
 
-  # NFS support for mobile device - optimized for frequent disconnections
-  boot.supportedFilesystems = ["nfs"];
-
-  fileSystems = {
-    "/mnt/leyla_documents" = {
-      device = "defiant:/exports/leyla_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr" # Allow interruption of NFS calls
-        "timeo=30" # 3 second timeout (30 deciseconds)
-        "retrans=2" # Only 2 retries before giving up
-        "x-systemd.idle-timeout=300" # 5 minute idle timeout for mobile
-        "x-systemd.device-timeout=15" # 15 second device timeout
-        "bg" # Background mount - don't block boot
-        "fsc" # Enable caching
-        "_netdev" # Network device - wait for network
-        "x-systemd.requires=network-online.target" # Require network to be online
-        "x-systemd.after=network-online.target" # Start after network is online
-        "x-systemd.mount-timeout=30" # 30 second mount timeout
-      ];
-    };
-
-    "/mnt/users_documents" = {
-      device = "defiant:/exports/users_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=30"
-        "retrans=2"
-        "x-systemd.idle-timeout=300"
-        "x-systemd.device-timeout=15"
-        "bg"
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-        "x-systemd.mount-timeout=30"
-      ];
-    };
-
-    "/mnt/media" = {
-      device = "defiant:/exports/media";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=30"
-        "retrans=2"
-        "x-systemd.idle-timeout=300"
-        "x-systemd.device-timeout=15"
-        "bg"
-        # Mobile-optimized read settings
-        "rsize=8192" # Smaller read size for mobile
-        "wsize=8192" # Smaller write size for mobile
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-        "x-systemd.mount-timeout=30"
-      ];
-    };
-  };
-
   # Enable network-online.target for better network dependency handling
   systemd.services.NetworkManager-wait-online.enable = true;
 
diff --git a/configurations/nixos/horizon/default.nix b/configurations/nixos/horizon/default.nix
index 1263215..0f307d2 100644
--- a/configurations/nixos/horizon/default.nix
+++ b/configurations/nixos/horizon/default.nix
@@ -3,5 +3,6 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
+    ./network-mount.nix
   ];
 }
diff --git a/configurations/nixos/horizon/network-mount.nix b/configurations/nixos/horizon/network-mount.nix
new file mode 100644
index 0000000..fde16f5
--- /dev/null
+++ b/configurations/nixos/horizon/network-mount.nix
@@ -0,0 +1,76 @@
+{...}: {
+  boot.supportedFilesystems = ["nfs"];
+
+  fileSystems = {
+    "/mnt/leyla_documents" = {
+      device = "defiant:/exports/leyla_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "noatime"
+        "nofail"
+        "soft"
+        "intr" # Allow interruption of NFS calls
+        "timeo=30" # 3 second timeout (30 deciseconds)
+        "retrans=2" # Only 2 retries before giving up
+        "x-systemd.idle-timeout=300" # 5 minute idle timeout for mobile
+        "x-systemd.device-timeout=15" # 15 second device timeout
+        "bg" # Background mount - don't block boot
+        "fsc" # Enable caching
+        "_netdev" # Network device - wait for network
+        "x-systemd.requires=network-online.target" # Require network to be online
+        "x-systemd.after=network-online.target" # Start after network is online
+        "x-systemd.mount-timeout=30" # 30 second mount timeout
+      ];
+    };
+
+    "/mnt/users_documents" = {
+      device = "defiant:/exports/users_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "nofail"
+        "soft"
+        "intr"
+        "timeo=30"
+        "retrans=2"
+        "x-systemd.idle-timeout=300"
+        "x-systemd.device-timeout=15"
+        "bg"
+        "fsc"
+        "_netdev"
+        "x-systemd.requires=network-online.target"
+        "x-systemd.after=network-online.target"
+        "x-systemd.mount-timeout=30"
+      ];
+    };
+
+    "/mnt/media" = {
+      device = "defiant:/exports/media";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "noatime"
+        "nofail"
+        "soft"
+        "intr"
+        "timeo=30"
+        "retrans=2"
+        "x-systemd.idle-timeout=300"
+        "x-systemd.device-timeout=15"
+        "bg"
+        # Mobile-optimized read settings
+        "rsize=8192" # Smaller read size for mobile
+        "wsize=8192" # Smaller write size for mobile
+        "fsc"
+        "_netdev"
+        "x-systemd.requires=network-online.target"
+        "x-systemd.after=network-online.target"
+        "x-systemd.mount-timeout=30"
+      ];
+    };
+  };
+}
diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix
index 245b4f7..477c517 100644
--- a/configurations/nixos/twilight/configuration.nix
+++ b/configurations/nixos/twilight/configuration.nix
@@ -131,77 +131,6 @@
     syncthing.enable = true;
   };
 
-  boot.supportedFilesystems = ["nfs"];
-
-  fileSystems = {
-    "/mnt/leyla_documents" = {
-      device = "defiant:/exports/leyla_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr" # Allow interruption of NFS calls
-        "timeo=50" # 5 second timeout (50 deciseconds) - longer than mobile
-        "retrans=3" # 3 retries for desktop
-        "x-systemd.idle-timeout=600" # 10 minute idle timeout for desktop
-        "x-systemd.device-timeout=30" # 30 second device timeout
-        "bg" # Background mount - don't block boot
-        "fsc" # Enable caching
-        "_netdev" # Network device - wait for network
-        "x-systemd.requires=network-online.target" # Require network to be online
-        "x-systemd.after=network-online.target" # Start after network is online
-      ];
-    };
-
-    "/mnt/users_documents" = {
-      device = "defiant:/exports/users_documents";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=50"
-        "retrans=3"
-        "x-systemd.idle-timeout=600"
-        "bg"
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-      ];
-    };
-
-    "/mnt/media" = {
-      device = "defiant:/exports/media";
-      fsType = "nfs";
-      options = [
-        "x-systemd.automount"
-        "noauto"
-        "noatime"
-        "nofail"
-        "soft"
-        "intr"
-        "timeo=50"
-        "retrans=3"
-        "x-systemd.idle-timeout=600"
-        "x-systemd.device-timeout=30"
-        "bg"
-        # Desktop-optimized read settings
-        "rsize=32768" # Larger read size for desktop
-        "wsize=32768" # Larger write size for desktop
-        "fsc"
-        "_netdev"
-        "x-systemd.requires=network-online.target"
-        "x-systemd.after=network-online.target"
-      ];
-    };
-  };
-
   # Enable network-online.target for better network dependency handling
   systemd.services.NetworkManager-wait-online.enable = true;
 
diff --git a/configurations/nixos/twilight/default.nix b/configurations/nixos/twilight/default.nix
index 43a9164..f61e0ad 100644
--- a/configurations/nixos/twilight/default.nix
+++ b/configurations/nixos/twilight/default.nix
@@ -4,5 +4,6 @@
     ./configuration.nix
     ./hardware-configuration.nix
     ./nvidia-drivers.nix
+    ./network-mount.nix
   ];
 }
diff --git a/configurations/nixos/twilight/network-mount.nix b/configurations/nixos/twilight/network-mount.nix
new file mode 100644
index 0000000..9f84b04
--- /dev/null
+++ b/configurations/nixos/twilight/network-mount.nix
@@ -0,0 +1,72 @@
+{...}: {
+  boot.supportedFilesystems = ["nfs"];
+
+  fileSystems = {
+    "/mnt/leyla_documents" = {
+      device = "defiant:/exports/leyla_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "noatime"
+        "nofail"
+        "soft"
+        "intr" # Allow interruption of NFS calls
+        "timeo=50" # 5 second timeout (50 deciseconds) - longer than mobile
+        "retrans=3" # 3 retries for desktop
+        "x-systemd.idle-timeout=600" # 10 minute idle timeout for desktop
+        "x-systemd.device-timeout=30" # 30 second device timeout
+        "bg" # Background mount - don't block boot
+        "fsc" # Enable caching
+        "_netdev" # Network device - wait for network
+        "x-systemd.requires=network-online.target" # Require network to be online
+        "x-systemd.after=network-online.target" # Start after network is online
+      ];
+    };
+
+    "/mnt/users_documents" = {
+      device = "defiant:/exports/users_documents";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "nofail"
+        "soft"
+        "intr"
+        "timeo=50"
+        "retrans=3"
+        "x-systemd.idle-timeout=600"
+        "bg"
+        "fsc"
+        "_netdev"
+        "x-systemd.requires=network-online.target"
+        "x-systemd.after=network-online.target"
+      ];
+    };
+
+    "/mnt/media" = {
+      device = "defiant:/exports/media";
+      fsType = "nfs";
+      options = [
+        "x-systemd.automount"
+        "noauto"
+        "noatime"
+        "nofail"
+        "soft"
+        "intr"
+        "timeo=50"
+        "retrans=3"
+        "x-systemd.idle-timeout=600"
+        "x-systemd.device-timeout=30"
+        "bg"
+        # Desktop-optimized read settings
+        "rsize=32768" # Larger read size for desktop
+        "wsize=32768" # Larger write size for desktop
+        "fsc"
+        "_netdev"
+        "x-systemd.requires=network-online.target"
+        "x-systemd.after=network-online.target"
+      ];
+    };
+  };
+}