diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 4e7221a..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "hm-config"]
-	path = hm-config
-	url = https://github.com/EniumRaphael/home-manager
-	branch = full-nix-config
diff --git a/flake.nix b/flake.nix
index a29ca36..dd4f34c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,9 @@
 		nixosConfigurations."nixos-fix" = nixpkgs.lib.nixosSystem {
 			system = "x86_64-linux";
 			modules = [
+				home-manager.nixosModules.home-manager
 				./hosts/fix/configuration.nix
+				./hm-config/host/fix.nix
 			];
 		};
 		nixosConfigurations."nixos-asahi" = nixpkgs.lib.nixosSystem {
diff --git a/hm-config b/hm-config
new file mode 160000
index 0000000..e85d7b0
--- /dev/null
+++ b/hm-config
@@ -0,0 +1 @@
+Subproject commit e85d7b098d72ef531fb36d34fd828c617b1ab610