Skip to content

Commit

Permalink
fix(devcontainer): devcontainer setup cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
kahlstrm committed Jan 21, 2025
1 parent f1d5a61 commit 6f0324a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"vscode": {
"extensions": [
"mkhl.direnv",
"4ops.terraform",
"hashicorp.terraform",
"ms-azuretools.vscode-azureterraform"
]
}
},
"image": "ghcr.io/cachix/devenv:latest",
"overrideCommand": false,
"updateContentCommand": ""
"updateContentCommand": ["direnv","reload"]
}
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fi

watch_file flake.nix
watch_file flake.lock
if ! use flake . --no-pure-eval
if ! use flake . --no-pure-eval --accept-flake-config
then
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ terraform.exe
.idea/
.devenv
.direnv
.pre-commit-config.yaml
11 changes: 0 additions & 11 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,6 @@
# https://devenv.sh/reference/options/
packages = [pkgs.azure-cli];
languages.terraform.enable = true;
devcontainer = {
enable = true;
settings = {
updateContentCommand = "";
customizations.vscode.extensions = [
"mkhl.direnv"
"4ops.terraform"
"ms-azuretools.vscode-azureterraform"
];
};
};

git-hooks.hooks.terraform-fmt = {
enable = true;
Expand Down

0 comments on commit 6f0324a

Please sign in to comment.