diff --git a/flake.nix b/flake.nix
index 63e51c0..554a9f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,29 +17,38 @@ outputs = { self,
     username = "kiana";
     moduleArgs = inputs // { inherit system username; };
     lib = nixpkgs.lib;
-    
-    modulesFor = system:
-      [
-        { _module.args = moduleArgs; }
-        ./common/config
-        ./${system}/config
-        home-manager.nixosModules.home-manager
-        { home-manager = {
-          useGlobalPkgs = true;
-          users.${username} = import ./${system}/home-manager;
-          extraSpecialArgs = moduleArgs;
-        }; }
-      ];
   in {
     nixosConfigurations = {
       "kiana-desktop" = lib.makeOverridable lib.nixosSystem {
         inherit system;
-        modules = modulesFor "desktop"; 
+        modules = [
+          { _module.args = moduleArgs; }
+          ./common/config
+          ./desktop/config
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.${username} = import ./desktop/home-manager;
+            home-manager.extraSpecialArgs = moduleArgs;
+          }
+        ]; 
       };
 
       "kiana-laptop" = lib.makeOverridable lib.nixosSystem {
         inherit system;
-        modules = modulesFor "laptop";
+        modules = [
+          { _module.args = moduleArgs; }
+          ./common/config
+          ./laptop/config
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.${username} = import ./laptop/home-manager;
+            home-manager.extraSpecialArgs = moduleArgs;
+          }
+        ];
       };
     };
   };