Tons of stuff, including 23.05 -> 23.11

config/hardware/germany.nix

@@ -73,6 +73,18 @@ in {
       fsType = "btrfs";
       options = [ "subvol=@acme" "compress=zstd" "noatime" "noexec" ];
     };
+
+    "/state/services/mail/mail" = {
+      device = "/dev/disk/by-label/germany-data";
+      fsType = "btrfs";
+      options = [ "subvol=@mail" "compress=zstd" "noatime" "noexec" ];
+    };
+
+    "/var/lib/containers/storage" = {
+      device = "/dev/disk/by-label/germany-data";
+      fsType = "btrfs";
+      options = [ "subvol=@container-data" "noatime" "compress=zstd" "noexec" ];
+    };
   };
 
   swapDevices = [{ device = "/dev/disk/by-label/germany-swap"; }];
@@ -87,30 +99,4 @@ in {
     cpu.intel.updateMicrocode = true;
     enableAllFirmware = true;
   };
-
-  networking = {
-    useDHCP = false;
-
-    macvlans = {
-      extif0 = {
-        interface = "enp5s0f0";
-        mode = "bridge";
-      };
-
-      dnsif0 = {
-        interface = "enp5s0f0";
-        mode = "bridge";
-      };
-
-      extif1 = {
-        interface = "enp5s0f1";
-        mode = "bridge";
-      };
-    };
-
-    interfaces = {
-      extif0.macAddress = generateMac config.instance.hostname "extif0";
-      extif1.macAddress = generateMac config.instance.hostname "extif1";
-    };
-  };
 }