Add c3.small.x86 instance type

Mostly copied from c2.medium.x86 with tweaks after doing an
install (kernel modules, second serial port, cpu core count).

Am I doing this right?  How do we get packet.net to pick up the new
image(s)?

Author: benley

default.nix

@@ -560,4 +560,35 @@ in rec {
       mount -L nixos /mnt
     '';
   };
+
+  c3-small-x86 = mkPXEInstaller {
+    name = "c3.small.x86";
+    system = "x86_64-linux";
+    img = "bzImage";
+    kexec = true;
+
+    configFiles = [
+      ./instances/standard.nix
+      ./instances/c3.small.x86/hardware.nix
+    ];
+
+    runTimeConfigFiles = [
+      ./instances/c3.small.x86/installed.nix
+    ];
+
+    partition = partitionLinuxWithBootSwap "/dev/sda";
+
+    format = ''
+      mkfs.vfat /dev/sda1
+      mkswap -L swap /dev/sda2
+      mkfs.ext4 -L nixos /dev/sda3
+    '';
+
+    mount = ''
+      swapon -L swap
+      mount -L nixos /mnt
+      mkdir -p /mnt/boot/efi
+      mount /dev/sda1 /mnt/boot/efi
+    '';
+  };
 }

expect-tests/testall.sh

@@ -24,6 +24,7 @@ check c1.large.arm.xda
 check c1.small.x86
 check c1.xlarge.x86
 check c2.medium.x86
+check c3.small.x86
 check g2.large.x86
 check m1.xlarge.x86
 check m2.xlarge.x86

instances/c3.small.x86/hardware.nix

@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+{
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  boot.loader.grub = {
+    version = 2;
+    efiSupport = true;
+    device = "nodev";
+    efiInstallAsRemovable = true;
+    extraConfig = ''
+      serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1
+      terminal_output serial console
+      terminal_input serial console
+    '';
+  };
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.kernelModules = [ "kvm_intel" ];
+  boot.kernelParams =  [ "console=ttyS1,115200n8" ];
+  boot.extraModulePackages = [ ];
+
+  hardware.enableAllFirmware = true;
+
+  nix.maxJobs = 16;
+}

instances/c3.small.x86/installed.nix

@@ -0,0 +1,38 @@
+{ lib, ... }:
+{
+  boot = {
+    loader = {
+      systemd-boot.enable = lib.mkForce false;
+      grub = {
+        enable = true;
+        extraConfig = ''
+          serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1
+          terminal_output serial console
+          terminal_input serial console
+        '';
+
+      };
+      efi = {
+        efiSysMountPoint = "/boot/efi";
+        canTouchEfiVariables = lib.mkForce false;
+      };
+    };
+  };
+
+  fileSystems = {
+    "/" = {
+      label = "nixos";
+      fsType = "ext4";
+    };
+    "/boot/efi" = {
+      device = "/dev/sda1";
+      fsType = "vfat";
+    };
+  };
+
+  swapDevices = [
+    {
+      label = "swap";
+    }
+  ];
+}