Skip to content

Commit e0c3aac

Browse files
authored
[direnv] drop shell.nix, rely solely on devbox shell --print-env (#902)
## Summary I don't think we need this shell.nix anymore. The `devbox shell --print-env` should be providing the same information. This should speed up the direnv time. ## How was it tested? the devbox project `devbox.json` has: ``` "env": { "PATH": "$PATH:$PWD/dist", } ``` and after cd-ing into the directory for devbox repo, I see: ``` ❯ echo $PATH | sed 's/:/\n/g' | grep dist /Users/savil/code/jetpack/devbox/dist ``` we really need to add automated tests for these.
1 parent fe10ad8 commit e0c3aac

File tree

8 files changed

+7
-44
lines changed

8 files changed

+7
-44
lines changed

.envrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

examples/data_science/jupyter/.envrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

examples/development/ruby/.envrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

examples/servers/nginx/.envrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

examples/stacks/jekyll/.envrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

internal/impl/generate.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,20 @@ import (
2424
//go:embed tmpl/*
2525
var tmplFS embed.FS
2626

27-
var shellFiles = []string{"shell.nix"}
28-
2927
func (d *Devbox) generateShellFiles() error {
3028

3129
plan, err := d.ShellPlan()
3230
if err != nil {
3331
return err
3432
}
3533

36-
outPath := filepath.Join(d.projectDir, ".devbox/gen")
37-
38-
for _, file := range shellFiles {
39-
err := writeFromTemplate(outPath, plan, file)
40-
if err != nil {
41-
return errors.WithStack(err)
42-
}
43-
}
44-
4534
// Gitignore file is added to the .devbox directory
4635
err = writeFromTemplate(filepath.Join(d.projectDir, ".devbox"), plan, ".gitignore")
4736
if err != nil {
4837
return errors.WithStack(err)
4938
}
5039

40+
outPath := filepath.Join(d.projectDir, ".devbox/gen")
5141
err = makeFlakeFile(outPath, plan)
5242
if err != nil {
5343
return errors.WithStack(err)

internal/impl/tmpl/envrc.tmpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
use_devbox() {
55
watch_file devbox.json
6-
if [ -f .devbox/gen/shell.nix ]; then
6+
if [ -f .devbox/gen/flake/flake.nix ]; then
77
DEVBOX_SHELL_ENABLED_BACKUP=$DEVBOX_SHELL_ENABLED
8-
use nix .devbox/gen/shell.nix
98
eval $(devbox shell --print-env)
109
export DEVBOX_SHELL_ENABLED=$DEVBOX_SHELL_ENABLED_BACKUP
1110
fi

internal/impl/tmpl/shell.nix.tmpl

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)