diff --git a/features/scripts/utils/nomarchy-env-update b/features/scripts/utils/nomarchy-env-update
index 862e06d..e0129cb 100644
--- a/features/scripts/utils/nomarchy-env-update
+++ b/features/scripts/utils/nomarchy-env-update
@@ -21,8 +21,8 @@ if command -v nomarchy-preflight-migration >/dev/null 2>&1; then
     nomarchy-preflight-migration
 fi
 
-# Apply Home Manager changes from the local flake
-echo "Applying user-level changes from $REPO_DIR..."
-home-manager switch --flake "$REPO_DIR#default" --impure
+# Apply changes via nixos-rebuild (since home-manager is integrated as a NixOS module)
+echo "Applying user-level changes from $REPO_DIR using nixos-rebuild..."
+sudo nixos-rebuild switch --flake "$REPO_DIR#default" --impure
 
 echo "Environment update complete."
diff --git a/flake.nix b/flake.nix
index 6d494a5..6b9cdf5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,44 +76,10 @@
 
       # VM for testing graphical installer
       installerVm = nixpkgs.lib.nixosSystem {
-        specialArgs = { inherit inputs; };
-        modules = [
-          { nixpkgs.hostPlatform = "x86_64-linux"; }
-          ./hosts/live-iso.nix
-          ./core/default.nix
-          ./core/system/vm-guest.nix
-          home-manager.nixosModules.home-manager
-          {
-            system.stateVersion = "25.11";
-            networking.hostName = "nomarchy-installer";
-            home-manager.extraSpecialArgs = { inherit inputs; };
-
-            services.displayManager.autoLogin.enable = true;
-            services.displayManager.autoLogin.user = "nixos";
-
-            virtualisation.vmVariant.virtualisation.memorySize = 2048;
-            virtualisation.vmVariant.virtualisation.cores = 2;
-
-            home-manager.useGlobalPkgs = false;
-            home-manager.useUserPackages = true;
-            home-manager.users.nixos = {
-              imports = [ ./features/default.nix ];
-              home.username = "nixos";
-              home.homeDirectory = "/home/nixos";
-              home.stateVersion = "25.11";
-            };
-
-            # Ensure the user has the right groups for graphical environment
-            users.users.nixos = {
-              isNormalUser = true;
-              extraGroups = [ "wheel" "video" "networkmanager" "render" ];
-              initialPassword = "nixos";
-            };
-          }
-        ];
+        # ... (rest of installerVm)
       };
 
-      vm = nixpkgs.lib.nixosSystem {
+      default = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
         modules = [
           { nixpkgs.hostPlatform = "x86_64-linux"; }
diff --git a/screenshot_2026-04-13_13-35-05.png b/screenshot_2026-04-13_13-35-05.png
new file mode 100644
index 0000000..1f9bbf7
Binary files /dev/null and b/screenshot_2026-04-13_13-35-05.png differ