From 73b62e0907df9836ea1b348b83441125e4d3d5fa Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Mon, 20 Jul 2026 13:29:00 -0400
Subject: [PATCH] fix broken rebuilds

---
 .../modules/nmasur/presets/programs/cargo.nix | 20 +++++++++----------
 .../nmasur/presets/programs/zellij.nix        |  4 ++++
 .../modules/nmasur/profiles/base.nix          |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/platforms/home-manager/modules/nmasur/presets/programs/cargo.nix b/platforms/home-manager/modules/nmasur/presets/programs/cargo.nix
index 066f91aa..5841cccc 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/cargo.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/cargo.nix
@@ -18,16 +18,16 @@ in
       ca = "cargo";
     };
 
-    home.packages = with pkgs; [
-      gcc
-      rustc
-      cargo
-      cargo-watch
-      clippy
-      rustfmt
-      pkg-config
-      openssl
-      rust-analyzer
+    home.packages = [
+      pkgs.gcc
+      pkgs.rustc
+      pkgs.cargo
+      pkgs.stable.cargo-watch
+      pkgs.clippy
+      pkgs.rustfmt
+      pkgs.pkg-config
+      pkgs.openssl
+      pkgs.rust-analyzer
     ];
   };
 }
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
index fc96539a..b0c91da2 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
@@ -109,6 +109,10 @@ in
 
       settings = {
         default_mode = "locked";
+        # Spawn fish directly instead of trusting $SHELL, which inherits the
+        # macOS login shell. On darwin that login shell is no longer managed by
+        # nix-darwin, so $SHELL can point at a stale /run/current-system path.
+        default_shell = lib.getExe pkgs.fish;
         # default_layout = "compact-top";
         # Remove border
         pane_frames = false;
diff --git a/platforms/nix-darwin/modules/nmasur/profiles/base.nix b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
index 5da1f166..62758634 100644
--- a/platforms/nix-darwin/modules/nmasur/profiles/base.nix
+++ b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
@@ -19,7 +19,7 @@ in
     nmasur.presets = {
       programs = {
         _1password.enable = lib.mkDefault true;
-        # fish.enable = lib.mkDefault true;
+        fish.enable = lib.mkDefault true;
         # homebrew.enable = lib.mkDefault true;
       };
       services = {