From d422ab72b5aa505036f5d7467510b0fccdd1ed66 Mon Sep 17 00:00:00 2001
From: Bastian Gruber <foreach@me.com>
Date: Thu, 29 Jan 2026 16:27:35 -0400
Subject: [PATCH] update scripts

---
 .../run_once_before_01-install-packages.sh.tmpl    | 14 +++++++-------
 .../run_once_before_02-install-rust.sh.tmpl        |  4 ----
 .../run_once_before_03-install-node.sh.tmpl        |  4 ++--
 dot_config/fish/config.fish.tmpl                   |  3 +++
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.chezmoiscripts/run_once_before_01-install-packages.sh.tmpl b/.chezmoiscripts/run_once_before_01-install-packages.sh.tmpl
index c15757b..8253799 100644
--- a/.chezmoiscripts/run_once_before_01-install-packages.sh.tmpl
+++ b/.chezmoiscripts/run_once_before_01-install-packages.sh.tmpl
@@ -31,20 +31,20 @@ sudo pacman -S --noconfirm --needed \
 
 {{ if .hasGUI -}}
 # GUI tools (only on machines with GUI)
-# Check if yay is installed for AUR packages
-if ! command -v yay &> /dev/null; then
-    echo "==> Installing yay for AUR packages..."
+# Check if paru is installed for AUR packages
+if ! command -v paru &> /dev/null; then
+    echo "==> Installing paru for AUR packages..."
     cd /tmp
-    git clone https://aur.archlinux.org/yay.git
-    cd yay
+    git clone https://aur.archlinux.org/paru.git
+    cd paru
     makepkg -si --noconfirm
     cd -
-    rm -rf /tmp/yay
+    rm -rf /tmp/paru
 fi
 
 # Install Ghostty from AUR
 echo "==> Installing Ghostty from AUR..."
-yay -S --noconfirm --needed ghostty
+paru -S --noconfirm --needed ghostty
 {{ end -}}
 
 {{ else if eq .pkgManager "apt" -}}
diff --git a/.chezmoiscripts/run_once_before_02-install-rust.sh.tmpl b/.chezmoiscripts/run_once_before_02-install-rust.sh.tmpl
index e42f6d6..73106d2 100644
--- a/.chezmoiscripts/run_once_before_02-install-rust.sh.tmpl
+++ b/.chezmoiscripts/run_once_before_02-install-rust.sh.tmpl
@@ -25,10 +25,6 @@ rustup default stable
 echo "==> Installing Rust components..."
 rustup component add rustfmt clippy rust-analyzer
 
-# Install useful cargo tools
-echo "==> Installing cargo tools..."
-cargo install --locked cargo-watch cargo-edit cargo-outdated 2>/dev/null || true
-
 echo "==> Rust toolchain installed successfully!"
 echo "    rustc: $(rustc --version)"
 echo "    cargo: $(cargo --version)"
diff --git a/.chezmoiscripts/run_once_before_03-install-node.sh.tmpl b/.chezmoiscripts/run_once_before_03-install-node.sh.tmpl
index 7075bd4..7cda8e0 100644
--- a/.chezmoiscripts/run_once_before_03-install-node.sh.tmpl
+++ b/.chezmoiscripts/run_once_before_03-install-node.sh.tmpl
@@ -13,10 +13,10 @@ if ! command -v fnm &> /dev/null; then
 
     # Add fnm to PATH for this script
     export PATH="$HOME/.local/share/fnm:$PATH"
-    eval "$(fnm env)"
+    eval "$(fnm env --shell bash)"
 else
     echo "==> fnm already installed"
-    eval "$(fnm env)"
+    eval "$(fnm env --shell bash)"
 fi
 
 # Install latest LTS Node.js
diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl
index c6fda48..bc27652 100644
--- a/dot_config/fish/config.fish.tmpl
+++ b/dot_config/fish/config.fish.tmpl
@@ -64,3 +64,6 @@ set -gx GPG_TTY (tty)
 # Editor
 set -gx EDITOR {{ .editor }}
 set -gx VISUAL {{ .editor }}
+
+# Go module cache (keep ~/go clean)
+set -gx GOMODCACHE ~/.cache/go/mod