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

Author: theorderingmachine

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, ... }:
         {
@@ -205,16 +203,15 @@
           };
         };
       name = "web-${system}";
-      image = inputs.nixos-generators.nixosGenerate {
-        inherit pkgs;
-        format = "amazon";
+      image = (nixpkgs.lib.nixosSystem {
+        inherit system;
         modules = [
           configurations
           {
             image.baseName = name;
           }
         ];
-      };
+      }).config.system.build.images.amazon;
       virtualization = "${image}/${name}.vhd";
     in
     {

flake.lock

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