Update

4 files changed, 51 insertions, 41 deletions

diff --git a/vim/init/keymaps.vim b/vim/init/keymaps.vim
index d0e2cd0..e4bdfd4 100644
--- a/vim/init/keymaps.vim
+++ b/vim/init/keymaps.vim
@@ -47,6 +47,9 @@ nnoremap <C-p> "0p
 nmap <leader>w :w!<CR>
 
 " Fast quit with error
+nmap <leader>q :q<CR>
+
+" Fast quit with error
 nmap cq :cq<CR>
 
 " Switch wrap
@@ -74,7 +77,6 @@ augroup END
 " Open terminal
 " nnoremap <leader>, :terminal ++noclose<CR>
 vnoremap <leader>, :terminal<CR>
-echo foo
 
 " Toggle paste mode on and off
 map <leader>pp :setlocal paste!<CR>
@@ -312,20 +314,17 @@ nnoremap <leader>rr :Redir
 "----------------------------------------------------------------------
 " QUICK_SUBSTITUTE
 "----------------------------------------------------------------------
-function! IsSubstituteTextSelected()
-  execute "norm \<ESC>"
-  " Get position of the first/last char
-  echo col("'<") col("'>") len(getline('.'))+1
-  return col("'<") != 1 || col("'>") != len(getline('.')) + 1
-endfunction
+let g:text_selected = 1
 function! SelectAreaOrDoSubstitute()
-  if IsSubstituteTextSelected()
-    call feedkeys('gv"aygv*NVL')
+  if g:text_selected
+    call feedkeys("\"sygv/\<C-R>s\<CR>gn")
+    let g:text_selected = 0
   else
-    call feedkeys("gv:s//\<C-R>a/g\<Left>\<Left>")
+    call feedkeys(":s//\<C-R>//g\<Left>\<Left>")
+    let g:text_selected = 1
   endif
 endfunction
-vnoremap <CR> <Cmd>call SelectAreaOrDoSubstitute()<CR>
+vnoremap <TAB> <Cmd>call SelectAreaOrDoSubstitute()<CR>
 
 
 "----------------------------------------------------------------------
