improve local organize, add map for duplicates

8 files changed, 21 insertions, 30 deletions

diff --git a/init.vim b/init.vim
index ac32d95..782cb9f 100644
--- a/init.vim
+++ b/init.vim
@@ -21,7 +21,7 @@ nnoremap # ?\<<C-R>=expand('<cword>')<CR>\><CR>
 vnoremap <leader>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 <expr> <leader>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', '<leader>rs', ':lua require(\'alpha.refactor\').setter_getter()<cr>', {noremap = true})
+vim.api.nvim_set_keymap('n', '<leader>rn', ':lua require(\'alpha.refactor\').new_property()<cr>', {noremap = true})
+
+vim.api.nvim_set_keymap('n', '<leader><leader>x', ':call alpha#save_and_exec()<cr>', {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', '<leader>vn', ':lua vim.lsp.diagnostic.goto_next()<cr>', {noremap = true})
     vim.api.nvim_set_keymap('n', '<leader>vp', ':lua vim.lsp.diagnostic.goto_prev()<cr>', {noremap = true})
 
+
     vim.api.nvim_set_keymap('n', '<leader>vca', ':lua vim.lsp.buf.code_action()<cr>', {noremap = true})
     vim.api.nvim_set_keymap('n', '<leader>vf', ':lua vim.lsp.buf.formatting()<cr>', {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 <leader><leader>x :call alpha#save_and_exec()<CR>
diff --git a/plugin/plugins.vim b/plugin/plugins.vim
deleted file mode 100644
index e69de29..0000000
--- a/plugin/plugins.vim
+++ /dev/null
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 <leader>rs :lua require('alpha.refactor').setter_getter()<CR>
-nnoremap <leader>rn :lua require('alpha.refactor').new_property()<CR>
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 <leader>ps :lua require('alpha.telescope').grep_string()<CR>
 nnoremap <leader>pw :lua require('telescope.builtin').grep_string({ search = vim.fn.expand("<cword>")})<CR>
-
-nnoremap <leader>pp :lua require('alpha.telescope').project_files()<CR>
 nnoremap <leader>po :lua require('telescope.builtin').find_files()<CR>
-
 nnoremap <leader>ph :lua require('telescope.builtin').help_tags()<CR>
 nnoremap <leader>pk :lua require('telescope.builtin').man_pages()<CR>
-
 nnoremap <leader>pv :lua require('telescope.builtin').lsp_workspace_symbols({ query = vim.fn.input("Symbols > ")})<CR>
-
 nnoremap <leader>pe :lua require('telescope.builtin').buffers()<CR>
-nnoremap <leader>pa :lua require('alpha.telescope').laravel_artisan()<CR>
 nnoremap <leader>pr :lua require('telescope.builtin').treesitter()<CR>
-
 nnoremap <leader>bb :lua require "telescope".extensions.file_browser.file_browser()<CR>
-
-nnoremap <leader>gc :lua require('alpha.telescope').branches()<CR>
 nnoremap <leader>gs :lua require('telescope.builtin').git_status()<CR>
-
-nnoremap <leader>rc :lua require('alpha.telescope').search_config()<CR>
-
 nnoremap <leader>vrr :lua require('telescope.builtin').lsp_references()<CR>
-
 nnoremap <leader>vs :lua require('telescope.builtin').lsp_document_symbols()<CR>
 nnoremap <leader>ve :lua require('telescope.builtin').lsp_document_diagnostics()<CR>
 
+" Personal ones
+nnoremap <leader>ps :lua require('alpha.telescope').grep_string()<CR>
+nnoremap <leader>pp :lua require('alpha.telescope').project_files()<CR>
+nnoremap <leader>pa :lua require('alpha.telescope').laravel_artisan()<CR>
+nnoremap <leader>gc :lua require('alpha.telescope').branches()<CR>
 nnoremap <leader>fp :lua require('alpha.telescope').project_find()<CR>
+nnoremap <leader>rc :lua require('alpha.telescope').search_config()<CR>
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 <leader>m :MaximizerToggle!<CR>
 
-nnoremap <leader>dd :call StartDebug()<CR>
-nnoremap <leader>de :call EndDebug()<CR>
+nnoremap <leader>dd :call vimspector#Launch()<CR>
+nnoremap <leader>de :call vimspector#Reset()<CR>
 
 nnoremap <leader>dc :call GotoWindow(g:vimspector_session_windows.code)<CR>
 nnoremap <leader>dt :call GotoWindow(g:vimspector_session_windows.tagpage)<CR>
@@ -32,12 +32,3 @@ nmap <leader>dbp <Plug>VimspectorToggleBreakpoint
 nmap <leader>dcbp <Plug>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