diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 2dbef1f..56071d5 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -115,3 +115,15 @@ vim.keymap.set("n", "<F9>", ":Telescope live_grep<CR>", { desc = "Live Grep"})
 -- vim.keymap.set("n", "<F10>", ":b#<CR>", { desc = "Last Buffer"})
 vim.keymap.set("n", "<F11>", ":setlocal spell! spelllang=en_us<CR>", { desc = "Toggle Spell Check"})
 vim.keymap.set("n", "<F12>", ":setlocal wrap!<CR>", { desc = "Toggle Line Wrap"})
+-- vim.keymap.set( "n", "<leader>a", nil, desc = "AI/Claude Code" },
+-- vim.keymap.set( "n", "<leader>ac", "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" }
+-- vim.keymap.set( "n", "<leader>af", "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" }
+-- vim.keymap.set( "n", "<leader>ar", "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" }
+-- vim.keymap.set( "n", "<leader>aC", "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" }
+-- vim.keymap.set( "n", "<leader>am", "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" }
+-- vim.keymap.set( "n", "<leader>ab", "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" }
+-- vim.keymap.set( "n", "<leader>as", "<cmd>ClaudeCodeSend<cr>", mode = "v", desc = "Send to Claude" }
+-- vim.keymap.set( "n", "<leader>as", "<cmd>ClaudeCodeTreeAdd<cr>",  desc = "Add file", ft = { "NvimTree", "neo-tree", "oil", "minifiles" }
+-- vim.keymap.set( "n", "<leader>aa", "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" }
+-- vim.keymap.set( "n", "<leader>ad", "<cmd>ClaudeCodeDiffDeny<cr>", desc = "Deny diff" }
+
diff --git a/lua/options.lua b/lua/options.lua
index b1d04be..8412a31 100644
--- a/lua/options.lua
+++ b/lua/options.lua
@@ -27,6 +27,7 @@ vim.g.netrw_liststyle = 3
 vim.g.netrw_browse_split = 4
 vim.g.ranger_map_keys = 0
 vim.g.ranger_replace_netrw = 1
+vim.g.cmdheight = 1
 
 vim.o.foldmethod = "expr"
 vim.o.foldexpr = "nvim_treesitter#foldexpr()"
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 994756a..66dcac7 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -53,9 +53,11 @@ vim.pack.add({
 	{ src = "https://github.com/nvim-telescope/telescope-project.nvim"},
 	{ src = "https://github.com/nvim-telescope/telescope-ui-select.nvim" },
 	{ src = "https://github.com/luckasRanarison/nvim-devdocs" },
-	{ src = "https://github.com/folke/noice.nvim" },
+	-- { src = "https://github.com/folke/noice.nvim" },
 	{ src = "https://github.com/mbbill/undotree.git" },
 	{ src = "https://github.com/francoiscabrol/ranger.vim" },
+	{ src = "https://github.com/folke/snacks.nvim" },
+	{ src = "https://github.com/coder/cluadecode.nvim" },
 })
 
 if host == "xps13" then
@@ -120,19 +122,19 @@ require('goto-preview').setup({ default_mappings = true })
 require('colorizer').setup({})
 require('telescope').setup({})
 require('nvim-devdocs').setup({})
-require('noice').setup({
-	  lsp = {
-    override = {
-      ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-      ["vim.lsp.util.stylize_markdown"] = true,
-      ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
-    },
-  },
-  presets = {
-    bottom_search = true, -- use a classic bottom cmdline for search
-    command_palette = true, -- position the cmdline and popupmenu together
-    long_message_to_split = true, -- long messages will be sent to a split
-    inc_rename = false, -- enables an input dialog for inc-rename.nvim
-    lsp_doc_border = false, -- add a border to hover docs and signature help
-  },
-})
+-- require('noice').setup({
+-- 	  lsp = {
+--     override = {
+--       ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+--       ["vim.lsp.util.stylize_markdown"] = true,
+--       ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
+--     },
+--   },
+--   presets = {
+--     bottom_search = true, -- use a classic bottom cmdline for search
+--     command_palette = true, -- position the cmdline and popupmenu together
+--     long_message_to_split = true, -- long messages will be sent to a split
+--     inc_rename = false, -- enables an input dialog for inc-rename.nvim
+--     lsp_doc_border = false, -- add a border to hover docs and signature help
+--   },
+-- })