From 7cc312b3b3399f191f93b007a04892cfa1714747 Mon Sep 17 00:00:00 2001
From: Mikkel Svartveit <mikkel.svartveit@gmail.com>
Date: Tue, 3 Jun 2025 12:56:43 +0200
Subject: [PATCH] Replace Claude Code plugin

---
 nvim/lazy-lock.json  |  3 ++-
 nvim/lua/plugins.lua | 28 +++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index a8c6e08..0194fb8 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -3,7 +3,7 @@
   "LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" },
   "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" },
   "catppuccin": { "branch": "main", "commit": "56a9dfd1e05868cf3189369aad87242941396563" },
-  "claude-code.nvim": { "branch": "main", "commit": "ffdf35d8566528cb144d9812eccfecee34502edf" },
+  "claudecode.nvim": { "branch": "main", "commit": "c1cdcd5a61d5a18f262d5c8c53929e3a27cb7821" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "code_runner.nvim": { "branch": "main", "commit": "386bcaa8aa7ae8703281afce4465ecfdb7c44e65" },
   "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
@@ -21,6 +21,7 @@
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
   "telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 3d1bfbd..0a6e639 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -175,21 +175,23 @@ require("lazy").setup({
 
 	-- Claude Code integration
 	{
-		"greggh/claude-code.nvim",
+		"coder/claudecode.nvim",
 		dependencies = {
-			"nvim-lua/plenary.nvim",
+			"folke/snacks.nvim",
+		},
+		opts = {
+			terminal = {
+				split_side = "right",
+				split_width_percentage = 0.4,
+			},
+		},
+		config = true,
+		keys = {
+			{ "<C-,>", "<cmd>ClaudeCode<cr>", mode = { "n", "v", "i", "t" }, desc = "Toggle Claude" },
+
+			-- Temporarily disabled because it's buggy
+			-- { "<C-.>", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" },
 		},
-		config = function()
-			require("claude-code").setup({
-				window = {
-					position = "botright vsplit",
-					split_ratio = 0.4,
-				},
-				keymaps = {
-					window_navigation = false,
-				},
-			})
-		end,
 	},
 
 	-- Auto-restore session when opening Neovim