diff --git a/completions/fisher.fish b/completions/fisher.fish
deleted file mode 100644
index 6d23ce4..0000000
--- a/completions/fisher.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-complete --command fisher --exclusive --long help --description "Print help"
-complete --command fisher --exclusive --long version --description "Print version"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins"
-complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex"
-complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)"
diff --git a/functions/fisher.fish b/functions/fisher.fish
deleted file mode 100644
index 7986bb9..0000000
--- a/functions/fisher.fish
+++ /dev/null
@@ -1,251 +0,0 @@
-function fisher --argument-names cmd --description "A plugin manager for Fish"
-    set --query fisher_path || set --local fisher_path $__fish_config_dir
-    set --local fisher_version 4.4.8
-    set --local fish_plugins $__fish_config_dir/fish_plugins
-
-    switch "$cmd"
-        case -v --version
-            echo "fisher, version $fisher_version"
-        case "" -h --help
-            echo "Usage: fisher install   <plugins...>  Install plugins"
-            echo "       fisher remove    <plugins...>  Remove installed plugins"
-            echo "       fisher uninstall <plugins...>  Remove installed plugins (alias)"
-            echo "       fisher update    <plugins...>  Update installed plugins"
-            echo "       fisher update                  Update all installed plugins"
-            echo "       fisher list    [<regex>]       List installed plugins matching regex"
-            echo "Options:"
-            echo "       -v, --version  Print version"
-            echo "       -h, --help     Print this help message"
-            echo "Variables:"
-            echo "       \$fisher_path  Plugin installation path. Default: $__fish_config_dir" | string replace --regex -- $HOME \~
-        case ls list
-            string match --entire --regex -- "$argv[2]" $_fisher_plugins
-        case install update remove uninstall
-            isatty || read --local --null --array stdin && set --append argv $stdin
-
-            test "$cmd" = uninstall && set cmd remove
-
-            set --local install_plugins
-            set --local update_plugins
-            set --local remove_plugins
-            set --local arg_plugins $argv[2..-1]
-            set --local old_plugins $_fisher_plugins
-            set --local new_plugins
-
-            test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins | string replace -- \~ ~)
-
-            if ! set --query argv[2]
-                if test "$cmd" != update
-                    echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1
-                else if ! set --query file_plugins
-                    echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1
-                end
-                set arg_plugins $file_plugins
-            else if test "$cmd" = install && ! set --query old_plugins[1]
-                set --append arg_plugins $file_plugins
-            end
-
-            for plugin in $arg_plugins
-                set plugin (test -e "$plugin" && realpath $plugin || string lower -- $plugin)
-                contains -- "$plugin" $new_plugins || set --append new_plugins $plugin
-            end
-
-            if set --query argv[2]
-                for plugin in $new_plugins
-                    if contains -- "$plugin" $old_plugins
-                        test "$cmd" = remove &&
-                            set --append remove_plugins $plugin ||
-                            set --append update_plugins $plugin
-                    else if test "$cmd" = install
-                        set --append install_plugins $plugin
-                    else
-                        echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1
-                    end
-                end
-            else
-                for plugin in $new_plugins
-                    contains -- "$plugin" $old_plugins &&
-                        set --append update_plugins $plugin ||
-                        set --append install_plugins $plugin
-                end
-
-                for plugin in $old_plugins
-                    contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin
-                end
-            end
-
-            set --local pid_list
-            set --local source_plugins
-            set --local fetch_plugins $update_plugins $install_plugins
-            set --local fish_path (status fish-path)
-
-            echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal)
-
-            for plugin in $fetch_plugins
-                set --local source (command mktemp -d)
-                set --append source_plugins $source
-
-                command mkdir -p $source/{completions,conf.d,themes,functions}
-
-                $fish_path --command "
-                    if test -e $plugin
-                        command cp -Rf $plugin/* $source
-                    else
-                        set resp (command mktemp)
-                        set temp (command mktemp -d)
-                        set repo (string split -- \@ $plugin) || set repo[2] HEAD
-
-                        if set path (string replace --regex -- '^(https://)?gitlab.com/' '' \$repo[1])
-                            set name (string split -- / \$path)[-1]
-                            set url https://gitlab.com/\$path/-/archive/\$repo[2]/\$name-\$repo[2].tar.gz
-                        else
-                            set url https://api.github.com/repos/\$repo[1]/tarball/\$repo[2]
-                        end
-
-                        echo Fetching (set_color --underline)\$url(set_color normal)
-
-                        set http (command curl -q --silent -L -o \$resp -w %{http_code} \$url)
-
-                        if test \"\$http\" = 200 && command tar -xzC \$temp -f \$resp 2>/dev/null
-                            command cp -Rf \$temp/*/* $source
-                        else if test \"\$http\" = 403
-                            echo fisher: GitHub API rate limit exceeded \(HTTP 403\) >&2
-                            command rm -rf $source
-                        else
-                            echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2
-                            command rm -rf $source
-                        end
-
-                        command rm -rf \$temp
-                    end
-
-                    set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files
-                " &
-
-                set --append pid_list (jobs --last --pid)
-            end
-
-            wait $pid_list 2>/dev/null
-
-            for plugin in $fetch_plugins
-                if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source
-                    if set --local index (contains --index -- "$plugin" $install_plugins)
-                        set --erase install_plugins[$index]
-                    else
-                        set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)]
-                    end
-                end
-            end
-
-            for plugin in $update_plugins $remove_plugins
-                if set --local index (contains --index -- "$plugin" $_fisher_plugins)
-                    set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files
-
-                    if contains -- "$plugin" $remove_plugins
-                        for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var)
-                            emit {$name}_uninstall
-                        end
-                        printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) "         "$$plugin_files_var | string replace -- \~ ~
-                        set --erase _fisher_plugins[$index]
-                    end
-
-                    command rm -rf (string replace -- \~ ~ $$plugin_files_var)
-
-                    functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var)
-
-                    for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var)
-                        complete --erase --command $name
-                    end
-
-                    set --erase $plugin_files_var
-                end
-            end
-
-            if set --query update_plugins[1] || set --query install_plugins[1]
-                command mkdir -p $fisher_path/{functions,themes,conf.d,completions}
-            end
-
-            for plugin in $update_plugins $install_plugins
-                set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)]
-                set --local files $source/{functions,themes,conf.d,completions}/*
-
-                if set --local index (contains --index -- $plugin $install_plugins)
-                    set --local user_files $fisher_path/{functions,themes,conf.d,completions}/*
-                    set --local conflict_files
-
-                    for file in (string replace -- $source/ $fisher_path/ $files)
-                        contains -- $file $user_files && set --append conflict_files $file
-                    end
-
-                    if set --query conflict_files[1] && set --erase install_plugins[$index]
-                        echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n"        "$conflict_files >&2
-                        continue
-                    end
-                end
-
-                for file in (string replace -- $source/ "" $files)
-                    command cp -RLf $source/$file $fisher_path/$file
-                end
-
-                set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files
-
-                set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files | string replace -- ~ \~)
-
-                contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin
-                contains -- $plugin $install_plugins && set --local event install || set --local event update
-
-                printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) "           "$$plugin_files_var | string replace -- \~ ~
-
-                for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var | string replace -- \~ ~)
-                    source $file
-                    if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file)
-                        emit {$name}_$event
-                    end
-                end
-            end
-
-            command rm -rf $source_plugins
-
-            if set --query _fisher_plugins[1]
-                set --local commit_plugins
-
-                for plugin in $file_plugins
-                    contains -- (string lower -- $plugin) (string lower -- $_fisher_plugins) && set --append commit_plugins $plugin
-                end
-
-                for plugin in $_fisher_plugins
-                    contains -- (string lower -- $plugin) (string lower -- $commit_plugins) || set --append commit_plugins $plugin
-                end
-
-                string replace --regex -- $HOME \~ $commit_plugins >$fish_plugins
-            else
-                set --erase _fisher_plugins
-                command rm -f $fish_plugins
-            end
-
-            set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins)
-
-            test "$total" != "0 0 0" && echo (string join ", " (
-                test $total[1] = 0 || echo "Installed $total[1]") (
-                test $total[2] = 0 || echo "Updated $total[2]") (
-                test $total[3] = 0 || echo "Removed $total[3]")
-            ) plugin/s
-        case \*
-            echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1
-    end
-end
-
-if ! set --query _fisher_upgraded_to_4_4
-    set --universal _fisher_upgraded_to_4_4
-    if functions --query _fisher_list
-        set --query XDG_DATA_HOME[1] || set --local XDG_DATA_HOME ~/.local/share
-        command rm -rf $XDG_DATA_HOME/fisher
-        functions --erase _fisher_{list,plugin_parse}
-        fisher update >/dev/null 2>/dev/null
-    else
-        for var in (set --names | string match --entire --regex '^_fisher_.+_files$')
-            set $var (string replace -- ~ \~ $$var)
-        end
-        functions --erase _fisher_fish_postexec
-    end
-end
diff --git a/functions/gi.fish b/functions/gi.fish
index 559b28c..3c5a663 100644
--- a/functions/gi.fish
+++ b/functions/gi.fish
@@ -5,7 +5,7 @@
 #   04-git-and-version-control
 #
 # DEPENDENCIES
-#   curl, md5sum, md5
+#   curl, md5sum, md5, gitignore-scrub
 #
 # CLASSIFICATION
 #   self-limiting(grep,cat), network, blocking-prompt
@@ -167,6 +167,7 @@ function gi --description 'Generate .gitignore files using the gitignore.io API'
         else
             echo (set_color brblack)"No patterns selected. Skipping API fetch."(set_color normal)
         end
+        test $needs_git -eq 1; and gitignore-scrub
         return 0
     end
 
@@ -196,6 +197,8 @@ function gi --description 'Generate .gitignore files using the gitignore.io API'
             end
         end
     end
+
+    test $needs_git -eq 1; and gitignore-scrub
 end
 
 # SYNOPSIS
diff --git a/functions/gitignore-scrub.fish b/functions/gitignore-scrub.fish
new file mode 100644
index 0000000..aee3273
--- /dev/null
+++ b/functions/gitignore-scrub.fish
@@ -0,0 +1,145 @@
+# Copyright (C) 2026 Rootiest
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# CATEGORY
+#   04-git-and-version-control
+#
+# DEPENDENCIES
+#   git
+#
+# CLASSIFICATION
+#   blocking-prompt
+#
+# SYNOPSIS
+#   gitignore-scrub [-h] [-r] [-w | -f | -i]
+#
+# DESCRIPTION
+#   Finds files that are tracked by git but now match a .gitignore pattern
+#   (git ls-files -ci --exclude-standard) and offers to untrack them. In the
+#   default interactive mode, prompts once for all matches and runs
+#   git rm --cached on confirmation; a decline is remembered per-path in the
+#   repo's local git config (gitignore-scrub.skip) so the same file is not
+#   asked about again. -w/--warn is read-only: prints a Warning line per
+#   match and makes no changes, meant for non-interactive callers such as a
+#   git hook. -f/--force skips the prompt and untracks every match
+#   immediately. -i/--individual prompts once per file instead of once for
+#   the whole group. -w, -f, and -i are mutually exclusive. -r/--reset
+#   clears the repo's skip list first (combinable with any mode), so
+#   previously declined files are reconsidered. Silently does nothing on a
+#   repo with more tracked files than $GITIGNORE_SCRUB_LIMIT (default
+#   5000), to avoid adding latency to huge repos.
+#
+# ARGUMENTS
+#   -h, --help        Show help message
+#   -r, --reset       Clear the remembered skip list before checking
+#   -w, --warn        Read-only: print warnings instead of prompting, make no changes
+#   -f, --force       Untrack every match immediately, no prompt
+#   -i, --individual  Prompt once per file instead of once for the whole group
+#
+# EXIT STATUS
+#   0  Clean, or a prompt/force run was handled
+#   1  Not a git repository, or (-w only) unconfirmed matches were found
+#
+# EXAMPLE
+#   gitignore-scrub
+#   gitignore-scrub --warn
+#   gitignore-scrub --force
+#   gitignore-scrub --individual
+#   gitignore-scrub --reset
+function gitignore-scrub --description 'Find and optionally untrack files newly matched by .gitignore'
+    argparse --exclusive w,f,i h/help r/reset w/warn f/force i/individual -- $argv
+    or return 1
+
+    if set -q _flag_help
+        __fish_palette
+        echo "$c_head""Usage:$c_reset $c_cmd""gitignore-scrub$c_reset $c_arg""[FLAGS]$c_reset"
+        echo ""
+        echo "$c_head""Flags:$c_reset"
+        echo "  $c_flag-h, --help$c_reset       Show this help message"
+        echo "  $c_flag-r, --reset$c_reset      Clear the remembered skip list before checking"
+        echo "  $c_flag-w, --warn$c_reset       Read-only: print warnings instead of prompting"
+        echo "  $c_flag-f, --force$c_reset      Untrack every match immediately, no prompt"
+        echo "  $c_flag-i, --individual$c_reset Prompt once per file instead of once for the group"
+        echo ""
+        echo "$c_head""Examples:$c_reset"
+        echo "  $c_cmd""gitignore-scrub$c_reset             $c_dim""# Interactive: prompt to untrack matches$c_reset"
+        echo "  $c_cmd""gitignore-scrub --warn$c_reset      $c_dim""# Read-only: for use in a git hook$c_reset"
+        echo "  $c_cmd""gitignore-scrub --force$c_reset     $c_dim""# Untrack every match, no prompt$c_reset"
+        echo "  $c_cmd""gitignore-scrub --individual$c_reset $c_dim""# Prompt per file instead of as a group$c_reset"
+        echo "  $c_cmd""gitignore-scrub --reset$c_reset     $c_dim""# Reconsider previously declined files$c_reset"
+        return 0
+    end
+
+    if not git rev-parse --is-inside-work-tree >/dev/null 2>&1
+        set_color red --bold
+        echo "Error:" (set_color normal)"Not a git repository (or any parent directories)" >&2
+        return 1
+    end
+
+    set -l limit 5000
+    set -q GITIGNORE_SCRUB_LIMIT; and set limit $GITIGNORE_SCRUB_LIMIT
+
+    set -l tracked_count (git ls-files | count)
+    if test $tracked_count -gt $limit
+        return 0
+    end
+
+    set -l offenders (git ls-files -ci --exclude-standard)
+    set -q offenders[1]; or return 0
+
+    if set -q _flag_reset
+        git config --local --remove-section gitignore-scrub 2>/dev/null
+    end
+
+    set -l skip_list (git config --local --get-all gitignore-scrub.skip 2>/dev/null)
+    set -l pending
+    for f in $offenders
+        contains -- "$f" $skip_list; or set -a pending $f
+    end
+    set -q pending[1]; or return 0
+
+    if set -q _flag_warn
+        for f in $pending
+            set_color yellow --bold
+            echo -n "Warning: "
+            set_color normal
+            echo "$f is tracked but ignored"
+        end
+        return 1
+    end
+
+    if set -q _flag_force
+        git rm --cached -- $pending >/dev/null
+        echo (set_color green)"✔"(set_color normal)" Untracked "(count $pending)" file(s)."
+        return 0
+    end
+
+    if set -q _flag_individual
+        for f in $pending
+            read -P "Remove '$f' from git tracking? [y/N] " confirm
+            if string match -qir '^y' -- "$confirm"
+                git rm --cached -- "$f" >/dev/null
+                echo (set_color green)"✔"(set_color normal)" Untracked $f"
+            else
+                git config --local --add gitignore-scrub.skip "$f"
+            end
+        end
+        return 0
+    end
+
+    set_color yellow
+    echo (count $pending)" tracked file(s) now match .gitignore:"(set_color normal)
+    for f in $pending
+        echo "  $f"
+    end
+    read -P "Remove from git tracking? [y/N] " confirm
+    if string match -qir '^y' -- "$confirm"
+        git rm --cached -- $pending >/dev/null
+        echo (set_color green)"✔"(set_color normal)" Untracked "(count $pending)" file(s)."
+    else
+        for f in $pending
+            git config --local --add gitignore-scrub.skip "$f"
+        end
+        echo (set_color brblack)"Remembered — won't ask again for these files."(set_color normal)
+    end
+end