Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
if [ -z "${name}" ]; then
if [ -z "${NIX_ENV_LOADED}" ]; then
echo "entering dev environment..."
export NIX_ENV_LOADED=$(pwd)

nix develop \
--ignore-environment \
Expand All @@ -15,24 +16,22 @@ if [ -z "${name}" ]; then
--keep AWS_SECRET_ACCESS_KEY \
--keep AWS_SESSION_TOKEN \
--keep TERM \
--keep NIX_ENV_LOADED \
$(pwd)
else
echo "setting up dev environment..."

source .aliases
source .functions
source .variables
source .rcs
fi
if [ -z "$SSH_AUTH_SOCK" ]; then
echo "Unable to find SSH_AUTH_SOCK, is your agent running?";
fi
if [ -z "$(ssh-add -l | grep -v 'The agent has no identities.')" ]; then
echo "Your agent doesn't appear to have any identities loaded, please load a key or forward your agent.";
fi
if [ -z "$(env | grep 'AWS')" ]; then
echo "Unable to find AWS authentication information in the environment, please make sure you authenticate with AWS.";
fi
if [ -z "$(env | grep 'GITHUB_TOKEN')" ]; then
echo "Unable to find GITHUB authentication information in the environment, please make sure you authenticate with GITHUB.";
source .aliases

if [ -z "$SSH_AUTH_SOCK" ]; then eval $(ssh-agent -s); fi

if [ -z "$(env | grep 'AWS')" ]; then
echo "Unable to find AWS authentication information in the environment, please make sure you authenticate with AWS.";
fi
if [ -z "$(env | grep 'GITHUB_TOKEN')" ]; then
echo "Unable to find GITHUB authentication information in the environment, please make sure you authenticate with GITHUB.";
fi
fi
3 changes: 2 additions & 1 deletion .rcs
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
source ~/.config/aws/default/rc # add personal aws auth vars
source ~/.config/alias/default/rc # add personal aliases
source ~/.config/alias/default/rc # add personal aliases
source ~/.config/github/default/rc # add personal github auth vars
5 changes: 0 additions & 5 deletions modules/vpc/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ resource "aws_vpc" "new" {
Name = local.name
}
assign_generated_ipv6_cidr_block = true
lifecycle {
ignore_changes = [
default_network_acl_id,
]
}
}

resource "aws_internet_gateway" "new" {
Expand Down