From 7af2d015a001e76e1e09778eee394f0b55157b2d Mon Sep 17 00:00:00 2001
From: "RingOfStorms (Joshua Bell)" <ringofstorms@gmail.com>
Date: Fri, 15 Aug 2025 10:40:26 -0500
Subject: [PATCH] more testing

---
 hosts/testbed/disko-config.nix |  4 ++--
 hosts/testbed/flake.lock       | 22 ++++++++++++++++++++++
 hosts/testbed/flake.nix        |  7 ++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/hosts/testbed/disko-config.nix b/hosts/testbed/disko-config.nix
index f54dde5c..7c66d37d 100644
--- a/hosts/testbed/disko-config.nix
+++ b/hosts/testbed/disko-config.nix
@@ -29,7 +29,7 @@ in
                   type = "filesystem";
                   format = "vfat";
                   mountpoint = "/boot";
-                  formatOptions = [
+                  extraArgs = [
                     "-n"
                     "NIXBOOT"
                   ];
@@ -71,7 +71,7 @@ in
                       "@swap" = lib.mkIf cfg.withSwap {
                         inherit mountOptions;
                         mountpoint = "/.swapfile";
-                        swap.swapfile.size = 8 * 1024; # 8GB
+                        swap.swapfile.size = "8G";
                       };
                     };
                 };
diff --git a/hosts/testbed/flake.lock b/hosts/testbed/flake.lock
index c4e96751..53234ffb 100644
--- a/hosts/testbed/flake.lock
+++ b/hosts/testbed/flake.lock
@@ -82,6 +82,27 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -1159,6 +1180,7 @@
     "root": {
       "inputs": {
         "common": "common",
+        "disko": "disko",
         "nixpkgs": "nixpkgs_3",
         "ros_neovim": "ros_neovim"
       }
diff --git a/hosts/testbed/flake.nix b/hosts/testbed/flake.nix
index 911a743a..3f4a1483 100644
--- a/hosts/testbed/flake.nix
+++ b/hosts/testbed/flake.nix
@@ -7,8 +7,8 @@
     common.url = "path:../../common";
     # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
 
-    inputs.disko.url = "github:nix-community/disko/latest";
-    inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
+    disko.url = "github:nix-community/disko/latest";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
     # impermanence.url = "github:nix-community/impermanence";
 
     ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
@@ -30,7 +30,7 @@
     in
     {
       packages = {
-        x86_64-linux.vm = self.nixosConfigurations.${configuration_name}.config.system.build.vm;
+        x86_64-linux.vm = self.nixosConfigurations.${configuration_name}.config.system.build.vmWithDisko;
       };
       nixosConfigurations = {
         "${configuration_name}" = (
@@ -42,6 +42,7 @@
               ros_neovim.nixosModules.default
               ./configuration.nix
               ./hardware-configuration.nix
+              ./disko-config.nix
               (
                 { config, pkgs, ... }:
                 {