Fix keymap conflicts and add improvements

- Fix duplicate git conflict keymaps (centralized in gitconflict.lua)
- Fix duplicate Copilot keymaps (centralized in copilot.lua)
- Change insert mode escape from 'jk' to 'jj' to avoid typing conflicts
- Add word counter to statusline (lualine)
- Disable Copilot by default for .tex files
- Remove textwidth limits for visual wrapping based on window width
- Add comprehensive improvements documentation (IMPROVEMENTS.md)
- Update README with links to documentation

lua/cargdev/core/keymaps/copilot.lua

@@ -1,18 +1,86 @@
 -- Copilot keymaps
 local keymap = vim.keymap
 
+-- Helper function to safely get Copilot modules
+local function get_copilot_panel()
+  local ok, panel = pcall(require, "copilot.panel")
+  return ok and panel or nil
+end
+
+local function get_copilot_suggestion()
+  local ok, suggestion = pcall(require, "copilot.suggestion")
+  return ok and suggestion or nil
+end
+
 -- Copilot panel and status
 keymap.set("n", "<leader>cp", ":Copilot panel<CR>", { desc = "Copilot: Open copilot panel" })
 keymap.set("n", "<leader>cd", ":Copilot disable<CR>", { desc = "Copilot: Disable" })
 keymap.set("n", "<leader>ce", ":Copilot enable<CR>", { desc = "Copilot: Enable" })
 keymap.set("n", "<leader>cs", ":Copilot status<CR>", { desc = "Copilot: Status" })
 
--- Copilot suggestion navigation (insert mode)
--- These are configured in copilot.lua but documented here for reference:
--- <leader>] - Next suggestion
--- <leader>[ - Previous suggestion
--- <M-l> - Accept suggestion
--- <C-]> - Dismiss suggestion
+-- Copilot panel keymaps
+keymap.set("n", "[[", function()
+  local panel = get_copilot_panel()
+  if panel and panel.is_open() then
+    panel.jump_prev()
+  end
+end, { desc = "Copilot: Jump to previous suggestion in panel" })
+
+keymap.set("n", "]]", function()
+  local panel = get_copilot_panel()
+  if panel and panel.is_open() then
+    panel.jump_next()
+  end
+end, { desc = "Copilot: Jump to next suggestion in panel" })
+
+keymap.set("n", "<CR>", function()
+  local panel = get_copilot_panel()
+  if panel and panel.is_open() then
+    panel.accept()
+  end
+end, { desc = "Copilot: Accept suggestion in panel" })
+
+keymap.set("n", "gr", function()
+  local panel = get_copilot_panel()
+  if panel and panel.is_open() then
+    panel.refresh()
+  end
+end, { desc = "Copilot: Refresh panel" })
+
+keymap.set("n", "<M-CR>", ":Copilot panel<CR>", { desc = "Copilot: Open panel" })
+
+-- Copilot suggestion keymaps (insert mode)
+keymap.set("i", "<Tab>", function()
+  local suggestion = get_copilot_suggestion()
+  if suggestion and suggestion.is_visible() then
+    suggestion.accept()
+  else
+    -- Feed Tab through so nvim-cmp can handle it for completion menu/snippets
+    -- Use 't' flag to avoid remapping, 'n' flag for normal mode keycodes
+    vim.fn.feedkeys(vim.api.nvim_replace_termcodes("<Tab>", true, false, true), "nt")
+  end
+end, { desc = "Copilot: Accept suggestion" })
+
+keymap.set("i", "<leader>]", function()
+  local suggestion = get_copilot_suggestion()
+  if suggestion and suggestion.is_visible() then
+    suggestion.next()
+  end
+end, { desc = "Copilot: Next suggestion" })
+
+keymap.set("i", "<leader>[", function()
+  local suggestion = get_copilot_suggestion()
+  if suggestion and suggestion.is_visible() then
+    suggestion.prev()
+  end
+end, { desc = "Copilot: Previous suggestion" })
+
+keymap.set("i", "<C-]>", function()
+  local suggestion = get_copilot_suggestion()
+  if suggestion and suggestion.is_visible() then
+    suggestion.dismiss()
+  end
+end, { desc = "Copilot: Dismiss suggestion" })
 
 -- CodeCompanion keymaps
 keymap.set("n", "<leader>cc", ":CodeCompanion<CR>", { desc = "CodeCompanion: Open CodeCompanion" })

lua/cargdev/core/keymaps/general.lua

@@ -7,9 +7,12 @@ local opts = { noremap = true, silent = true }
 -- =============================================================================
 
 -- General keymaps
-keymap.set("i", "jk", "<ESC>", opts) -- Exit insert mode with jk
+-- Changed from "jk" to "jj" to avoid conflicts when typing words containing 'j' followed by other letters
+-- "jj" is much less likely to appear in normal typing and won't interfere
+keymap.set("i", "jj", "<ESC>", opts) -- Exit insert mode with jj
 keymap.set("n", "<leader>nh", ":nohl<CR>", opts) -- Clear search highlights
