diff --git a/bootstrap.nix b/bootstrap.nix
index f9219eb..6f35be0 100644
--- a/bootstrap.nix
+++ b/bootstrap.nix
@@ -5,6 +5,11 @@
     [
       ./hardware-configuration.nix
     ];
+  
+  environment.systemPackages = with pkgs; [
+    git
+    neovim
+  ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
diff --git a/boxes/virtbox.nix b/boxes/virtbox.nix
index 5e7f5d0..2efc0f2 100644
--- a/boxes/virtbox.nix
+++ b/boxes/virtbox.nix
@@ -5,4 +5,6 @@
   boot.loader.grub.device = "/dev/vda";
 
   networking.hostName = "virtbox";
+
+  system.stateVersion = "23.11";
 }
diff --git a/common/desktop.nix b/common/desktop.nix
index 3ae124f..4d65e6b 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -178,7 +178,7 @@ in {
     fi
   '';
 
-  home-manager.users.usr = {
+  home-manager.nixosModules.home-manager.users.usr = {
     home.stateVersion = "23.05";
 
     programs.neovim = {
diff --git a/home.nix b/home.nix
new file mode 100644
index 0000000..42f9299
--- /dev/null
+++ b/home.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }:
+
+{
+  home.username = "usr";
+  home.homeDirectory = lib.mkForce "/home/usr";
+
+  home.packages = [
+    pkgs.htop
+  ];
+  programs.neovim = {
+    enable = true;
+  };
+
+  home.stateVersion = "23.11";
+  programs.home-manager.enable = true;
+}