Add $EDITOR to fish config
Reorganize fish config