From e02f01f120ec363fd02d37e08192aeba03c7309b Mon Sep 17 00:00:00 2001
From: Jeremy Wall <Jeremy@marzhillstudios.com>
Date: Tue, 1 Jul 2025 14:39:08 -0500
Subject: [PATCH] wip: add claude code as an option in neovim

---
 nix/base-system/flake.lock | 76 +++++++++++++++++++-------------------
 nix/base-system/flake.nix  |  4 ++
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index ca2a2f6..ddec37c 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -20,6 +20,38 @@
         "type": "github"
       }
     },
+    "avante-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1746602870,
+        "narHash": "sha256-REBOplEe2muqfVLwcpTAmXpTrHlzSfhbh8T0litDTDA=",
+        "owner": "yetone",
+        "repo": "avante.nvim",
+        "rev": "113913355a6b9c0fbd62cf52d0cf3e5671d0e34a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yetone",
+        "repo": "avante.nvim",
+        "type": "github"
+      }
+    },
+    "claude-code-nvim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1749595024,
+        "narHash": "sha256-jKWm3lN5nyZ1BsIKMFt4EQhb0n+iyEyOw79Rj/A3yZI=",
+        "owner": "greggh",
+        "repo": "claude-code.nvim",
+        "rev": "275c47615f4424a0329290ce1d0c18a8320fd8b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "greggh",
+        "repo": "claude-code.nvim",
+        "type": "github"
+      }
+    },
     "clio-flake": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -46,6 +78,8 @@
     },
     "custom-flakes": {
       "inputs": {
+        "avante-src": "avante-src",
+        "claude-code-nvim-src": "claude-code-nvim-src",
         "d2-vim-src": "d2-vim-src",
         "flake-utils": "flake-utils_3",
         "gomod2nix-src": "gomod2nix-src",
@@ -62,16 +96,14 @@
         "rust-overlay": "rust-overlay_3",
         "tree-sitter-cli-src": "tree-sitter-cli-src",
         "treesitter-context": "treesitter-context",
-        "victoria-logs-src": "victoria-logs-src",
-        "victoria-metrics-src": "victoria-metrics-src",
         "zig-src": "zig-src"
       },
       "locked": {
-        "lastModified": 1746458473,
-        "narHash": "sha256-3FFhJ18MJFlHHI1YaMKRwXURcQjmLenxIcLFtr+CjGI=",
+        "lastModified": 1751479151,
+        "narHash": "sha256-JxS2yHOiScQQOk8YvK4UAGx68iQJXKnL5qNvV0+9s9A=",
         "owner": "zaphar",
         "repo": "nix-flakes",
-        "rev": "91588e10769e706024d8d03ebb4958c89e00c264",
+        "rev": "0442ff179bd8e82ca3fe713d22e258c89f9caccc",
         "type": "github"
       },
       "original": {
@@ -1723,40 +1755,6 @@
         "type": "indirect"
       }
     },
-    "victoria-logs-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1742084154,
-        "narHash": "sha256-Oxy4MntciWUij83zyHixlEDa1DgeG/2ntNN+Nbw8xJg=",
-        "owner": "VictoriaMetrics",
-        "repo": "VictoriaMetrics",
-        "rev": "771233ebcd706578c44ed82047c714381a75ab5a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "VictoriaMetrics",
-        "ref": "v1.17.0-victorialogs",
-        "repo": "VictoriaMetrics",
-        "type": "github"
-      }
-    },
-    "victoria-metrics-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1742560966,
-        "narHash": "sha256-iOeGz0qDeKMdafTDqI4/IMkXZ6KLdMDtFie3jwv2uvU=",
-        "owner": "VictoriaMetrics",
-        "repo": "VictoriaMetrics",
-        "rev": "e950846534ea594940a0f69845ef60a053c98ffd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "VictoriaMetrics",
-        "ref": "v1.114.0",
-        "repo": "VictoriaMetrics",
-        "type": "github"
-      }
-    },
     "zig-src": {
       "flake": false,
       "locked": {
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 97f7970..b3e9e03 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -79,6 +79,7 @@
     vimModule = system: let
       nil-pkg = nil-flake.packages."${system}".default;
       mcp-hub-binary = custom-flakes.packages."${system}".mcp-hub;
+      claude-code-binary = custom-flakes.packages."${system}".claude-code;
     in
     { config, pkgs, ...}: let
         unstablePkgs = import unstable { inherit system; };
@@ -89,6 +90,7 @@
         #nvim-bnf = custom-flakes.packages."${system}".nvim-bnf;
         roslyn-nvim = custom-flakes.packages."${system}".roslyn-nvim;
         ionide-nvim = custom-flakes.packages."${system}".ionide-nvim;
+        claude-code-nvim = custom-flakes.packages."${system}".claude-code-nvim;
         # TODO(zaphar): Until nixpkgs update to a newer version of tree-sitter the queries will be wrong
         # for csharp
         #tree-sitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix {
@@ -199,6 +201,7 @@ EOF";
               vim-dasht
               direnv-vim
               mcphub-nvim
+              claude-code-nvim
             ]) ++ [
               d2-vim
               hunk-nvim
@@ -224,6 +227,7 @@ EOF";
             devenv
             unstablePkgs.fq
             mcp-hub-binary
+            claude-code-binary
         ]);
       };
     };