diff --git a/flake.nix b/flake.nix
index a3afaab33..486562b4d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,14 +28,17 @@
       lib = {
         hm = import ./modules/lib { lib = nixpkgs.lib; };
         homeManagerConfiguration = { configuration, system, homeDirectory
-          , username, extraSpecialArgs ? { }
+          , username, extraModules ? [ ], extraSpecialArgs ? { }
           , pkgs ? builtins.getAttr system nixpkgs.outputs.legacyPackages
-          , check ? true }@args:
+          , check ? true, stateVersion ? "20.09" }@args:
+          assert nixpkgs.lib.versionAtLeast stateVersion "20.09";
+
           import ./modules {
             inherit pkgs check extraSpecialArgs;
             configuration = { ... }: {
-              imports = [ configuration ];
-              home = { inherit homeDirectory username; };
+              imports = [ configuration ] ++ extraModules;
+              home = { inherit homeDirectory stateVersion username; };
+              nixpkgs = { inherit (pkgs) config overlays; };
             };
           };
       };