diff --git a/Makefile b/Makefile index e449618..0856e62 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ result: etc/nixos/configuration.nix nix-build '' -A vm -k -I nixos-config=$^ -tlater.net.qcow2: +tlaternet.qcow2: nix-shell -p qemu --run 'qemu-img create -f qcow2 $@ 10G' -run: result tlater.net.qcow2 - QEMU_OPTS="-m 4096 -nographic" QEMU_NET_OPTS="hostfwd=tcp::2222-:2222,hostfwd=tcp::8000-:80" ./result/bin/run-tlater.net-vm +run: result tlaternet.qcow2 + QEMU_OPTS="-m 4096 -nographic" QEMU_NET_OPTS="hostfwd=tcp::2222-:2222,hostfwd=tcp::8000-:80" ./result/bin/run-tlaternet-vm format: $(wildcard etc/nixos/**/*.nix) nix-shell -p nixpkgs-fmt --run 'nixpkgs-fmt $^' diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 88e3fd7..a26f5de 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -17,7 +17,7 @@ ]; networking = { - hostName = "tlater.net"; + hostName = "tlaternet"; # useDHCP is deprecated useDHCP = false;