fish: rearrange config