diff --git a/config/ai.nix b/config/ai.nix
index 9cd2f7a..30e6506 100644
--- a/config/ai.nix
+++ b/config/ai.nix
@@ -79,11 +79,4 @@
       };
     };
   };
-
-  # System Packeges Related to AI
-  environment.systemPackages = with pkgs; [
-    opencode
-    openclaw
-    claude-code
-  ];
 }
diff --git a/flake.nix b/flake.nix
index 0ef3740..48e3697 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,14 +79,19 @@
           ./home/modules/hacking.nix
         ];
 
+        mindforge = mkHomeUnstableConfig "mindforge" [
+          ./home/headless-nixos.nix
+          ./home/modules/development.nix
+        ];
+
         mnemosyne = mkHomeConfig "mnemosyne" [
           ./home/headless-nixos.nix
           ./home/modules/development.nix
         ];
 
+
         media = mkHomeConfig "media" [ ./home/headless-nixos.nix ];
         logging = mkHomeConfig "logging" [ ./home/headless-nixos.nix ];
-        mindforge = mkHomeConfig "mindforge" [ ./home/headless-nixos.nix ];
       };
     };
 }
diff --git a/home/modules/development.nix b/home/modules/development.nix
index c71e2ce..7efdcc2 100644
--- a/home/modules/development.nix
+++ b/home/modules/development.nix
@@ -16,6 +16,10 @@
     zig
     zls
 
+    # AI tools
+    opencode
+    claude-code
+
     # Other
     python3
     ansible