diff --git a/init.lua b/init.lua index 4cfa87b1..30973902 100644 --- a/init.lua +++ b/init.lua @@ -380,9 +380,9 @@ end vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {}) -- See `:help telescope.builtin` -vim.keymap.set('n', '?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' }) -vim.keymap.set('n', '', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' }) -vim.keymap.set('n', '/', function() +vim.keymap.set('n', 'fh', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' }) +vim.keymap.set('n', 'fb', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' }) +vim.keymap.set('n', 'fth', function() -- You can pass additional configuration to telescope to change theme, layout, etc. require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { winblend = 10, @@ -396,12 +396,12 @@ local function telescope_live_grep_open_files() prompt_title = 'Live Grep in Open Files', } end -vim.keymap.set('n', 's/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' }) +vim.keymap.set('n', 'fr', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' }) vim.keymap.set('n', 'ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' }) -vim.keymap.set('n', 'gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) -vim.keymap.set('n', 'sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) +vim.keymap.set('n', 'fgf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' }) +vim.keymap.set('n', 'ff', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', 'sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) +vim.keymap.set('n', 'sf', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' }) vim.keymap.set('n', 'sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set('n', 'sG', ':LiveGrepGitRoot', { desc = '[S]earch by [G]rep on Git Root' }) vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' }) @@ -657,5 +657,9 @@ cmp.setup { -- require my mappings. require('my_mappings') +-- options. +vim.o.cursorline = true + + -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/my_mappings.lua b/lua/my_mappings.lua index c137d372..e1cd1aa1 100644 --- a/lua/my_mappings.lua +++ b/lua/my_mappings.lua @@ -13,10 +13,12 @@ vim.keymap.set('n','<<','10<', {desc = 'Do 10 bigger in horizontal -- ":echo will go to commands that started with echo, instead of just the -- "previous. -- This should work, I don't understand why it doesn't. --- vim.keymap.set('c',' ','wildmenumode() ? : ', {desc = 'If wildmenu then do down instead of c-n'}) --- vim.keymap.set('c',' ','wildmenumode() ? : ', {desc = 'If wildmenu then do up instead of c-p'}) -vim.keymap.set('c','','', {desc = 'If wildmenu then do down instead of c-n'}) -vim.keymap.set('c','','', {desc = 'If wildmenu then do up instead of c-p'}) +-- Lua does not have ternary operator ?, so the idiom is a and b or c for the corresponding +-- c a ? b or c, because and has more priority than or. +vim.keymap.set('c','', function() return vim.fn.wildmenumode() == 1 and '' or '' end, {expr = true, desc = 'If wildmenu then do down instead of c-n'}) +vim.keymap.set('c','', function() return vim.fn.wildmenumode() == 1 and '' or '' end, {expr = true, desc = 'If wildmenu then do up instead of c-p'}) +-- vim.keymap.set('c','','', {desc = 'If wildmenu then do down instead of c-n'}) +-- vim.keymap.set('c','','', {desc = 'If wildmenu then do up instead of c-p'}) -- redraws the screen in normal mode, this redraws and eliminates highlight vim.keymap.set('n','',':nohlsearch:diffupdate:syntax sync fromstart', {desc = 'Redraw and remove highlight'}) @@ -53,12 +55,10 @@ vim.keymap.set('n','vth','tKR', {desc = 'Change vertical -- nnoremap :AsyncRun cd\ $EMV_HOME\ &&\ bms\ build\ -b\ &&\ bms\ test -- Select inner word. -vim.keymap.set('n','','viw', {desc = 'Change vertical split to horizontal'}) +vim.keymap.set('n','','viw', {desc = 'Select inner word'}) --- #Navigate location list"""""""""""""""" --- nmap ln :lne --- nmap lp :lp --- nnoremap vi{= +-- #Seleccionar e indentar. +vim.keymap.set('n', '', 'vi{=', {desc = 'indent inside braces'}) -- Buffers vim.keymap.set('n','bn',':bn', {desc = 'Next buffer'}) vim.keymap.set('n','bp',':bp', {desc = 'Previous buffer'}) @@ -73,8 +73,8 @@ vim.keymap.set('n','cl',':clast', {desc = 'Last result'}) vim.keymap.set('n','co',':copen', {desc = 'Open quicfix list'}) vim.keymap.set('n','cq',':cclose', {desc = 'Close quickfix list'}) -- Location list -vim.keymap.set('n','ln',':lne', {desc = 'Change vertical split to horizontal'}) -vim.keymap.set('n','lp',':lp', {desc = 'Change vertical split to horizontal'}) +-- vim.keymap.set('n','ln',':lne', {desc = 'Change vertical split to horizontal'}) +-- vim.keymap.set('n','lp',':lp', {desc = 'Change vertical split to horizontal'}) -- Edit and source vimrc vim.keymap.set('n','sv',':source $MYVIMRC', {desc = 'Source vimrc file'}) @@ -83,3 +83,9 @@ vim.keymap.set('n','ev',':e $MYVIMRC', {desc = 'Change vimrc file'}) -- Make and recover default session. vim.keymap.set('n','',': mksession! /home/$USER/.vim/files/nacho_vim_session', {desc = 'Make the default session'}) vim.keymap.set('n','',': source! /home/$USER/.vim/files/nacho_vim_session', {desc = 'Source the default session'}) + +#Go only to matches in this file, does the same with both mappings +-- nnoremap ]g :execute "g/\\<" . expand("") . "\\>":let nr = input("Which one: ")exe "normal " . nr ."G" +-- nnoremap [g :execute "g/\\<" . expand("") . "\\>" +vim.keymap.set('n', ']g', "g/\\<" . expand("") . "\\>":let nr = input("Which one: ")exe "normal " . nr ."G", { expr = true, desc = 'find this word in file'}) +