remove home-manager module from nix-darwin

this fixes the starship errors when rebuilding nix-darwin

hosts/aarch64-darwin/lookingglass/default.nix

@@ -27,6 +27,7 @@ rec {
       common.enable = true;
       darwin-base.enable = true;
       darwin-gaming.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
       work.enable = true;
       experimental.enable = true;

hosts/aarch64-linux/flame/default.nix

@@ -28,6 +28,7 @@ rec {
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
     };
     nmasur.presets.programs.helix.enable = true;

hosts/x86_64-linux/swan/default.nix

@@ -26,6 +26,7 @@ rec {
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
     };
     home.stateVersion = "23.05";

hosts/x86_64-linux/tempest/default.nix

@@ -30,6 +30,7 @@ rec {
       linux-base.enable = true;
       linux-gui.enable = true;
       linux-gaming.enable = true;
+      llm-development.enable = true;
       power-user.enable = true;
       developer.enable = true;
       experimental.enable = true;

lib/default.nix

@@ -179,22 +179,20 @@ lib
     inputs.darwin.lib.darwinSystem {
       inherit system specialArgs;
       modules = [
-        inputs.home-manager.darwinModules.home-manager
         inputs.mac-app-util.darwinModules.default
         {
           imports = (nixFiles ../platforms/nix-darwin);
           nixpkgs.pkgs = pkgsBySystem.${system};
         }
-        module
-        {
-          home-manager = {
-            extraSpecialArgs = {
-              inherit colorscheme;
-            }
-            // specialArgs;
-          }
-          // homeModule.home-manager;
-        }
+        # Home Manager is intentionally NOT activated here. It is managed
+        # standalone via `nh home switch` (see homeConfigurations, extracted
+        # from the host module's `home-manager.users`). Strip that attr so
+        # darwin-rebuild doesn't also activate a second, divergent HM
+        # generation with different store paths (useUserPackages puts packages
+        # in /etc/profiles/per-user vs. ~/.nix-profile standalone) -- that
+        # mismatch broke the prompt after every darwin-rebuild until the next
+        # `nh home switch`.
+        (builtins.removeAttrs module [ "home-manager" ])
       ];
     };
 

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
     ];
   };
 }

platforms/home-manager/modules/nmasur/presets/programs/noti.nix

@@ -15,10 +15,21 @@ in
 
   config = lib.mkIf (cfg.enable && (pkgs.stdenv.isDarwin || config.services.dunst.enable)) {
     home.packages = [ pkgs.noti ];
-    programs.fish.shellAbbrs = {
-      # Add noti for ghpr in Darwin
-      ghpr = lib.mkForce "gh pr create && sleep 3 && noti gh run watch";
-      grw = lib.mkForce "noti gh run watch";
+    programs.fish = {
+      shellAbbrs = {
+        # Add noti for ghpr in Darwin
+        ghpr = lib.mkForce "gh pr create && sleep 3 && noti gh run watch";
+        grw = lib.mkForce "noti gh run watch";
+      };
+      functions = {
+        gh-run = {
+          body =
+            lib.mkForce # fish
+              ''
+                ${lib.getExe pkgs.zellij} action new-pane --start-suspended -- noti gh run watch
+              '';
+        };
+      };
     };
   };
 }

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;

platforms/home-manager/modules/nmasur/profiles/llm-development.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.nmasur.profiles.llm-development;
+in
+
+{
+
+  options.nmasur.profiles.llm-development.enable = lib.mkEnableOption "LLM coding tools";
+
+  config = lib.mkIf cfg.enable {
+
+    home.packages = [
+
+      pkgs.pi-coding-agent # AI LLM Agent
+
+    ];
+
+  };
+
+}

platforms/nix-darwin/modules/nmasur/presets/programs/_1password.nix

@@ -12,12 +12,9 @@ in
   options.nmasur.presets.programs._1password.enable = lib.mkEnableOption "1Password password manager";
 
   config = lib.mkIf cfg.enable {
-    allowUnfreePackages = [
-      "1password"
-      "_1password-gui"
-      "1password-cli"
-    ];
-
+    # Unfree packages are already permitted via the shared nixpkgs instance
+    # created in lib/default.nix (config.allowUnfree = true). Setting
+    # nixpkgs.config here would conflict with nixpkgs.pkgs being set externally.
     programs._1password.enable = true;
     programs._1password-gui = {
       enable = true;

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 = {