18 files changed, 30 insertions, 27 deletions
diff --git a/website/blog/.envrc b/website/blog/.envrc
index 1abb058f60d5..a4a62da526d3 100644
--- a/website/blog/.envrc
+++ b/website/blog/.envrc
@@ -1 +1,2 @@
 source_up
+use_nix
diff --git a/website/blog/shell.nix b/website/blog/shell.nix
index d1b4f49942bc..7ca3a9713ebf 100644
--- a/website/blog/shell.nix
+++ b/website/blog/shell.nix
@@ -1,7 +1,7 @@
 let
-  pkgs = import <nixpkgs> {};
-in
-pkgs.mkShell {
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
+in pkgs.mkShell {
   buildInputs = with pkgs; [
     hugo
   ];
diff --git a/website/days-of-week-habits/.envrc b/website/days-of-week-habits/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/website/days-of-week-habits/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/website/days-of-week-habits/dir-locals.nix b/website/days-of-week-habits/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/website/days-of-week-habits/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/website/days-of-week-habits/shell.nix b/website/days-of-week-habits/shell.nix
index ec2a1ce833fa..083254beefd0 100644
--- a/website/days-of-week-habits/shell.nix
+++ b/website/days-of-week-habits/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
diff --git a/website/goals/.envrc b/website/goals/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/website/goals/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/website/goals/dir-locals.nix b/website/goals/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/website/goals/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/website/goals/shell.nix b/website/goals/shell.nix
index ec2a1ce833fa..083254beefd0 100644
--- a/website/goals/shell.nix
+++ b/website/goals/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
diff --git a/website/habitgarden/.envrc b/website/habitgarden/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/website/habitgarden/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/website/habitgarden/dir-locals.nix b/website/habitgarden/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/website/habitgarden/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/website/habitgarden/shell.nix b/website/habitgarden/shell.nix
index ec2a1ce833fa..083254beefd0 100644
--- a/website/habitgarden/shell.nix
+++ b/website/habitgarden/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
diff --git a/website/sandbox/contentful/.envrc b/website/sandbox/contentful/.envrc
index a6b0e978f430..98e1d2c821f9 100644
--- a/website/sandbox/contentful/.envrc
+++ b/website/sandbox/contentful/.envrc
@@ -1,3 +1,4 @@
 source_up
+use_nix
 export CONTENTFUL_SPACE_ID="$(pass show programming/contentful/space-id)"
 export CONTENTFUL_ACCESS_TOKEN="$(pass show programming/contentful/access-token)"
diff --git a/website/sandbox/contentful/default.nix b/website/sandbox/contentful/default.nix
index 00714f45d098..f7125655ccdc 100644
--- a/website/sandbox/contentful/default.nix
+++ b/website/sandbox/contentful/default.nix
@@ -1,6 +1,6 @@
-let
-  pkgs = import <nixpkgs> {};
-in pkgs.stdenv.mkDerivation {
+{ pkgs, ... }:
+
+pkgs.stdenv.mkDerivation {
   name = "ideal-website";
   src = builtins.path { path = ./.; name = "contentful"; };
   buildInputs = with pkgs; [
diff --git a/website/sandbox/contentful/shell.nix b/website/sandbox/contentful/shell.nix
index ec2a1ce833fa..083254beefd0 100644
--- a/website/sandbox/contentful/shell.nix
+++ b/website/sandbox/contentful/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
diff --git a/website/sandbox/covid-uk/shell.nix b/website/sandbox/covid-uk/shell.nix
index 38df7d4e8508..6442c39f9c47 100644
--- a/website/sandbox/covid-uk/shell.nix
+++ b/website/sandbox/covid-uk/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     yarn
diff --git a/website/sandbox/learnpianochords/.envrc b/website/sandbox/learnpianochords/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/website/sandbox/learnpianochords/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/website/sandbox/learnpianochords/dir-locals.nix b/website/sandbox/learnpianochords/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/website/sandbox/learnpianochords/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/website/sandbox/learnpianochords/shell.nix b/website/sandbox/learnpianochords/shell.nix
index 1a9c967f7fea..00bb4b0b3edc 100644
--- a/website/sandbox/learnpianochords/shell.nix
+++ b/website/sandbox/learnpianochords/shell.nix
@@ -2,9 +2,9 @@ let
   briefcase = import <briefcase> {};
   pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
-  buildInputs = with pkgs; [
-    elmPackages.elm
-    elmPackages.elm-format
-    elmPackages.elm-live
+  buildInputs = with pkgs.elmPackages; [
+    elm
+    elm-format
+    elm-live
   ];
 }