-keymap.set("n", "x", '"_x', opts) -- Delete character without copying into register
+-- Removed: keymap.set("n", "x", '"_x', opts) -- Delete character without copying into register
+-- This was causing single character deletions to not be copied to the default register
 
 -- Save and quit (additional)
 keymap.set("n", "<leader>Q", ":qa!<CR>", { desc = "Quit all" })

lua/cargdev/core/keymaps/gitconflict.lua

@@ -3,7 +3,7 @@ local keymap = vim.keymap
 
 keymap.set("n", "]x", "<Plug>(git-conflict-next-conflict)", { desc = "Go to next git conflict" })
 keymap.set("n", "[x", "<Plug>(git-conflict-prev-conflict)", { desc = "Go to previous git conflict" })
-keymap.set("n", "<leader>coo", "<Plug>(git-conflict-ours)", { desc = "Choose ours (git conflict)" })
+keymap.set("n", "<leader>co", "<Plug>(git-conflict-ours)", { desc = "Choose ours (git conflict)" })
 keymap.set("n", "<leader>ct", "<Plug>(git-conflict-theirs)", { desc = "Choose theirs (git conflict)" })
 keymap.set("n", "<leader>cb", "<Plug>(git-conflict-both)", { desc = "Choose both (git conflict)" })
 keymap.set("n", "<leader>c0", "<Plug>(git-conflict-none)", { desc = "Choose none (git conflict)" })

lua/cargdev/core/keymaps/personal.lua

@@ -78,7 +78,7 @@ keymap.set("n", "<C-j>", ":resize -5<CR>", { noremap = true, silent = true })
 keymap.set("n", "<leader>pr", ":RunProject<CR>", { desc = "Run Project" })
 keymap.set("n", "<leader>pd", ":DebugProject<CR>", { desc = "Debug Project" })
 
--- Copilot Chat
+-- Copilot Chat (all Copilot keymaps moved to lua/cargdev/core/keymaps/copilot.lua)
 keymap.set("v", "<leader>zn", ":CopilotChatRename<CR>", { desc = "Rename variable (Copilot Chat)" })
 keymap.set("n", "<leader>zc", ":CopilotChat<CR>", { desc = "Open Copilot Chat" })
 keymap.set("v", "<leader>ze", ":CopilotChatExplain<CR>", { desc = "Explain code (Copilot Chat)" })
@@ -87,10 +87,6 @@ keymap.set("v", "<leader>zf", ":CopilotChatFix<CR>", { desc = "Fix code issues (
 keymap.set("v", "<leader>zo", ":CopilotChatOptimize<CR>", { desc = "Optimize code (Copilot Chat)" })
 keymap.set("v", "<leader>zd", ":CopilotChatDocs<CR>", { desc = "Generate docs (Copilot Chat)" })
 
--- Copilot
-keymap.set("n", "<leader>cp", ":Copilot panel<CR>", { desc = "Copilot: Open copilot panel" })
-keymap.set("n", "<leader>ce", ":CopilotChatExplain<CR>", { desc = "Copilot Chat: Explain code" })
-
 -- Paste HTML as Markdown using pandoc
 keymap.set("n", "<leader>p", function()
   vim.cmd("read !pbpaste -Prefer html | pandoc -f html -t gfm")

lua/cargdev/core/keymaps/plugins.lua

@@ -59,14 +59,7 @@ keymap.set("n", "<leader>sa", "<cmd>lua require('nvim-surround').surround_add()<
 keymap.set("n", "<leader>sd", "<cmd>lua require('nvim-surround').surround_delete()<cr>", { desc = "Delete surrounding" })
 keymap.set("n", "<leader>sr", "<cmd>lua require('nvim-surround').surround_replace()<cr>", { desc = "Replace surrounding" })
 
--- Git conflicts
-keymap.set("n", "]x", "<Plug>(git-conflict-next-conflict)", { desc = "Go to next git conflict" })
-keymap.set("n", "[x", "<Plug>(git-conflict-prev-conflict)", { desc = "Go to previous git conflict" })
-keymap.set("n", "<leader>co", "<Plug>(git-conflict-ours)", { desc = "Choose ours (git conflict)" })
-keymap.set("n", "<leader>ct", "<Plug>(git-conflict-theirs)", { desc = "Choose theirs (git conflict)" })
-keymap.set("n", "<leader>cb", "<Plug>(git-conflict-both)", { desc = "Choose both (git conflict)" })
-keymap.set("n", "<leader>c0", "<Plug>(git-conflict-none)", { desc = "Choose none (git conflict)" })
-keymap.set("n", "<leader>cq", "<Plug>(git-conflict-list)", { desc = "List all git conflicts" })
+-- Git conflicts (moved to lua/cargdev/core/keymaps/gitconflict.lua)
 
 -- LeetCode
 keymap.set("n", "<leader>lr", "<cmd>Leet run<CR>", { desc = "LeetCode: Run Code" })