fix(cloud): use root tofu flake and nixpkgs amazon image

Author: theorderingmachine

CHANGELOG.md

@@ -7,6 +7,7 @@ versioning is done in a continuous fashion without worries of breaking changes.
 ## patches
 
 - `openclaw`: bring tom to slack in persistent http connection kept 2026-04-05
+- `cloud`: route tofu through root flake and nixpkgs image path 2026-04-05
 - `systemd`: protect against services finding another other process 2026-04-04
 - `nix`: import language servers and formatted linter from upstream 2026-04-04
 - `vhs`: record terminal demos with tapes that share in caring gifs 2026-03-30

cloud/cloud.sh

@@ -12,13 +12,13 @@ function help {
 
 # Update infrastructure with any state changes
 function apply {
-    nix run .# apply
+    nix run ..#tofu -- apply
 }
 
 # Ensure formatting matches a statand
 function check {
-    nix run .# fmt -check
-    nix run .# validate
+    nix run ..#tofu -- fmt -check
+    nix run ..#tofu -- validate
 }
 
 # Reset back to a clean directory
@@ -33,12 +33,12 @@ function clean {
 # Setup the current state
 function init {
     rm -f terraform.tfstate terraform.tfstate.backup
-    nix run .# init
+    nix run ..#tofu -- init
 }
 
 # Preview any changes to the configurations
 function plan {
-    nix run .# plan
+    nix run ..#tofu -- plan
 }
 
 # Hint if no command is provided

cloud/configuration.nix

@@ -3,9 +3,7 @@
   "x86_64-linux" =
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-      };
+      pkgs = nixpkgs.legacyPackages.${system};
       configurations =
         { config, ... }:
         {
@@ -220,17 +218,18 @@
           };
         };
       name = "web-${system}";
-      image = inputs.nixos-generators.nixosGenerate {
-        inherit pkgs;
-        format = "amazon";
+      imageCfg = nixpkgs.lib.nixosSystem {
+        inherit system;
         modules = [
           configurations
+          "${nixpkgs}/nixos/maintainers/scripts/ec2/amazon-image.nix"
           {
             image.baseName = name;
           }
         ];
       };
-      virtualization = "${image}/${name}.vhd";
+      image = imageCfg.config.system.build.amazonImage;
+      virtualization = "${image}/${imageCfg.config.image.fileName}";
     in
     {
       tofu = pkgs.writeShellScriptBin "tofu" ''

flake.lock

@@ -24,10 +24,6 @@
       url = "github:openclaw/nix-openclaw";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-generators = {
-      url = "github:nix-community/nixos-generators";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
@@ -72,7 +68,6 @@
       });
       packages = import ./cloud/configuration.nix {
         inherit nixpkgs self;
-        inherit (inputs) nixos-generators;
       };
       darwinConfigurations = {
         edenzim-ltmbn8v.internal.salesforce.com = inputs.nix-darwin.lib.darwinSystem {