Lots of updates

config/hardware/spark.nix

@@ -9,22 +9,23 @@
       efi.canTouchEfiVariables = true;
     };
     initrd = {
-      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "rtsx_usb_sdmmc" ];
+      availableKernelModules =
+        [ "xhci_pci" "ahci" "usbhid" "sd_mod" "rtsx_usb_sdmmc" ];
       kernelModules = [ ];
     };
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
   };
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/nixos";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/BOOT";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/BOOT";
+    fsType = "vfat";
+  };
 
   hardware = {
     bluetooth.enable = true;
@@ -48,12 +49,11 @@
     };
 
     interfaces = {
-      enp3s0 = {
-        useDHCP = false;
-      };
-      
+      enp3s0 = { useDHCP = false; };
+
       intif0 = {
-        macAddress = pkgs.lib.network.generate-mac-address config.instance.hostname "intif0";
+        # pkgs.lib.network.generate-mac-address config.instance.hostname "intif0";
+        macAddress = "02:47:A7:B2:B4:8D";
       };
     };
   };

config/hardware/zbox.nix

@@ -34,8 +34,7 @@
     "/state" = {
       device = "/dev/disk/by-label/zbox-data";
       fsType = "btrfs";
-      options =
-        [ "noatime" "nodiratime" "compress=zstd" "noexec" "subvol=@state" ];
+      options = [ "noatime" "nodiratime" "compress=zstd" "subvol=@state" ];
     };
 
     "/nix" = {
@@ -85,6 +84,7 @@
   };
 
   networking = {
+    useDHCP = false;
     macvlans = {
       intif0 = {
         interface = "eno1";
@@ -93,6 +93,7 @@
     };
 
     interfaces = {
+      eno1.useDHCP = false;
       intif0 = {
         # output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
         macAddress = "02:dd:80:52:83:9b";