diff --git a/flake.nix b/flake.nix
index 15f3842a..3b94f0f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,6 @@
     ...
   } @ inputs: {
     nixosConfigurations = let
-      topLevel = ./.;
       userConfig = {
         isNormalUser = true;
         description = "Evie Litherland-Smith";
@@ -33,7 +32,7 @@
         shell = pkgs.fish;
         openssh.authorizedKeys.keys = import ./auth/authorized_keys.nix;
       };
-      specialArgs = {inherit inputs topLevel userConfig;};
+      specialArgs = {inherit inputs userConfig;};
       waybar-experimental-overlay = final: prev: {
         waybar = prev.waybar.overrideAttrs (oldAttrs: {
           mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
diff --git a/hosts/Legion/home.nix b/hosts/Legion/home.nix
index e5b5acba..ddf8ef40 100644
--- a/hosts/Legion/home.nix
+++ b/hosts/Legion/home.nix
@@ -12,5 +12,8 @@ in {
     inherit username homeDirectory;
     stateVersion = "22.11";
   };
-  programs.neovim.package = pkgs.neovim-nightly;
+  programs = {
+    home-manager.enable = true;
+    neovim.package = pkgs.neovim-nightly;
+  };
 }
diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix
index c280277f..ef401d8e 100644
--- a/hosts/Ronin/home.nix
+++ b/hosts/Ronin/home.nix
@@ -21,7 +21,10 @@ in {
       zoom-us
     ];
   };
-  programs.neovim.package = pkgs.neovim-nightly;
+  programs = {
+    home-manager.enable = true;
+    neovim.package = pkgs.neovim-nightly;
+  };
   xdg.configFile."hypr/display.conf".text = ''
     monitor=desc:Iiyama North America PLB2403WS 0574281251316,1920x1200@60,0x185,1
     monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,1920x1080@60,1920x0,1,transform,1
diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix
index f82e043f..155a6a43 100644
--- a/hosts/Vanguard/home.nix
+++ b/hosts/Vanguard/home.nix
@@ -13,7 +13,10 @@ in {
     inherit username homeDirectory;
     stateVersion = "22.11";
   };
-  programs.neovim.package = pkgs.neovim-nightly;
+  programs = {
+    home-manager.enable = true;
+    neovim.package = pkgs.neovim-nightly;
+  };
   xdg.configFile."hypr/display.conf".text = ''
     monitor=DP-1,highrr,auto,1
     monitor=DP-2,highrr,auto,1