diff --git a/home/.config/fish/conf.d/path.fish b/home/.config/fish/conf.d/path.fish
new file mode 100644
index 0000000..2088ad0
--- /dev/null
+++ b/home/.config/fish/conf.d/path.fish
@@ -0,0 +1,13 @@
+# PATH — fish is the first-class shell, so it owns its own PATH setup
+# rather than relying on rc.common (which serves bash/zsh). Mirrors:
+#   rc.common: export PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+#
+# Without this, a fish login shell (e.g. SSH'd into Linux where fish is the
+# login shell) never sees ~/bin, so tools installed there — notably starship
+# (setup/tools.sh installs it to ~/bin) — are invisible and the starship
+# prompt block in config.fish is silently skipped.
+#
+# fish_add_path is idempotent. -g keeps it session-global (driven entirely by
+# this committed config, reproducible across machines, no per-host universal
+# vars) and -p prepends in the given order.
+fish_add_path -gp $HOME/bin $HOME/.local/bin
diff --git a/home/.config/fish/functions/fish_prompt.fish b/home/.config/fish/functions/fish_prompt.fish
deleted file mode 100644
index 6244867..0000000
--- a/home/.config/fish/functions/fish_prompt.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-function fish_prompt --description 'Write out the prompt'
-    # Save our status
-    set -l last_pipestatus $pipestatus
-
-    set -l color_cwd
-    set -l suffix
-    switch "$USER"
-        case root toor
-            if set -q fish_color_cwd_root
-                set color_cwd $fish_color_cwd_root
-            else
-                set color_cwd $fish_color_cwd
-            end
-            set suffix '#'
-        case '*'
-            set color_cwd $fish_color_cwd
-            set suffix '>'
-    end
-
-    echo -n -s "$USER" @ (prompt_hostname) ' ' (set_color $color_cwd) (prompt_pwd) \
-        (__fish_print_pipestatus " [" "]" "|" (set_color $fish_color_status) (set_color --bold $fish_color_status) $last_pipestatus) \
-        (set_color normal) "$suffix "
-end