diff --git a/modules/ai-tools.nix b/modules/ai-tools.nix
index 4be6cd7..e4e23ad 100644
--- a/modules/ai-tools.nix
+++ b/modules/ai-tools.nix
@@ -11,7 +11,7 @@
 				model = "anthropic/claude-opus-4-6";
 				small_model = "anthropic/claude-haiku-4-5";
 				theme = "catppuccin";
-				plugin = ["oh-my-openagent@latest" "opencode-anthropic-auth@latest"];
+				plugin = ["opencode-anthropic-auth@latest"];
 				permission = {
 					read = {
 						"*" = "allow";
@@ -46,12 +46,22 @@
 						type = "local";
 						command = ["node" "/home/cschmatzler/.bun/bin/opensrc-mcp"];
 					};
+					context7 = {
+						enabled = true;
+						type = "remote";
+						url = "https://mcp.context7.com/mcp";
+					};
+					grep_app = {
+						enabled = true;
+						type = "remote";
+						url = "https://mcp.grep.app";
+					};
 				};
 			};
 		};
 
 		home.shellAliases = {
-			noc = "nono run -s --allow-cwd --profile opencode --network-profile developer --allow ~/.bun --allow ~/.local/share/opensrc --allow ~/.claude --proxy-allow models.dev --proxy-allow mcp.grep.app --proxy-allow mcp.context7.com --proxy-allow mcp.exa.ai -- opencode";
+			noc = "nono run -s --allow-cwd --profile opencode --network-profile developer --allow ~/.bun --allow ~/.local/share/opensrc --proxy-allow models.dev --proxy-allow mcp.grep.app --proxy-allow mcp.context7.com --proxy-allow mcp.exa.ai -- opencode";
 		};
 
 		home.packages = [
@@ -81,56 +91,6 @@
 				recursive = true;
 			};
 			"opencode/AGENTS.md".source = ./_opencode/AGENTS.md;
-			"opencode/oh-my-opencode.json".text =
-				builtins.toJSON {
-					"$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
-					disabled_skills = ["playwright" "dev-browser" "git-master"];
-					disabled_hooks = ["keyword-detector" "todo-continuation-enforcer"];
-					git_master = {
-						commit_footer = false;
-						include_co_authored_by = false;
-					};
-					runtime_fallback = true;
-					agents = {
-						explore = {
-							model = "opencode-go/minimax-m2.5";
-							fallback_models = ["anthropic/claude-haiku-4-5"];
-						};
-						librarian = {
-							model = "opencode-go/minimax-m2.5";
-							fallback_models = ["opencode-go/glm-5"];
-						};
-						sisyphus = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-					};
-					categories = {
-						"visual-engineering" = {
-							fallback_models = ["opencode-go/glm-5" "opencode-go/kimi-k2.5"];
-						};
-						ultrabrain = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						deep = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						artistry = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						quick = {
-							fallback_models = ["opencode-go/minimax-m2.5"];
-						};
-						"unspecified-low" = {
-							fallback_models = ["opencode-go/minimax-m2.5" "opencode-go/kimi-k2.5"];
-						};
-						"unspecified-high" = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/glm-5"];
-						};
-						writing = {
-							fallback_models = ["opencode-go/kimi-k2.5" "opencode-go/minimax-m2.5"];
-						};
-					};
-				};
 		};
 	};
 }
diff --git a/modules/darwin.nix b/modules/darwin.nix
index 73422d9..e9e0ecd 100644
--- a/modules/darwin.nix
+++ b/modules/darwin.nix
@@ -96,7 +96,10 @@
 					allowApplePersonalizedAdvertising = false;
 				};
 				"com.apple.Spotlight" = {
-					MenuItemHidden = true;
+					"NSStatusItem Visible Item-0" = false;
+				};
+				"com.apple.TextInputMenu" = {
+					visible = false;
 				};
 			};
 		};
diff --git a/modules/overlays.nix b/modules/overlays.nix
index 8fddede..ed6a841 100644
--- a/modules/overlays.nix
+++ b/modules/overlays.nix
@@ -6,9 +6,10 @@
 			})
 		# ast-grep (test_scan_invalid_rule_id fails on darwin in sandbox)
 		(final: prev: {
-				ast-grep = prev.ast-grep.overrideAttrs (old: {
-					doCheck = false;
-				});
+				ast-grep =
+					prev.ast-grep.overrideAttrs (old: {
+							doCheck = false;
+						});
 			})
 		# jj-ryu
 		(final: prev: let