slight reorg to support gitlab tarball

Makefile

 default:
 
+qemu:
+	nixos-rebuild -I nixos-config=qemu.nix build-vm
+
+clean:
+	$(RM) *.qcow2
+
+reallyclean: clean
+	$(RM) result
+
 push:
 	$(MAKE) -C vm/www push
 	(cd vm/fonts; rm -f result; nix-build --no-out-link | cachix push liucs)