[Fish] Bring config.fish up to speed with bashrc