update
Merge branch 'master' of github.com:fignuts/nix-stuff

Conflicts:
	config.nix