From 5cbc1db2601bcb00a32d000d29ca258aa4ca8358 Mon Sep 17 00:00:00 2001
From: Shun Kakinoki <shunkakinoki@gmail.com>
Date: Sun, 8 Feb 2026 04:15:29 +0900
Subject: [PATCH] fix: guard worktrunk init and globals

---
 home-manager/modules/cargo-globals/default.nix | 4 +++-
 home-manager/modules/npm-globals/default.nix   | 4 ++++
 home-manager/programs/bash/default.nix         | 4 +++-
 home-manager/programs/fish/default.nix         | 7 ++++---
 home-manager/programs/zsh/default.nix          | 4 +++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/home-manager/modules/cargo-globals/default.nix b/home-manager/modules/cargo-globals/default.nix
index 559deb480..32e744a34 100644
--- a/home-manager/modules/cargo-globals/default.nix
+++ b/home-manager/modules/cargo-globals/default.nix
@@ -15,8 +15,10 @@ in
 {
   # Install cargo global packages from Cargo.toml using home-manager activation
   home.activation.installCargoGlobals = config.lib.dag.entryAfter [ "writeBoundary" ] ''
-    export PATH=${pkgs.rustup}/bin:${pkgs.cargo}/bin:${pkgs.dasel}/bin:${pkgs.jq}/bin:${pkgs.gcc}/bin:${pkgs.pkg-config}/bin:$PATH
+    export PATH=${pkgs.rustup}/bin:${pkgs.cargo}/bin:${pkgs.rustc}/bin:${pkgs.dasel}/bin:${pkgs.jq}/bin:${pkgs.gcc}/bin:${pkgs.pkg-config}/bin:$PATH
     export CARGO_HOME="$HOME/.cargo"
+    $DRY_RUN_CMD ${pkgs.rustup}/bin/rustup toolchain install stable
+    $DRY_RUN_CMD ${pkgs.rustup}/bin/rustup default stable
     export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig${libiconvPkgConfigPath}''${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
     export OPENSSL_DIR="${pkgs.openssl.dev}"
     export OPENSSL_LIB_DIR="${pkgs.openssl.out}/lib"
diff --git a/home-manager/modules/npm-globals/default.nix b/home-manager/modules/npm-globals/default.nix
index 9170da9be..7f9a4d34f 100644
--- a/home-manager/modules/npm-globals/default.nix
+++ b/home-manager/modules/npm-globals/default.nix
@@ -7,6 +7,10 @@
     $DRY_RUN_CMD ${pkgs.bash}/bin/bash ${./install-npm-globals.sh}
   '';
 
+  home.sessionVariables = {
+    BUN_INSTALL = "$HOME/.bun";
+  };
+
   # Add local and bun bins to PATH
   home.sessionPath = [
     "$HOME/.local/bin"
diff --git a/home-manager/programs/bash/default.nix b/home-manager/programs/bash/default.nix
index 153998988..2287f84a6 100644
--- a/home-manager/programs/bash/default.nix
+++ b/home-manager/programs/bash/default.nix
@@ -57,7 +57,9 @@
       export PATH="/opt/homebrew/opt/postgresql@18/bin:$PATH"
 
       # Worktrunk shell init
-      eval "$(wt config shell init bash)"
+      if command -v wt >/dev/null 2>&1; then
+        eval "$(wt config shell init bash)"
+      fi
     '';
 
     profileExtra = ''
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index e42666780..00767a3b1 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -23,9 +23,6 @@
       set -gx GOPATH $HOME/go
 
       direnv hook fish | source
-
-      # Worktrunk shell init
-      wt config shell init fish | source
     '';
     loginShellInit = ''
       if test -f /opt/homebrew/bin/brew
@@ -61,6 +58,10 @@
       fish_add_path -p /opt/homebrew/bin
       fish_add_path -p /opt/homebrew/opt/postgresql@18/bin
       fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
+      # Worktrunk shell init
+      if type -q wt
+        wt config shell init fish | source
+      end
       set -a fish_complete_path ~/.nix-profile/share/fish/completions/ ~/.nix-profile/share/fish/vendor_completions.d/
       set -x FISH_HISTFILE fish
       fish_vi_key_bindings
diff --git a/home-manager/programs/zsh/default.nix b/home-manager/programs/zsh/default.nix
index 027511271..ff465cfdd 100644
--- a/home-manager/programs/zsh/default.nix
+++ b/home-manager/programs/zsh/default.nix
@@ -66,7 +66,9 @@
       export FNM_VERSION_FILE_STRATEGY="local"
 
       # Worktrunk shell init
-      eval "$(wt config shell init zsh)"
+      if command -v wt >/dev/null 2>&1; then
+        eval "$(wt config shell init zsh)"
+      fi
     '';
   };
 }