diff --git a/flake.lock b/flake.lock
index 888da14..1dc6bd0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,15 +22,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745804731,
-        "narHash": "sha256-v/sK3AS0QKu/Tu5sHIfddiEHCvrbNYPv8X10Fpux68g=",
-        "owner": "NixOs",
+        "lastModified": 1745930157,
+        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "29335f23bea5e34228349ea739f31ee79e267b88",
+        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
         "type": "github"
       },
       "original": {
-        "owner": "NixOs",
+        "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6088f89..fc815a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOs/nixpkgs";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
@@ -12,10 +12,18 @@
     nixosConfigurations = {
       nixos-vm2 = nixpkgs.lib.nixosSystem {
         inherit system;
-        specialArgs = { inherit inputs; };
 
         modules = [
           ./hosts/nixos-vm2/configuration.nix
+
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.users.poslop = import ./modules/home;
+
+          }
         ];
       };
     };
diff --git a/hosts/nixos-vm2/configuration.nix b/hosts/nixos-vm2/configuration.nix
index c3454c6..5abff8f 100644
--- a/hosts/nixos-vm2/configuration.nix
+++ b/hosts/nixos-vm2/configuration.nix
@@ -7,8 +7,8 @@
 
   imports =
     [
-      ../../modules
       ./hardware-configuration.nix
+      ../../modules/core
     ];
   
   programs.hyprland.enable =  true;
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 83b6cbe..b78ab5b 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,5 +1,7 @@
 {
   imports = [
-    ./packages.nix
+    #./packages.nix
+    ./ssh.nix
   ];
 }
+
diff --git a/modules/core/ssh.nix b/modules/core/ssh.nix
new file mode 100644
index 0000000..8254dbd
--- /dev/null
+++ b/modules/core/ssh.nix
@@ -0,0 +1,9 @@
+{
+  pkgs,
+  ...
+}:
+{
+  services.openssh = {
+    enable = true;
+  };
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 2efe6c6..c6c4f97 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,6 +1,9 @@
 {
   imports = [
     ./hyprland
-    ./ssh.nix
+    ./git.nix
+    ./home-manager.nix
+    ./packages.nix
+    ./user.nix
   ];
 }
diff --git a/modules/home/git.nix b/modules/home/git.nix
new file mode 100644
index 0000000..c3736fa
--- /dev/null
+++ b/modules/home/git.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+{
+    programs.git = {
+    enable = true;
+    userName = "poslop";
+    userEmail = "poslop@archfox.org";
+  };
+}
diff --git a/modules/home/home-manager.nix b/modules/home/home-manager.nix
new file mode 100644
index 0000000..213b4a4
--- /dev/null
+++ b/modules/home/home-manager.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.home-manager.enable = true;
+}
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
new file mode 100644
index 0000000..cb4bdea
--- /dev/null
+++ b/modules/home/packages.nix
@@ -0,0 +1,14 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    neofetch
+    btop
+    zsh
+    wl-clipboard
+    kitty
+    vim
+    wget
+    curl
+  ];
+}
diff --git a/modules/home/user.nix b/modules/home/user.nix
new file mode 100644
index 0000000..59fd19e
--- /dev/null
+++ b/modules/home/user.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  home.username = "poslop";
+  home.homeDirectory = "/home/poslop";
+}