Nix 1.6
Merge branch 'master' of github.com:zefhemel/nixos-mac-setup

Conflicts:
	install-nix.sh