From b34e836db410e311a83ee4d5a86f943b0ae004d3 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Thu, 20 Jul 2023 13:23:41 -0600 Subject: couple of shortcut updates --- init.lua | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 7b390bc..c8a1927 100644 --- a/init.lua +++ b/init.lua @@ -127,6 +127,7 @@ vim.api.nvim_set_keymap('n', '', 'vT', { noremap = true vim.api.nvim_set_keymap('n', '', 'vT', { noremap = true }) vim.api.nvim_set_keymap('n', '', 'w', { noremap = true }) vim.api.nvim_set_keymap('n', '', 'wa', { noremap = true }) +vim.api.nvim_set_keymap('n', '', 'qa!', { noremap = true }) vim.api.nvim_set_keymap('n', 'ee', 'e!', { noremap = true }) vim.api.nvim_set_keymap('n', ' k', [[(v:count > 1 ? "m'" . v:count : '') . 'k']], { noremap = true }) vim.api.nvim_set_keymap('n', ' j', [[(v:count > 1 ? "m'" . v:count : '') . 'j']], { noremap = true }) @@ -271,12 +272,28 @@ cmp.setup { } -- nvim-fzf -vim.api.nvim_set_keymap('n', 'ff', "Files", { noremap = true }) -vim.api.nvim_set_keymap('n', 'fb', "Buffers", { noremap = true }) +vim.api.nvim_set_keymap('n', 'fb', "let g:fzf_buffers_jump = 0Buffers", { noremap = true }) vim.api.nvim_set_keymap('n', 'ft', "Tags", { noremap = true }) vim.api.nvim_set_keymap('n', 'fm', "Marks", { noremap = true }) vim.api.nvim_set_keymap('n', 'fg', "GF?", { noremap = true }) vim.cmd([[let $FZF_DEFAULT_COMMAND = 'find . -type f -not -path "*/\.git/*" -not -path "*/\.mypy_cache/*" -not -path "*/\.venv/*" -not -path "*/\node_modules/*" ']]) +vim.cmd([[ +nnoremap ff :call FilesDefault() +function! FilesDefault() + if exists('g:fzf_action') + " I don't set fzf_action except for the FilesNew thing so unset it for + " default behaviour in files + unlet g:fzf_action + endif + execute 'Files' +endfunction +nnoremap fn :let g:fzf_action = { 'enter': 'tab split' }:Files +nnoremap fo :call BufferTabJump() +function! BufferTabJump() + let g:fzf_buffers_jump = 1 + execute 'Buffers' +endfunction +]]) -- vim-argwrap vim.api.nvim_set_keymap('n', 'ew', 'ArgWrap', { noremap = true }) -- cgit v1.2.3