diff --git a/modules/default.nix b/modules/default.nix index 2390683..55b90a5 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -46,6 +46,7 @@ let agenix android-file-transfer bitwarden-cli + configure_aws_creds diffutils git gh diff --git a/overlays/configure_aws_creds.nix b/overlays/configure_aws_creds.nix index 36cf7cf..4bb2708 100644 --- a/overlays/configure_aws_creds.nix +++ b/overlays/configure_aws_creds.nix @@ -2,11 +2,11 @@ let bw = "${pkgs.bitwarden-cli}/bin/bw"; -in pkgs.writeScriptBin "configure_aws_creds" '' +in pkgs.writeShellScriptBin "configure_aws_creds" '' set -ex -o pipefail session="$(${bw} unlock | grep -e '$ export' | awk -F\" '{print $2}')" -export BW_SESSION="${session}" +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 00e5e48..129a880 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -59,7 +59,7 @@ in rec { withAACS = true; withBDplus = true; }; - setup-ssh = prev.callPackage ./setup-ssh.nix { + setup-ssh = prev.callPackage ./setup-ssh { pkgs = final.pkgs; }; template = prev.callPackage ./template.nix { };