Update fish_prompt to match zsh_prompt
Update fish_right_prompt to match zsh_right_prompt