vimrc and fish updated