From 5bf0b6acc43319b55721590b492434ea109194a3 Mon Sep 17 00:00:00 2001
From: joshashtondev <me@joshashton.dev>
Date: Mon, 3 Aug 2026 07:35:18 -0600
Subject: [PATCH] =?UTF-8?q?nixos:=20gen=20222=20@=20nix-pad=20=E2=80=94=20?=
 =?UTF-8?q?2026-08-03=2007:35=2026.05.20260724.597283a=20(Yarara)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/programs/default.nix |  1 -
 home/programs/zsh.nix     | 17 -----------------
 system/core/env.nix       |  7 +++++++
 3 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 home/programs/zsh.nix

diff --git a/home/programs/default.nix b/home/programs/default.nix
index 2191268..766d8ad 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -5,6 +5,5 @@
     ./alacritty.nix
     ./git.nix
     ./nvim.nix
-    ./zsh.nix
   ];
 }
diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix
deleted file mode 100644
index 7ff6525..0000000
--- a/home/programs/zsh.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.zsh = {
-    enable = true;
-
-    initContent = ''
-      if [ -f "/run/secrets/vaultwarden_clientid" ]; then
-        export BW_CLIENTID=$(cat /run/secrets/vaultwarden_clientid)
-      fi
-
-      if [ -f "/run/secrets/vaultwarden_clientsecret" ]; then
-        export BW_CLIENTSECRET=$(cat /run/secrets/vaultwarden_clientsecret)
-      fi
-    '';
-  };
-}
diff --git a/system/core/env.nix b/system/core/env.nix
index 30fca68..0c71d6a 100644
--- a/system/core/env.nix
+++ b/system/core/env.nix
@@ -43,5 +43,12 @@
         "git"
       ];
     };
+
+    interactiveShellInit = ''
+      if [ -f "/run/secrets/vaultwarden_clientid" ]; then
+        export BW_CLIENTID=$(cat /run/secrets/vaultwarden_clientid)
+        export BW_CLIENTSECRET=$(cat /run/secrets/vaultwarden_clientsecret)
+      fi
+    '';
   };
 }