Merged with upstream

config/hardware/lambda.nix

@@ -19,7 +19,6 @@
     };
 
     kernelModules = [ "kvm-amd" ];
-    externalModulePackages = [ ];
     kernelPackages = pkgs.linuxPackages_latest;
 
     loader.grub = {

config/hardware/limina.nix

@@ -0,0 +1,95 @@
+{ config, lib, pkgs, ... }:
+
+with lib; {
+  imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
+
+  system.stateVersion = "20.09";
+
+  boot = {
+    initrd = {
+      availableKernelModules =
+        [ "ahci" "xhci_pci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    supportedFilesystems = [ "zfs" ];
+    kernelPackages = pkgs.linuxPackages_latest;
+  };
+
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-label/BOOT";
+      fsType = "vfat";
+    };
+
+    "/" = {
+      device = "zroot/transient/root";
+      fsType = "zfs";
+    };
+
+    "/nix" = {
+      device = "zroot/transient/nix";
+      fsType = "zfs";
+    };
+
+    "/var/log" = {
+      device = "zroot/transient/logs";
+      fsType = "zfs";
+      neededForBoot = true;
+    };
+
+    "/home" = {
+      device = "zroot/persistent/home";
+      fsType = "zfs";
+    };
+
+    "/state" = {
+      device = "zroot/persistent/state";
+      fsType = "zfs";
+    };
+  };
+
+  services.zfs.autoScrub.enable = true;
+
+  swapDevices = [{ device = "/dev/disk/by-label/swap"; }];
+
+  nix.maxJobs = lib.mkDefault 4;
+
+  hardware.bluetooth.enable = false;
+
+  networking = {
+    hostId = substring 0 8 (fileContents /state/etc/machine-id);
+
+    macvlans = {
+      intif0 = {
+        interface = "enp2s0";
+        mode = "bridge";
+      };
+      intif1 = {
+        interface = "enp3s0";
+        mode = "bridge";
+      };
+      intif2 = {
+        interface = "enp4s0";
+        mode = "bridge";
+      };
+    };
+
+    interfaces = {
+      enp2s0.useDHCP = false;
+      enp3s0.useDHCP = false;
+      enp4s0.useDHCP = false;
+
+      # output of: echo limina-${if}|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
+      intif0 = { macAddress = "02:dc:59:b4:a7:8c"; };
+      intif1 = { macAddress = "02:df:43:1d:8a:63"; };
+      intif2 = { macAddress = "02:55:d9:05:23:36"; };
+    };
+  };
+}

config/hardware/plato.nix

@@ -73,6 +73,7 @@ with lib;
     };
 
     interfaces = {
+      enp1s0.useDHCP = false;
       intif0 = {
         # output of: echo plato-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
         macAddress = "02:25:b7:67:c4:c2";

config/hardware/spark.nix

@@ -0,0 +1,69 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ];
+
+  system.stateVersion = "20.03";
+
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      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."/boot" =
+    { device = "/dev/disk/by-label/BOOT";
+      fsType = "vfat";
+    };
+
+  hardware = {
+    bluetooth.enable = true;
+
+    cpu.intel.updateMicrocode = true;
+
+    opengl = {
+      driSupport = true;
+      driSupport32Bit = true;
+    };
+
+    pulseaudio.support32Bit = true;
+  };
+
+  networking = {
+    macvlans = {
+      extif0 = {
+        interface = "enp3s0";
+        mode = "bridge";
+      };
+    };
+
+    interfaces = {
+      enp3s0 = {
+        useDHCP = false;
+      };
+      
+      extif0 = {
+        # output of: echo spark-extif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
+        macAddress = "02:9c:b7:b6:ad:c4";
+      };
+    };
+  };
+
+  services.xserver.videoDrivers = [ "intel" ];
+  nix.maxJobs = lib.mkDefault 4;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}

config/hardware/zbox.nix

@@ -0,0 +1,70 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    ];
+
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-label/zbox-root";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-label/BOOT";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-label/zbox-swap"; }
+    ];
+
+  hardware = {
+    bluetooth.enable = true;
+
+    cpu.intel.updateMicrocode = true;
+
+    opengl = {
+      driSupport = true;
+      driSupport32Bit = true;
+
+      # extraPackages32 = with pkgs.i686Linux; [ libva ];
+    };
+
+    pulseaudio.support32Bit = true;
+  };
+
+  networking = {
+    macvlans = {
+      intif0 = {
+        interface = "eno1";
+        mode = "bridge";
+      };
+    };
+
+    interfaces = {
+      intif0 = {
+        # output of: echo clunk-intif0|md5sum|sed 's/^\(..\)\(..\)\(..\)\(..\)\(..\).*$/02:\1:\2:\3:\4:\5/'
+        macAddress = "02:dd:80:52:83:9b";
+      };
+    };
+  };
+
+  services.xserver.videoDrivers = [ "nvidia" ];
+
+  nix.maxJobs = lib.mkDefault 8;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+}