diff --git a/Makefile b/Makefile
index 7901026c..b4f814be 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,15 @@ SSH_TARGETS := $(SSH_ITEMS:ssh/%=$(SSH_DIR)/%)
 
 .PHONY: default all clean link home nixos install
 
-default: install home
+default: install
 
-all: default install home
+all: nixos
 
 clean:
 	rm $(SSH_DIR)/config.d
 	rm $(HOME)/.inputrc
 	rm -rf $(HOME)/.local/share/nvim
+	sudo rm /etc/nixos/$(HOSTNAME).nix
 
 $(CONFIG_DIR) $(SSH_DIR) $(CONFIG_DIR)/home-manager:
 	mkdir -p $@
@@ -40,7 +41,7 @@ $(CONFIG_DIR)/home-manager/home.nix: $(CONFIG_DIR)/home-manager
 
 nixos: /etc/nixos/$(HOSTNAME)-$(USER).nix
 
-/etc/nixos/$(HOSTNAME)-$(USER).nix: /nix
+/etc/nixos/$(HOSTNAME).nix: /nix
 	[ -f $(NIXOS_CONFIG) ] || touch $(NIXOS_CONFIG)
 	sudo ln -s $(NIXOS_CONFIG) $@
 
diff --git a/nixos/H0615-elitherl.nix b/nixos/H0615.nix
similarity index 100%
rename from nixos/H0615-elitherl.nix
rename to nixos/H0615.nix
diff --git a/nixos/J0162-elitherl.nix b/nixos/J0162.nix
similarity index 100%
rename from nixos/J0162-elitherl.nix
rename to nixos/J0162.nix
diff --git a/nixos/Vanguard-xenia.nix b/nixos/Vanguard.nix
similarity index 100%
rename from nixos/Vanguard-xenia.nix
rename to nixos/Vanguard.nix