diff --git a/git/ignore b/git/ignore
new file mode 100644
index 0000000..66d62f8
--- /dev/null
+++ b/git/ignore
@@ -0,0 +1 @@
+**/.claude/settings.local.json
diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 521110b..a7eef8b 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -3,6 +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" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
   "code_runner.nvim": { "branch": "main", "commit": "386bcaa8aa7ae8703281afce4465ecfdb7c44e65" },
   "gitsigns.nvim": { "branch": "main", "commit": "8b729e489f1475615dc6c9737da917b3bc163605" },
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 5055c40..9bc4064 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -175,6 +175,21 @@ require("lazy").setup({
 		end,
 	},
 
+	-- Claude Code integration
+	{
+		"greggh/claude-code.nvim",
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+		},
+		config = function()
+			require("claude-code").setup({
+				window = {
+					split_ratio = 0.5,
+				},
+			})
+		end,
+	},
+
 	-- Auto-restore session when opening Neovim
 	{
 		"rmagatti/auto-session",
@@ -296,16 +311,6 @@ require("lazy").setup({
 		end,
 	},
 
-	-- Live Markdown preview in browser
-	-- {
-	--   "iamcco/markdown-preview.nvim",
-	--   build = "cd app && npm install",
-	--   ft = "markdown",
-	--   init = function()
-	--     vim.g.mkdp_auto_close = 0
-	--   end,
-	-- },
-
 	-- Git integration - show modified lines next to line numbers
 	{
 		"lewis6991/gitsigns.nvim",