From 16add0415c09639586bb52e605ccb04b9c7ffc52 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Wed, 7 Aug 2024 06:22:48 -0400
Subject: [PATCH] chore(dev-tools): move static envars into `.env` (#9782)

---
 .env      | 6 ++++++
 .envrc    | 5 ++---
 flake.nix | 4 ----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index a79efab4e054..5860902a3235 100644
--- a/.env
+++ b/.env
@@ -1 +1,7 @@
 FLINK_VERSION=1.19.0
+CLOUDSDK_ACTIVE_CONFIG_NAME=ibis-gbq
+GOOGLE_CLOUD_PROJECT="$CLOUDSDK_ACTIVE_CONFIG_NAME"
+PGPASSWORD="postgres"
+MYSQL_PWD="ibis"
+MSSQL_SA_PASSWORD="1bis_Testing!"
+DRUID_URL="druid://localhost:8082/druid/v2/sql"
diff --git a/.envrc b/.envrc
index 6a558e6197e7..5c1ea81d651b 100644
--- a/.envrc
+++ b/.envrc
@@ -1,9 +1,8 @@
 use flake
 
+dotenv
+
 watch_file poetry.lock
 watch_file nix/overlay.nix
 watch_file nix/quarto/default.nix
 watch_file poetry-overrides.nix
-
-export CLOUDSDK_ACTIVE_CONFIG_NAME=ibis-gbq
-export GOOGLE_CLOUD_PROJECT="$CLOUDSDK_ACTIVE_CONFIG_NAME"
diff --git a/flake.nix b/flake.nix
index ad28f49dae35..d7422a91f0ab 100644
--- a/flake.nix
+++ b/flake.nix
@@ -110,10 +110,6 @@
         inherit shellHook;
 
         PYSPARK_PYTHON = "${env}/bin/python";
-        PGPASSWORD = "postgres";
-        MYSQL_PWD = "ibis";
-        MSSQL_SA_PASSWORD = "1bis_Testing!";
-        DRUID_URL = "druid://localhost:8082/druid/v2/sql";
 
         # needed for mssql+pyodbc
         ODBCSYSINI = pkgs.writeTextDir "odbcinst.ini" ''