From 5dd407f841fe80e778828c0298ef5eaf2586c579 Mon Sep 17 00:00:00 2001
From: Bun <bun@nixfox.ca>
Date: Wed, 16 Apr 2025 17:40:38 -0400
Subject: [PATCH] Switch to vlans in place of static IPs

---
 flake.nix                                            |  2 +-
 hosts/intuos/default.nix                             | 12 ++++++------
 hosts/kitty/default.nix                              | 12 ++++++------
 hosts/midas/default.nix                              | 12 ++++++------
 hosts/tower/default.nix                              | 12 ++++++------
 modules/system/devices/disks/filesystems/default.nix |  4 ++--
 modules/system/devices/networking/default.nix        |  1 -
 7 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/flake.nix b/flake.nix
index e34b528c..5cd71881 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,7 +77,7 @@
       kitty = mkNix [ ./hosts/kitty ]; # Dell Optiplex 7010
       prophet = mkNix [ ./hosts/prophet ]; # Oracle Neoverse-N1
 
-      droid = mkNix [ ./hosts/tower ]; # Android Virtualization Framework
+      droid = mkNix [ ./hosts/droid ]; # Android Virtualization Framework
     };
 
     # nh home switch /path -c arch
diff --git a/hosts/intuos/default.nix b/hosts/intuos/default.nix
index fe9007e5..9ee1f094 100644
--- a/hosts/intuos/default.nix
+++ b/hosts/intuos/default.nix
@@ -12,14 +12,14 @@
   networking = {
     hostName = "intuos";
     wireless.enable = true;
-    interfaces."wlp1s0".ipv4.addresses = [{
-      address = "10.2.0.101";
+    vlans.internal = {
+      id=100;
+      interface="wlp1s0";
+    };
+    interfaces.internal.ipv4.addresses = [{
+      address = "11.0.0.102";
       prefixLength = 8;
     }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "wlp1s0";
-    };
   };
 
   system = {
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 583950e4..1e149dfe 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -13,14 +13,14 @@
   networking = {
     hostName = "kitty";
     hostId = "8745e22e";
-    interfaces."eno1".ipv4.addresses = [{
-      address = "10.2.0.2";
+    vlans.internal = {
+      id=100;
+      interface="eno1";
+    };
+    interfaces.internal.ipv4.addresses = [{
+      address = "11.0.0.1";
       prefixLength = 8;
     }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "eno1";
-    };
   };
 
   system = {
diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix
index e4af2679..a229f887 100644
--- a/hosts/midas/default.nix
+++ b/hosts/midas/default.nix
@@ -15,14 +15,14 @@
   networking = {
     hostName = "midas";
     hostId = "38ba3f57";
-    interfaces."enp0s31f6".ipv4.addresses = [{
-      address = "10.2.0.1";
+    vlans.internal = {
+      id=100;
+      interface="enp0s31f6";
+    };
+    interfaces.internal.ipv4.addresses = [{
+      address = "11.0.0.1";
       prefixLength = 8;
     }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "enp0s31f6";
-    };
   };
 
   system = {
diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix
index ebb97fd7..e0aef159 100644
--- a/hosts/tower/default.nix
+++ b/hosts/tower/default.nix
@@ -12,14 +12,14 @@
 
   networking = {
     hostName = "tower";
-    interfaces."enp42s0".ipv4.addresses = [{
-      address = "10.2.0.100";
+    vlans.internal = {
+      id=100;
+      interface="enp42s0";
+    };
+    interfaces.internal.ipv4.addresses = [{
+      address = "11.0.0.100";
       prefixLength = 8;
     }];
-    defaultGateway = {
-      address = "10.1.0.1";
-      interface = "enp42s0";
-    };
   };
 
   system = {
diff --git a/modules/system/devices/disks/filesystems/default.nix b/modules/system/devices/disks/filesystems/default.nix
index 47bb33e6..8a6e5943 100644
--- a/modules/system/devices/disks/filesystems/default.nix
+++ b/modules/system/devices/disks/filesystems/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
   boot = {
     supportedFilesystems = {
@@ -11,7 +11,7 @@
     };
   };
 
-  services = {
+  services = lib.mkIf config.environment.persistence."/persist".enable {
     btrfs.autoScrub.enable = true;
     fstrim.enable = true;
   };
diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix
index 4432adac..6af5014f 100644
--- a/modules/system/devices/networking/default.nix
+++ b/modules/system/devices/networking/default.nix
@@ -18,7 +18,6 @@
 
   services.resolved = {
     enable = true;
-    dnssec = "true";
     dnsovertls = "true";
     fallbackDns = config.networking.nameservers;
   };