diff --git a/flake.nix b/flake.nix
index c7ec8e6..f5352be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,44 +58,24 @@
       };
     in
     {
+      nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # <https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md>
       nixosConfigurations = {
         vm = nixpkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
-            nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
-            disko.nixosModules.disko
-            ./hosts/vm/configuration.nix
-            {
-              environment.systemPackages = [ nvim.packages.x86_64-linux.nvim ];
-            }
-          ];
+          modules = [ ./hosts/vm/configuration.nix ];
+          specialArgs = { inherit inputs; };
         };
         astyanax = nixpkgs.lib.nixosSystem {
-          inherit system;
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
-            disko.nixosModules.disko
-            ./hosts/astyanax/configuration.nix
-            {
-              environment.systemPackages = [ nvim.packages.x86_64-linux.nvim ];
-            }
-          ];
+          modules = [ ./hosts/astyanax/configuration.nix ];
+          specialArgs = { inherit inputs; };
         };
       };
       homeConfigurations = {
         work = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
+          modules = [ ./home/hosts/work ];
           extraSpecialArgs = {
             inherit inputs;
           };
-          modules = [
-            ./home/hosts/work
-          ];
         };
       };
     };
diff --git a/hosts/astyanax/configuration.nix b/hosts/astyanax/configuration.nix
index 5ca06ef..5c2ef27 100644
--- a/hosts/astyanax/configuration.nix
+++ b/hosts/astyanax/configuration.nix
@@ -9,6 +9,7 @@
   system.stateVersion = "25.05";
 
   imports = [
+    inputs.disko.nixosModules.disko
     inputs.home-manager.nixosModules.default
     ./hard.nix
     ../../modules/bootloader.nix
@@ -25,6 +26,8 @@
     ../../modules/ssh/hardened-openssh.nix
   ];
 
+  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
+
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"
diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
index c9f241d..2e433d2 100644
--- a/hosts/vm/configuration.nix
+++ b/hosts/vm/configuration.nix
@@ -1,9 +1,16 @@
-{ inputs, ... }:
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
 
 {
   system.stateVersion = "25.05";
 
   imports = [
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
+    inputs.disko.nixosModules.disko
     inputs.home-manager.nixosModules.default
     ./hard.nix
     ./disk.nix
@@ -19,6 +26,8 @@
     ../../modules/ssh/hardened-openssh.nix
   ];
 
+  environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
+
   nix.settings.experimental-features = [
     "nix-command"
     "flakes"