leap

programs/nvim/config.lua

@@ -12,7 +12,7 @@ vim.filetype.add({
 local keymap = vim.api.nvim_set_keymap
 local opts = { noremap = true, silent = true }
 local builtin = require('telescope.builtin')
-  
+
 -- comment
 local esc = vim.api.nvim_replace_termcodes(
     '<ESC>', true, false, true
@@ -26,28 +26,16 @@ vim.keymap.set("x", "<C-_>", function()
     api.toggle.linewise(vim.fn.visualmode())
 end, { remap = true })
 
-
+vim.cmd([[
+  inoremap <silent> <F1> <CMD>FloatermToggle<CR>
+  nnoremap <silent> <F1> <CMD>FloatermToggle<CR>
+  tnoremap <silent> <F1> <C-\><C-n><CMD>FloatermToggle<CR>
+]])
 
 vim.keymap.set('n', 'gr', (function() builtin.lsp_references({}) end), {})
 vim.keymap.set('n', 'gd', (function() builtin.lsp_definitions({}) end), {})
 vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({}) end), {})
 vim.keymap.set('n', 'gi', (function() builtin.lsp_implementations({}) end), {})
--- vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {})
-
-
-
--- local function close_floating()
---   for _, win in ipairs(vim.api.nvim_list_wins()) do
---     local config = vim.api.nvim_win_get_config(win)
---     if config.relative ~= "" then
---       vim.api.nvim_win_close(win, false)
---     end
---   end
--- end
---
--- vim.keymap.set("n", "<Esc>", close_floating, { desc = "Close floats, clear highlights" })
-
-local builtin = require('telescope.builtin')
 
 vim.keymap.set("n", "<leader>x", require("telescope.builtin").resume, {
   noremap = true,
@@ -55,11 +43,35 @@ vim.keymap.set("n", "<leader>x", require("telescope.builtin").resume, {
   desc = "Resume",
 })
 
+require("telescope").setup {
+  extensions = {
+    file_browser = {
+      hijack_netrw = true,
+    },
+  },
+}
+require("telescope").load_extension "file_browser"
+
 -- local gitsigns = require('gitsigns')
 -- vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk)
 -- vim.keymap.set('n', '<leader>gd', gitsigns.diffthis)
 -- vim.keymap.set({'o', 'x'}, 'ig', ':<C-U>Gitsigns select_hunk<CR>')
 
+-- leap
+leap = require('leap')
+vim.keymap.set({'n', 'x', 'o'}, 's', '<Plug>(leap)')
+vim.keymap.set({'n', 'x', 'o'}, 'S',  function()
+  require('leap.treesitter').select {
+    opts = require('leap.user').with_traversal_keys('S', 's')
+  }
+end)
+leap.opts.preview = function(ch0, ch1, ch2)
+  return not (
+    ch1:match('%s')
+    or (ch0:match('%a') and ch1:match('%a') and ch2:match('%a'))
+  )
+end
+leap.opts.labels = ''
 
 -- better search
 vim.cmd([[
@@ -94,12 +106,6 @@ vim.cmd([[
   nnoremap <silent> g* g*zz
 ]])
 
-vim.cmd([[
-  inoremap <silent> <F1> <CMD>FloatermToggle<CR>
-  nnoremap <silent> <F1> <CMD>FloatermToggle<CR>
-  tnoremap <silent> <F1> <C-\><C-n><CMD>FloatermToggle<CR>
-]])
-
 vim.cmd([[
     let g:suda_smart_edit = 1
     filetype plugin indent on
@@ -112,10 +118,11 @@ vim.g.VM_mouse_mappings = 1
 vim.g.VM_reselect_first = 1
 vim.g.VM_notify_previously_selected = 1
 vim.g.VM_theme = "iceblue"
--- vim.g.VM_maps["Undo"] = 'u'
--- vim.g.VM_maps["Redo"] = '<C-r>'
-
 
+vim.cmd([[
+    command Cdc cd %:p:h
+    command Ddr cd %:h | cd `git rev-parse --show-toplevel`
+]])
 
 -- workaround for rust-analyzer server cancelled request
 for _, method in ipairs { 'textDocument/diagnostic', 'workspace/diagnostic' } do