From 2a017f584b8a34c0b53abd87208d88161598e6c0 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Tue, 30 Sep 2025 09:01:57 -0700 Subject: [PATCH] [home-work] Fix shell integration --- home/home-darwin-work.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/home/home-darwin-work.nix b/home/home-darwin-work.nix index 95ef6b8..ef88988 100644 --- a/home/home-darwin-work.nix +++ b/home/home-darwin-work.nix @@ -16,9 +16,25 @@ in # Override Darwin-incompatible settings from base role programs.rbw.settings.pinentry = lib.mkForce pkgs.pinentry_mac; - # Disable direct control over bash and zsh - programs.bash.enable = lib.mkForce false; - programs.zsh.enable = lib.mkForce false; + programs.bash.initExtra = '' + export NODE_EXTRA_CA_CERTS=/opt/homebrew/etc/ca-certificates/cert.pem + export COREPACK_NPM_REGISTRY=https://global.block-artifacts.com/artifactory/api/npm/square-npm/ + export COREPACK_INTEGRITY_KEYS=0 + + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + ''; + + programs.zsh.enable = true; + programs.zsh.initContent = '' + export NODE_EXTRA_CA_CERTS=/opt/homebrew/etc/ca-certificates/cert.pem + export COREPACK_NPM_REGISTRY=https://global.block-artifacts.com/artifactory/api/npm/square-npm/ + export COREPACK_INTEGRITY_KEYS=0 + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion + ''; # Keep SSH and Git disabled to avoid conflicts with work environment programs.ssh.enable = lib.mkForce false;