rearranged settings into use-package