Merged with my workstation configs