From 7ce14e260adddff8fbb9b16cfeb14a37c1f04382 Mon Sep 17 00:00:00 2001
From: Meni Livne <meni@livne.org>
Date: Mon, 26 Oct 2026 09:48:18 -0700
Subject: [PATCH] feat(shell): add psql and pinned nvm via Home Manager

Install postgresql to provide psql, and pin nvm v0.40.8 through
fetchFromGitHub since nvm is not packaged in nixpkgs.

The pinned scripts are symlinked read-only into ~/.local/share/nvm-sh,
while NVM_DIR points at a writable ~/.nvm so installed Node versions
work.

AI-Reasoning: https://github.com/menil/dotfiles/blob/ai-reasoning/feat-psql-nvm.md
---
 modules/shell.nix | 16 +++++++++++++++-
 src/home/.zshrc   |  8 ++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/shell.nix b/modules/shell.nix
index 625a956..d5db7ef 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -9,6 +9,14 @@ let
   fontFamily = builtins.head fontFamilyDirs;
   fontDir = "${fontFamilyDir}/${fontFamily}";
   font = "JetBrainsMono";
+
+  # nvm is not packaged in nixpkgs or Home Manager, so pin the upstream release.
+  nvmSrc = pkgs.fetchFromGitHub {
+    owner = "nvm-sh";
+    repo = "nvm";
+    rev = "v0.40.8";
+    hash = "sha256-24FP1brAAyWu+Q0Dk+Y4aXgdCBon9GkBXgFaGXBO7sc=";
+  };
 in
 {
   home.packages = with pkgs; [
@@ -43,6 +51,7 @@ in
 
     # Development languages and tools
     nodejs
+    postgresql # provides psql
     direnv
     nix-direnv
     beads.packages.${pkgs.system}.default
@@ -55,7 +64,12 @@ in
   ]);
 
   # Platform-specific configurations
-  home.file = lib.optionalAttrs pkgs.stdenv.isDarwin {
+  home.file = {
+    # Stable symlink to the pinned nvm scripts. They live in the read-only Nix
+    # store, so installed Node versions go in a separate writable NVM_DIR
+    # (~/.nvm, set in .zshrc).
+    ".local/share/nvm-sh".source = nvmSrc;
+  } // lib.optionalAttrs pkgs.stdenv.isDarwin {
     "Library/Fonts/JetBrainsMono" = {
       source = "${fontDir}/${font}";
       recursive = true;
diff --git a/src/home/.zshrc b/src/home/.zshrc
index 8680b07..66df534 100644
--- a/src/home/.zshrc
+++ b/src/home/.zshrc
@@ -148,6 +148,14 @@ for suggestions_path in "$HOME/.nix-profile/share/zsh-autosuggestions/zsh-autosu
   fi
 done
 
+# nvm: scripts are pinned by Home Manager (read-only), Node versions install into ~/.nvm
+export NVM_DIR="$HOME/.nvm"
+mkdir -p "$NVM_DIR"
+if [ -s "$HOME/.local/share/nvm-sh/nvm.sh" ]; then
+  . "$HOME/.local/share/nvm-sh/nvm.sh"
+  [ -s "$HOME/.local/share/nvm-sh/bash_completion" ] && . "$HOME/.local/share/nvm-sh/bash_completion"
+fi
+
 # Load direnv hook (automatically loads directory-local nix environments)
 if command -v direnv &> /dev/null; then
   eval "$(direnv hook zsh)"