Adds native vm for testing.

.gitignore

@@ -1,2 +1,3 @@
 result
 sd-card.img
+clementine.qcow2

citrus.nix

@@ -1,17 +1,13 @@
 {pkgs, ... }:
 {
-  boot.loader.raspberryPi.version = 3;
-  boot.initrd.kernelModules = [ "vc4" "bcm2835_dma" "i2c_bcm2835" ];
-  
-  networking.hostName = "orange";
-  nixpkgs.hostPlatform.system = "aarch64-linux";
   system.stateVersion = "23.05";
+
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   hardware.opengl.enable = true;
 
   environment.systemPackages = with pkgs; [
-    graphfix xorg.xauth xorg.xinit
+    xorg.xauth xorg.xinit
  ];
   
   users = {

flake.nix

@@ -6,7 +6,7 @@
     flake-utils.url = "github:numtide/flake-utils";
     colmena.url = "github:zhaofengli/colmena";
     
-    graphfix.url = "git+https://git.sr.ht/~mtxyz/graphfix";
+    graphfix.url = "sourcehut:~mtxyz/graphfix";
     graphfix.inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -15,62 +15,42 @@
   let
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [ inputs.colmena.overlay ];
+      overlays = [
+        inputs.graphfix.overlay
+        inputs.colmena.overlay
+      ];
     };
-    crossPkgs = pkgs.pkgsCross.aarch64-multiplatform;
+    clementine = nixpkgs.lib.nixosSystem {
-  in
+      inherit pkgs;
-    {
+      modules = [
+        ./citrus.nix
+        ./platforms/clementine.nix
+      ];
+    };
+  in rec {
       devShell = pkgs.mkShell {
         packages = with pkgs; [ colmena ];
       };
-      apps.default = {
+      packages.default = clementine.config.system.build.vm;
-        type = "app";
-        program = self.outputs.packages.${system}.vmscript + "/bin/vmscript";
-      };
-      packages.vmscript = pkgs.writeScriptBin "vmscript" ''
-        #!${pkgs.runtimeShell} -e
-        img=./sd-card.img
-        ${pkgs.zstd}/bin/zstd -k -d ${self.outputs.image}/sd-image/orange.img.zst -o $img
-        chmod 640 $img
-        truncate -s 16G $img
-        ${pkgs.qemu}/bin/qemu-system-aarch64 \
-          -machine raspi3b \
-          -kernel "${crossPkgs.ubootRaspberryPi3_64bit}/u-boot.bin" \
-          -cpu max \
-          -m 1G \
-          -smp 4 \
-          -drive file="$img",format=raw \
-          -nographic \
-          -serial null \
-          -serial mon:stdio
-      '';
     }) // (let
       pkgs = import nixpkgs {
         system = "aarch64-linux";
         overlays = [ inputs.graphfix.overlay ];
       };
-    in rec {
-      colmena = {
-        meta = {
-          nixpkgs = pkgs;
-        };
-        orange = {
-          imports = [
-            ./configuration.nix
-            "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-          ];
-        };
-      };
-      nixosConfigurations.orange = nixpkgs.lib.nixosSystem {
       modules = [
-          ./configuration.nix
+        ./citrus.nix
         "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-          {
+        ./platforms/orange.nix
-            nixpkgs.overlays = [inputs.graphfix.overlay];
-            sdImage.imageName = "orange.img";
-          }
       ];
+    in {
+      colmena = {
+        meta.nixpkgs = pkgs;
+        orange = {
+          imports = modules;
         };
-      image = nixosConfigurations.orange.config.system.build.sdImage;
+      };
+      orange = (nixpkgs.lib.nixosSystem {
+          inherit pkgs modules;
+        }).config.system.build.sdImage;
     });
 }

platforms/clementine.nix

@@ -0,0 +1,4 @@
+{pkgs, ...}:
+{
+  networking.hostName = "clementine";
+}

platforms/orange.nix

@@ -0,0 +1,10 @@
+{pkgs, ...}:
+{
+  nixpkgs.hostPlatform.system = "aarch64-linux";
+  sdImage.imageName = "orange.img";
+
+  boot.loader.raspberryPi.version = 3;
+  boot.initrd.kernelModules = [ "vc4" "bcm2835_dma" "i2c_bcm2835" ];
+
+  networking.hostName = "orange";
+}