diff --git a/home/modules/cli/gemini.nix b/home/modules/cli/gemini.nix
deleted file mode 100644
index 4853f3f..0000000
--- a/home/modules/cli/gemini.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-  # HACK: Gemini CLI did not read settings.json or .env, so export vars in a wrapper script
-  wrapped-github-mcp-server = pkgs.writeShellScriptBin "github-mcp-server" ''
-    export GITHUB_PERSONAL_ACCESS_TOKEN=$(cat ${config.sops.secrets.github_token.path})
-    exec ${pkgs.github-mcp-server}/bin/github-mcp-server "$@"
-  '';
-in
-{
-  sops.secrets.github_token = { };
-  home.packages = with pkgs; [
-    gemini-cli
-  ];
-  home.file.".gemini/settings.json".text = ''
-    {
-      "selectedAuthType": "oauth-personal",
-      "mcpServers": {
-        "context7": {
-          "httpUrl": "https://mcp.context7.com/mcp"
-        },
-        "github": {
-          "command": "${wrapped-github-mcp-server}/bin/github-mcp-server",
-          "args": [
-            "stdio"
-          ],
-          "timeout": 10000,
-          "trust": false
-        }
-      },
-      "preferredEditor": "neovim"
-    }
-  '';
-}
diff --git a/home/modules/cli/opencode.nix b/home/modules/cli/opencode.nix
new file mode 100644
index 0000000..db53896
--- /dev/null
+++ b/home/modules/cli/opencode.nix
@@ -0,0 +1,3 @@
+{
+  programs.opencode.enable = true;
+}