diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..888da14
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,47 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1745802917,
+        "narHash": "sha256-hI7BmIwKagCJlQdVgwxs1sLY2d8i97srcqT+OrhBDao=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "9c46dc881c2afcb50ac9ae9f1c36b2a4ebba3c8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1745804731,
+        "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=",
+        "owner": "NixOs",
+        "repo": "nixpkgs",
+        "rev": "29335f23bea5e34228349ea739f31ee79e267b88",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOs",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 347e8ea..f3a8d35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,24 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOs/nixpkgs";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs =
-    { nixpkgs, home-manager, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, ... } @ inputs: 
     let 
       system = "x86_64-linux";
-    in
-    {
+    in {
+    nixosConfigurations = {
       nixos-vm = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = { inherit inputs; };
+
         modules = [
-          ./modules
+          import ./machines/nixos-vm/configuration.nix
+        ];
+      };
+    };
+
+    };
 }
diff --git a/modules/configuration.nix b/machines/nixos-vm/configuration.nix
similarity index 100%
rename from modules/configuration.nix
rename to machines/nixos-vm/configuration.nix
diff --git a/modules/hardware-configuration.nix b/machines/nixos-vm/hardware-configuration.nix
similarity index 100%
rename from modules/hardware-configuration.nix
rename to machines/nixos-vm/hardware-configuration.nix