added npm, updated fish config