Fix up xinitrc and fish config