diff --git a/nvim/default.nix b/nvim/default.nix
index c457931..0cefbb5 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -1,5 +1,14 @@
-args: {
+{
+  lib,
+  pkgs,
+  config,
+  helpers,
+  ...
+}: let
+  # Force inputs to be included
+  nixvim = import ./nixvim.nix {inherit lib pkgs config helpers;};
+in {
   imports = [./options.nix];
 
-  config.programs.nixvim = (import ./nixvim.nix args).config;
+  config.programs.nixvim = nixvim.config;
 }