Add nixpkgs-terraform, remove flox

modules/hosts/darwin/mightymac/default.nix

@@ -8,6 +8,8 @@
       kopia
       kubectx
       reposurgeon
+      # terraform-versions."1.5.7"
+      terraformer
     ];
   };
 
@@ -20,6 +22,7 @@
     ];
     brews = [
       "adr-tools"
+      "awscli"
       "helm"
       "kind"
       "kubernetes-cli"

modules/hosts/nixos/rainbow-planet/default.nix

@@ -1,4 +1,4 @@
-{ config, flox-flake, pkgs, username, ... }: {
+{ config, pkgs, username, ... }: {
   imports = [
     ./hardware-configuration.nix
     ../../../system/common/linux/flatpaks.nix
@@ -18,7 +18,6 @@
     # host specific apps
     boinc
     brightnessctl
-    #flox-flake.packages.${pkgs.system}.default
     gnome.gnome-tweaks
     gnome.nautilus
     gnomeExtensions.dash-to-panel

modules/system/common/all-darwin.nix

@@ -1,4 +1,4 @@
-{ pkgs, flox-flake, hostname, username, ... }: {
+{ pkgs, hostname, username, ... }: {
   environment = {
     shells = with pkgs; [ bash zsh ];
     loginShell = pkgs.zsh;
@@ -10,7 +10,6 @@
       age
       bandwhich
       coreutils
-      #flox-flake.packages.${pkgs.system}.default
       hugo
       mas
       nmap
@@ -95,15 +94,11 @@
         "nix-command"
         "repl-flake"
       ];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
+      extra-substituters = [
+        "https://nixpkgs-terraform.cachix.org"
       ];
-      substituters = [
-        "https://cache.nixos.org"
-      ];
-      trusted-substituters = [
-        "https://cache.flox.dev"
+      extra-trusted-public-keys = [
+        "nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw="
       ];
       trusted-users = [ "@admin" "${username}" ];
     };

modules/system/common/all-nixos.nix

@@ -43,15 +43,11 @@
       "flakes"
       "nix-command"
     ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
+    extra-substituters = [
+      "https://nixpkgs-terraform.cachix.org"
     ];
-    substituters = [
-      "https://cache.nixos.org"
-    ];
-    trusted-substituters = [
-      "https://cache.flox.dev"
+    extra-trusted-public-keys = [
+      "nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw="
     ];
     trusted-users = [ "${username}" ];
   };