From c1819b68a1234899308a1f402d564bb684e35c2c Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Thu, 29 May 2025 23:40:11 -0400
Subject: [PATCH] Update some of the ips I missed oopsies

---
 hosts/detritus/filesystems/default.nix            | 11 ++++-------
 hosts/intuos/filesystems/default.nix              |  9 +++++----
 hosts/kitty/default.nix                           |  1 -
 hosts/kitty/network/default.nix                   | 13 -------------
 hosts/midas/network/default.nix                   |  3 ---
 hosts/tower/default.nix                           |  1 -
 hosts/tower/network/default.nix                   | 15 ---------------
 .../system/services/server/owncast/default.nix    |  2 +-
 8 files changed, 10 insertions(+), 45 deletions(-)
 delete mode 100644 hosts/kitty/network/default.nix
 delete mode 100644 hosts/tower/network/default.nix

diff --git a/hosts/detritus/filesystems/default.nix b/hosts/detritus/filesystems/default.nix
index d565576d..26ed32b1 100644
--- a/hosts/detritus/filesystems/default.nix
+++ b/hosts/detritus/filesystems/default.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 {
-  fileSystems = {
+  fileSystems = with config.services.mycelium.ips; {
     "/persist/storage" = {
       device = "/dev/disk/by-uuid/d0d6783f-ad51-4d85-b8a9-3374f6460ef6";
       fsType = "btrfs";
@@ -22,30 +22,27 @@
 
     # Network mounts
     "/home/${config.sysusers.main}/Network/Midas" = {
-      device = "10.2.0.1:/storage";
+      device = "[${midas}]:/storage";
       fsType = "nfs4";
       options = [
-        "noatime"
         "noauto"
         "soft"
         "x-systemd.automount"
       ];
     };
     "/home/${config.sysusers.main}/Network/Kitty" = {
-      device = "10.2.0.2:/storage/bun";
+      device = "[${kitty}]:/storage/bun";
       fsType = "nfs4";
       options = [
-        "noatime"
         "noauto"
         "soft"
         "x-systemd.automount"
       ];
     };
     "/home/${config.sysusers.main}/Network/Prophet" = {
-      device = "mx.nixfox.ca:/storage";
+      device = "[${prophet}]:/storage";
       fsType = "nfs4";
       options = [
-        "noatime"
         "noauto"
         "soft"
         "x-systemd.automount"
diff --git a/hosts/intuos/filesystems/default.nix b/hosts/intuos/filesystems/default.nix
index e17b5eec..577b5d27 100644
--- a/hosts/intuos/filesystems/default.nix
+++ b/hosts/intuos/filesystems/default.nix
@@ -1,8 +1,9 @@
 { config, ... }:
 {
-  fileSystems = {
+  fileSystems = with config.services.mycelium.ips; {
+    # Network mounts
     "/home/${config.sysusers.main}/Network/Midas" = {
-      device = "10.2.0.1:/storage";
+      device = "[${midas}]:/storage";
       fsType = "nfs4";
       options = [
         "noauto"
@@ -11,7 +12,7 @@
       ];
     };
     "/home/${config.sysusers.main}/Network/Kitty" = {
-      device = "10.2.0.2:/storage/bun";
+      device = "[${kitty}]:/storage/bun";
       fsType = "nfs4";
       options = [
         "noauto"
@@ -20,7 +21,7 @@
       ];
     };
     "/home/${config.sysusers.main}/Network/Prophet" = {
-      device = "mx.nixfox.ca:/storage";
+      device = "[${prophet}]:/storage";
       fsType = "nfs4";
       options = [
         "noauto"
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 64f97ede..3fb0b916 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -5,7 +5,6 @@
     ./disko
     ./filesystems
     ./hardware
-    ./network
     ./user
     ../../modules/system
   ];
diff --git a/hosts/kitty/network/default.nix b/hosts/kitty/network/default.nix
deleted file mode 100644
index 84a3df61..00000000
--- a/hosts/kitty/network/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  networking = {
-    interfaces."eno1".ipv4.addresses = [{
-      address = "10.2.0.2";
-      prefixLength = 8;
-    }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "eno1";
-    };
-  };
-}
diff --git a/hosts/midas/network/default.nix b/hosts/midas/network/default.nix
index d3053f3d..32932ea6 100644
--- a/hosts/midas/network/default.nix
+++ b/hosts/midas/network/default.nix
@@ -10,7 +10,4 @@
       interface = "enp0s31f6";
     };
   };
-
-  # Enable IP forwarding for the server configuration
-  boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
 }
diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix
index 362aba9c..1cfb0a01 100644
--- a/hosts/tower/default.nix
+++ b/hosts/tower/default.nix
@@ -5,7 +5,6 @@
     ./disko
     ./filesystems
     ./hardware
-    ./network
     ./user
     ../../modules/system
   ];
diff --git a/hosts/tower/network/default.nix b/hosts/tower/network/default.nix
deleted file mode 100644
index ace220c6..00000000
--- a/hosts/tower/network/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ ... }:
-{
-  networking = {
-    interfaces."enp42s0".ipv4.addresses = [{
-      address = "10.2.0.100";
-      prefixLength = 8;
-    }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "enp42s0";
-    };
-
-    firewall.allowedUDPPorts = [ 27015 ];
-  };
-}
diff --git a/modules/system/services/server/owncast/default.nix b/modules/system/services/server/owncast/default.nix
index a4337e34..d689b718 100644
--- a/modules/system/services/server/owncast/default.nix
+++ b/modules/system/services/server/owncast/default.nix
@@ -7,7 +7,7 @@
       port = 8060;
       rtmp-port = 1945;
     };
-    networking.firewall.extraInputRules = ''
+    networking.firewall.extraInputRules = with config.services.mycelium.ips; ''
       ip6 saddr ${tower} tcp dport 1935 accept
     '';
     environment.persistence."/persist".directories = [ "/var/lib/owncast" ];