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 + ''; }; }