From 92988f8b38c11e4c9be7cb34411ab46bca636717 Mon Sep 17 00:00:00 2001 From: Ariel D'Alessandro Date: Sun, 23 Jan 2022 22:35:23 +0100 Subject: improve local organize, add map for duplicates --- init.vim | 5 ++++- lua/alpha/init.lua | 9 ++++++++- lua/alpha/lsp.lua | 1 + plugin/keymap.vim | 1 - plugin/plugins.vim | 0 plugin/refactor.vim | 2 -- plugin/telescope.vim | 20 ++++++-------------- plugin/vimspector.vim | 13 ++----------- 8 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 plugin/keymap.vim delete mode 100644 plugin/plugins.vim delete mode 100644 plugin/refactor.vim diff --git a/init.vim b/init.vim index ac32d95..782cb9f 100644 --- a/init.vim +++ b/init.vim @@ -21,7 +21,7 @@ nnoremap # ?\<=expand('')\> vnoremap p "_dP " remove whitespaces -autocmd BufWritePre * %s/\s\+$//e +autocmd BufWritePre * :%s/\s\+$//e " augroup fmtphp " autocmd! @@ -58,5 +58,8 @@ let g:go_doc_keywordprg_enabled = 0 lua require('plugins') lua require("alpha") +" quick duplication of files +nnoremap dp ":saveas " . expand('%') + " Has to be the last line for the .nvimrc per project set secure diff --git a/lua/alpha/init.lua b/lua/alpha/init.lua index 8abc5e6..9b50ae2 100644 --- a/lua/alpha/init.lua +++ b/lua/alpha/init.lua @@ -4,8 +4,15 @@ require("alpha.telescope") require("alpha.refactoring") require("alpha.snippets") require("alpha.harpoon") -require("alpha.refactor") require("alpha.completition") require("alpha.lsp") require("alpha.treesitter") require("alpha.status-line") + + + +-- Keybindings +vim.api.nvim_set_keymap('n', 'rs', ':lua require(\'alpha.refactor\').setter_getter()', {noremap = true}) +vim.api.nvim_set_keymap('n', 'rn', ':lua require(\'alpha.refactor\').new_property()', {noremap = true}) + +vim.api.nvim_set_keymap('n', 'x', ':call alpha#save_and_exec()', {noremap = true}) diff --git a/lua/alpha/lsp.lua b/lua/alpha/lsp.lua index f190655..40a56d6 100644 --- a/lua/alpha/lsp.lua +++ b/lua/alpha/lsp.lua @@ -10,6 +10,7 @@ local function on_attach() vim.api.nvim_set_keymap('n', 'vn', ':lua vim.lsp.diagnostic.goto_next()', {noremap = true}) vim.api.nvim_set_keymap('n', 'vp', ':lua vim.lsp.diagnostic.goto_prev()', {noremap = true}) + vim.api.nvim_set_keymap('n', 'vca', ':lua vim.lsp.buf.code_action()', {noremap = true}) vim.api.nvim_set_keymap('n', 'vf', ':lua vim.lsp.buf.formatting()', {noremap = true}) diff --git a/plugin/keymap.vim b/plugin/keymap.vim deleted file mode 100644 index 2e7f810..0000000 --- a/plugin/keymap.vim +++ /dev/null @@ -1 +0,0 @@ -nnoremap x :call alpha#save_and_exec() diff --git a/plugin/plugins.vim b/plugin/plugins.vim deleted file mode 100644 index e69de29..0000000 diff --git a/plugin/refactor.vim b/plugin/refactor.vim deleted file mode 100644 index 1f032ff..0000000 --- a/plugin/refactor.vim +++ /dev/null @@ -1,2 +0,0 @@ -nnoremap rs :lua require('alpha.refactor').setter_getter() -nnoremap rn :lua require('alpha.refactor').new_property() diff --git a/plugin/telescope.vim b/plugin/telescope.vim index fcd3af9..6412faf 100644 --- a/plugin/telescope.vim +++ b/plugin/telescope.vim @@ -1,31 +1,23 @@ let g:telescope_cache_results = 1 let g:telescope_prime_fuzzy_find = 1 -nnoremap ps :lua require('alpha.telescope').grep_string() nnoremap pw :lua require('telescope.builtin').grep_string({ search = vim.fn.expand("")}) - -nnoremap pp :lua require('alpha.telescope').project_files() nnoremap po :lua require('telescope.builtin').find_files() - nnoremap ph :lua require('telescope.builtin').help_tags() nnoremap pk :lua require('telescope.builtin').man_pages() - nnoremap pv :lua require('telescope.builtin').lsp_workspace_symbols({ query = vim.fn.input("Symbols > ")}) - nnoremap pe :lua require('telescope.builtin').buffers() -nnoremap pa :lua require('alpha.telescope').laravel_artisan() nnoremap pr :lua require('telescope.builtin').treesitter() - nnoremap bb :lua require "telescope".extensions.file_browser.file_browser() - -nnoremap gc :lua require('alpha.telescope').branches() nnoremap gs :lua require('telescope.builtin').git_status() - -nnoremap rc :lua require('alpha.telescope').search_config() - nnoremap vrr :lua require('telescope.builtin').lsp_references() - nnoremap vs :lua require('telescope.builtin').lsp_document_symbols() nnoremap ve :lua require('telescope.builtin').lsp_document_diagnostics() +" Personal ones +nnoremap ps :lua require('alpha.telescope').grep_string() +nnoremap pp :lua require('alpha.telescope').project_files() +nnoremap pa :lua require('alpha.telescope').laravel_artisan() +nnoremap gc :lua require('alpha.telescope').branches() nnoremap fp :lua require('alpha.telescope').project_find() +nnoremap rc :lua require('alpha.telescope').search_config() diff --git a/plugin/vimspector.vim b/plugin/vimspector.vim index 05a6929..7fa9ff2 100644 --- a/plugin/vimspector.vim +++ b/plugin/vimspector.vim @@ -9,8 +9,8 @@ let g:vimspector_enable_mappings = 'HUMAN' " Debugger remaps nnoremap m :MaximizerToggle! -nnoremap dd :call StartDebug() -nnoremap de :call EndDebug() +nnoremap dd :call vimspector#Launch() +nnoremap de :call vimspector#Reset() nnoremap dc :call GotoWindow(g:vimspector_session_windows.code) nnoremap dt :call GotoWindow(g:vimspector_session_windows.tagpage) @@ -32,12 +32,3 @@ nmap dbp VimspectorToggleBreakpoint nmap dcbp VimspectorToggleConditionalBreakpoint let g:vimspector_install_gadgets = [ 'vscode-go' ] - -fun! StartDebug() - let $XDEBUG_SESSION=1 - call vimspector#Launch() -endfun -fun! EndDebug() - unlet $XDEBUG_SESSION - call vimspector#Reset() -endfun -- cgit v1.2.3