diff --git a/flake.nix b/flake.nix
index 93e418f..f7ed679 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,27 +61,31 @@
             disko.nixosModules.disko
             sops-nix.nixosModules.sops
             impermanence.nixosModules.impermanence
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users.ppetru = {
-                  imports = [
-                    (inputs.impermanence + "/home-manager.nix")
-                    inputs.nix-index-database.hmModules.nix-index
-                    inputs.nixvim.homeManagerModules.nixvim
-                    ./home
-                  ];
-                };
-              };
-            }
           ] ++ modules;
           specialArgs = {
             inherit inputs self;
           };
         };
 
+      mkHMNixos =
+        system: modules:
+        mkNixos system ([
+          home-manager.nixosModules.home-manager
+          {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.ppetru = {
+                imports = [
+                  (inputs.impermanence + "/home-manager.nix")
+                  inputs.nix-index-database.hmModules.nix-index
+                  inputs.nixvim.homeManagerModules.nixvim
+                  ./home
+                ];
+              };
+            };
+          }] ++ modules);
+
       pkgsFor =
         system:
         import nixpkgs {
@@ -107,12 +111,12 @@
     in
     {
       nixosConfigurations = {
-        c1 = mkNixos "x86_64-linux" [ ./hosts/c1 ];
-        c2 = mkNixos "x86_64-linux" [ ./hosts/c2 ];
-        c3 = mkNixos "x86_64-linux" [ ./hosts/c3 ];
-        alo-cloud-1 = mkNixos "aarch64-linux" [ ./hosts/alo-cloud-1 ];
-        zippy = mkNixos "x86_64-linux" [ ./hosts/zippy ];
-        chilly = mkNixos "x86_64-linux" [ ./hosts/chilly ];
+        c1 = mkHMNixos "x86_64-linux" [ ./hosts/c1 ];
+        c2 = mkHMNixos "x86_64-linux" [ ./hosts/c2 ];
+        c3 = mkHMNixos "x86_64-linux" [ ./hosts/c3 ];
+        alo-cloud-1 = mkHMNixos "aarch64-linux" [ ./hosts/alo-cloud-1 ];
+        zippy = mkHMNixos "x86_64-linux" [ ./hosts/zippy ];
+        chilly = mkHMNixos "x86_64-linux" [ ./hosts/chilly ];
       };
 
       deploy = {