diff --git a/config/modules/home-manager.nix b/config/modules/home-manager.nix
new file mode 100644
index 0000000..eb1ce14
--- /dev/null
+++ b/config/modules/home-manager.nix
@@ -0,0 +1,9 @@
+{ system, inputs }:
+inputs.home-manager.nixosModules.home-manager
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.backupFileExtension = "backup";
+  home-manager.users.alex = import ./config/users/alex;
+  home-manager.extraSpecialArgs = { ff = inputs.firefox-addons.packages.${system}; };
+}
diff --git a/flake.nix b/flake.nix
index fb8292b..a96641b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
               home-manager.backupFileExtension = "backup";
-              home-manager.users.alex = import ./config/users/alex/default.nix;
+              home-manager.users.alex = import ./config/users/alex;
               # Optionally, use home-manager.extraSpecialArgs to pass
               # arguments to home.nix
             }
@@ -44,14 +44,15 @@
           system = "x86_64-linux";
           modules = [
             ./config/systems/thelio76
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.backupFileExtension = "backup";
-              home-manager.users.alex = import ./config/users/alex/default.nix;
-              home-manager.extraSpecialArgs = { ff = firefox-addons.packages.${system}; };
-            }
+            ./config/modules/home-manager.nix { inherit system inputs }
+            # home-manager.nixosModules.home-manager
+            # {
+            #   home-manager.useGlobalPkgs = true;
+            #   home-manager.useUserPackages = true;
+            #   home-manager.backupFileExtension = "backup";
+            #   home-manager.users.alex = import ./config/users/alex;
+            #   home-manager.extraSpecialArgs = { ff = firefox-addons.packages.${system}; };
+            # }
           ];
         };