Source the nix profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc.base.symlink