.claude/tasks/0005-fish-shell-module.md

@@ -39,6 +39,6 @@ Configure the plugins natively through home-manager rather than a fish plugin ma
 - **Abbreviation-first.** Every non-eza alias is now a `shellAbbr` (the eza `ls` family stays an alias), `preferAbbrs = true`, and `generateCompletions = true` is pinned rather than left to the upstream default.
 - **vi command-line editing.** `interactiveShellInit` sets `fish_key_bindings fish_vi_key_bindings`; the `bang-bang` plugin re-binds `!`/`$` in insert mode via its own `--on-variable fish_key_bindings` handler, so the switch keeps them working.
 - **Trimmed aliases.** Navigation capped at four dots (`.....`/`......` dropped); `psmem`, `psmem10`, `dir`, `vdir`, and `please` removed.
-- **Interactive init is split in the repo, assembled by Nix.** The Module lives at `modules/fish/fish.nix`. Its `interactiveShellInit` is concatenated (in order) from concern-scoped fragments under `modules/fish/config/` — `bindings.fish` (vi editing), `env.fish` (`EDITOR`/`VISUAL` and the bat manpager), `done.fish` (the done plugin tuning), and `path.fish` (`~/.local/bin` and `~/.fish_profile`) — via `lib.concatMapStringsSep "\n" builtins.readFile`. Each concern stays an editable fish file, but home-manager still writes one `~/.config/fish/config.fish`; nothing of ours is autoloaded from a separate runtime file. The concatenated result is byte-identical to the previous monolithic `config.fish` (same toplevel hash).
+- **Interactive init lives in a real fish file.** The Module lives at `modules/fish/fish.nix`; its `interactiveShellInit` is `builtins.readFile ./config.fish`, so the interactive init is written as one editable fish file (vi editing, `EDITOR`/`VISUAL`, the bat manpager, the done plugin tuning, and `~/.local/bin`/`~/.fish_profile`) that home-manager renders into `~/.config/fish/config.fish`. The file is small enough that splitting it into fragments was not worth the indirection; Nix inlines it at build time, so nothing of ours is autoloaded from a separate runtime file.
 - **`copy` stays a function file.** `functions/copy.fish` holds the non-trivial `copy` body, read into the `functions` option; fish autoloads function files lazily, so that is the idiomatic home for a function. Trivial one-liner functions stay inline in `fish.nix`.
 - The Auto-loader only collects `.nix`, so every `.fish` file under `modules/fish/` is inert to it.

modules/fish/config.fish

@@ -0,0 +1,23 @@
+# vi-style modal editing on the command line.
+set -g fish_key_bindings fish_vi_key_bindings
+
+set -gx EDITOR nvim
+set -gx VISUAL nvim
+
+# Render man pages through bat.
+set -x MANROFFOPT "-c"
+set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"
+
+# Tune the done plugin: only notify for commands past 10s, at low urgency.
+set -g __done_min_cmd_duration 10000
+set -g __done_notification_urgency_level low
+
+# Prepend ~/.local/bin to PATH when it exists.
+if test -d ~/.local/bin
+    fish_add_path ~/.local/bin
+end
+
+# Apply fish-compatible profile overrides if present.
+if test -f ~/.fish_profile
+    source ~/.fish_profile
+end

modules/fish/config/bindings.fish

@@ -1,2 +0,0 @@
-# vi-style modal editing on the command line.
-set -g fish_key_bindings fish_vi_key_bindings

modules/fish/config/done.fish

@@ -1,3 +0,0 @@
-# Tune the done plugin: only notify for commands past 10s, at low urgency.
-set -g __done_min_cmd_duration 10000
-set -g __done_notification_urgency_level low

modules/fish/config/env.fish

@@ -1,6 +0,0 @@
-set -gx EDITOR nvim
-set -gx VISUAL nvim
-
-# Render man pages through bat.
-set -x MANROFFOPT "-c"
-set -x MANPAGER "sh -c 'col -bx | bat -l man -p'"

modules/fish/config/path.fish

@@ -1,9 +0,0 @@
-# Prepend ~/.local/bin to PATH when it exists.
-if test -d ~/.local/bin
-    fish_add_path ~/.local/bin
-end
-
-# Apply fish-compatible profile overrides if present.
-if test -f ~/.fish_profile
-    source ~/.fish_profile
-end

modules/fish/fish.nix

@@ -115,15 +115,9 @@ in
           };
         };
 
-        # config.fish is assembled here, in order, from the fragments under
-        # ./config so each concern stays an editable fish file while
-        # home-manager still writes a single ~/.config/fish/config.fish.
-        interactiveShellInit = lib.concatMapStringsSep "\n" builtins.readFile [
-          ./config/bindings.fish
-          ./config/env.fish
-          ./config/done.fish
-          ./config/path.fish
-        ];
+        # Read from a real fish file, which home-manager renders into
+        # ~/.config/fish/config.fish.
+        interactiveShellInit = builtins.readFile ./config.fish;
       };
     };
   };