diff --git a/home/xonsh.nix b/home/xonsh.nix
index 0b8cd2a..a8ba094 100644
--- a/home/xonsh.nix
+++ b/home/xonsh.nix
@@ -58,6 +58,7 @@
 			molcol = "molecule -c ../../tests/molecule.yml";
 			nixup = "nix flake lock --update-input";
 			pa = "cd ~/src/packaging";
+			tf = "terraform";
 			tsup = "sudo tailscale up";
 			tspub = "sudo tailscale up --exit-node=linode";
 			tshome = "sudo tailscale up --exit-node=2maccabees";
diff --git a/overlays/configure_aws_creds.nix b/overlays/configure_aws_creds.nix
new file mode 100644
index 0000000..36cf7cf
--- /dev/null
+++ b/overlays/configure_aws_creds.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+let
+	bw = "${pkgs.bitwarden-cli}/bin/bw";
+
+in pkgs.writeScriptBin "configure_aws_creds" ''
+set -ex -o pipefail
+
+session="$(${bw} unlock | grep -e '$ export' | awk -F\" '{print $2}')"
+export BW_SESSION="${session}"
+export AWS_ACCESS_KEY_ID="$(${bw} get username "AWS Access Key")"
+export AWS_SECRET_ACCESS_KEY="$(${bw} get password "AWS Access Key")"
+''
diff --git a/overlays/default.nix b/overlays/default.nix
index 7c354bc..00e5e48 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -49,8 +49,9 @@ in rec {
 
 	aacs = prev.callPackage ./aacs.nix {};
 	brew = prev.callPackage ./homebrew.nix {};
+	configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
-	hms = prev.callPackage ./hms.nix {
+	hms = prev.callPackage ./hms {
 		pkgs = final.pkgs;
 	};
 	inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
diff --git a/overlays/hms.nix b/overlays/hms/default.nix
similarity index 100%
rename from overlays/hms.nix
rename to overlays/hms/default.nix
diff --git a/overlays/hms.sh b/overlays/hms/hms.sh
similarity index 100%
rename from overlays/hms.sh
rename to overlays/hms/hms.sh
diff --git a/overlays/setup-ssh.nix b/overlays/setup-ssh/default.nix
similarity index 100%
rename from overlays/setup-ssh.nix
rename to overlays/setup-ssh/default.nix
diff --git a/overlays/setup-ssh.sh b/overlays/setup-ssh/setup-ssh.sh
similarity index 100%
rename from overlays/setup-ssh.sh
rename to overlays/setup-ssh/setup-ssh.sh