diff --git a/vim/lua/configs/telescope.lua b/vim/lua/configs/telescope.lua
index 70eddf4..6efa391 100644
--- a/vim/lua/configs/telescope.lua
+++ b/vim/lua/configs/telescope.lua
@@ -4,7 +4,7 @@ return {
       i = {
         -- ["<c-j>"] = "move_selection_next",
         -- ["<c-k>"] = "move_selection_previous",
-        ["<C-w>"] = require("telescope.actions.layout").toggle_preview,
+        ["<C-e>"] = require("telescope.actions.layout").toggle_preview,
         ["<C-u>"] = false,
         ["<C-o>"] = function(p_bufnr)
           require("telescope.actions").send_selected_to_qflist(p_bufnr)
diff --git a/vim/lua/mappings.lua b/vim/lua/mappings.lua
index d3cfda0..788a6ab 100644
--- a/vim/lua/mappings.lua
+++ b/vim/lua/mappings.lua
@@ -46,24 +46,44 @@ vim.keymap.set('n', '<leader>ss', function()
   local current_filetype = vim.bo.filetype
   local cwd = os.getenv("HOME") .. '/snippets'
   require('telescope.builtin').find_files {
-    prompt_title = 'Select a snippet for ' .. current_filetype,
+    prompt_title = 'Press <C-T> to edit a snippet',
     default_text = current_filetype .. "_",
     cwd = cwd,
     attach_mappings = function(prompt_bufnr, map)
-      local insert_selected_snippet = function()
-        local file = require('telescope.actions.state').get_selected_entry()[1]
-        local snippet_content = vim.fn.readfile(cwd .. "/" .. file)
-        require('telescope.actions').close(prompt_bufnr)
-        vim.api.nvim_put(snippet_content, '', false, true)
+      local get_prompt_or_entry = function()
+        local file_list = require('telescope.actions.state').get_selected_entry()
+        if file_list then
+          return file_list[1]
+        else
+          local current_picker = require('telescope.actions.state').get_current_picker(prompt_bufnr)
+          return current_picker:_get_prompt()
+        end
       end
-      local edit_selected_snippet = function()
-        local file = require('telescope.actions.state').get_selected_entry()[1]
+
+      local edit_snippet = function()
+        local file = get_prompt_or_entry()
         require('telescope.actions').close(prompt_bufnr)
+        local prefix_filetype = string.match(file, "([^_]+)")
         vim.cmd(":e " .. cwd .. "/" .. file)
+        vim.bo.filetype(prefix_filetype)
+        vim.cmd("set filetype?")
+      end
+
+      local insert_selected_snippet = function()
+        local file = get_prompt_or_entry()
+        local path = cwd .. "/" .. file
+        if vim.fn.filereadable(path) ~= 0 then
+          local snippet_content = vim.fn.readfile(path)
+          require('telescope.actions').close(prompt_bufnr)
+          vim.fn.setreg('"', snippet_content)
+          print('Snippet saved to register')
+        else
+          edit_snippet()
+        end
       end
 
       map('i', '<CR>', insert_selected_snippet)
-      map('i', '<C-T>', edit_selected_snippet)
+      map('i', '<C-T>', edit_snippet)
       map('n', '<CR>', insert_selected_snippet)
 
       return true
@@ -91,16 +111,6 @@ vim.keymap.set('n', '<leader>sd', function()
   }
 end, { desc = 'Search Directory' })
 
-vim.keymap.set('n', '<leader>sn', function()
-  local current_filetype = vim.bo.filetype
-  vim.ui.input({ prompt = 'Snippet Name: ', default = current_filetype .. "_"  }, function(snippet)
-    vim.cmd("cd ~/snippets")
-    vim.cmd("e " .. snippet)
-    vim.cmd("set filetype=" .. current_filetype)
-    vim.cmd("set filetype?")
-  end)
-end, { desc = "Create a new snippet" })
-
 
 -- map("n", "<leader>ma", "<cmd>Telescope marks<CR>", { desc = "telescope find marks" })
 -- map("n", "<leader>cm", "<cmd>Telescope git_commits<CR>", { desc = "telescope git commits" })
@@ -172,5 +182,5 @@ vim.cmd('vmap s S')
 -- [ Aerial ]
 vim.keymap.set("n", "{", "<cmd>AerialPrev<CR>", {})
 vim.keymap.set("n", "}", "<cmd>AerialNext<CR>", {})
-vim.keymap.set("n", "gN", "<cmd>Telescope aerial<CR>")
-vim.keymap.set("n", "gn", function() require("aerial").toggle({ direction = "left" }) end)
+vim.keymap.set("n", "<C-W>a", "<cmd>Telescope aerial<CR>")
+vim.keymap.set("n", "<C-W><C-A>", function() require("aerial").toggle({ direction = "left" }) end)
diff --git a/vim/lua/plugins/init.lua b/vim/lua/plugins/init.lua
index c74e8d4..0e9911e 100644
--- a/vim/lua/plugins/init.lua
+++ b/vim/lua/plugins/init.lua
@@ -61,14 +61,15 @@ return {
         changedelete = { text = '~' },
       },
       on_attach = function(bufnr)
-        vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
-          { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
-        vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
-        vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
-        vim.keymap.set('n', '<leader>hd', require('gitsigns').diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' })
-        vim.keymap.set('n', '<leader>hD', function() require('gitsigns').diffthis('~') end,
-          { buffer = bufnr, desc = '[h]unk [d]iff for ~' })
-        vim.keymap.set('v', 'hr', ":Gitsigns reset_hunk<CR>", { buffer = bufnr, desc = '[h]unk [r]eset' })
+        local gs = require('gitsigns')
+        vim.keymap.set('n', '<leader>gp', gs.prev_hunk, { buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
+        vim.keymap.set('n', '<leader>gn', gs.next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
+        vim.keymap.set('n', '<leader>hp', gs.preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
+        vim.keymap.set('n', '<leader>hd', gs.diffthis, { buffer = bufnr, desc = '[h]unk [d]iff' })
+        vim.keymap.set('n', '<leader>hD', function() gs.diffthis('~') end, { buffer = bufnr, desc = '[h]unk [d]iff for ~' })
+        -- vim.keymap.set("n", "<leader>gb", gs.blame_line{full=true}, { desc = "Git Blame" })
+        vim.keymap.set("n", "<leader>gb", gs.toggle_current_line_blame, { desc = "Blame Line" })
+        vim.keymap.set('v', 'hr', gs.reset_hunk, { buffer = bufnr, desc = '[h]unk [r]eset' })
       end,
     },
   },