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
This commit is contained in:
Carlos Gutierrez
2026-01-10 16:31:17 -05:00
parent 97795e90b3
commit 0066ac1441
11 changed files with 820 additions and 57 deletions

View File

@@ -47,17 +47,17 @@ return {
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
["<C-e>"] = cmp.mapping.abort(), -- close completion window
["<CR>"] = cmp.mapping.confirm({ select = false }),
-- Tab to accept Copilot suggestions, fallback to snippet expansion
-- Tab for completion menu and snippet expansion
-- Note: Copilot suggestion acceptance is handled in keymaps/copilot.lua
["<Tab>"] = cmp.mapping(function(fallback)
-- Handle nvim-cmp completion menu
if cmp.visible() then
local entry = cmp.get_selected_entry()
-- If Copilot suggestion is available and selected, accept it
if entry and entry.source.name == "copilot" then
cmp.confirm({ select = true })
else
-- Check if we can find a Copilot entry in the completion menu
-- Since Copilot has high priority (900), it's likely near the top
-- Just confirm the current selection (Copilot will be selected if available)
-- Confirm the current selection
cmp.confirm({ select = true })
end
elseif luasnip.expand_or_jumpable() then