neovim

commit 2bfb5ef12f604d1e1bfa48e9ac82db02b31ba8ac
parent 2c08e2ddfde185c2d8e095837e070d7cd0849214
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Tue, 28 Feb 2023 07:57:17 +0100

update

Diffstat:
M
after/plugin/color-picker.lua
 | 
4
++--
M
after/plugin/git.lua
 | 
48
+++++++++++-------------------------------------
M
after/plugin/telescope.lua
 | 
15
++++++++-------

3 files changed, 21 insertions(+), 46 deletions(-)
diff --git a/after/plugin/color-picker.lua b/after/plugin/color-picker.lua
@@ -4,5 +4,5 @@ end
 
 local opts = { noremap = true, silent = true }
 
-vim.keymap.set('n', '<C-c>', '<cmd>PickColor<cr>', opts)
-vim.keymap.set('i', '<C-c>', '<cmd>PickColorInsert<cr>', opts)
+vim.keymap.set('n', '<leader>c', '<cmd>PickColor<cr>', opts)
+vim.keymap.set('i', '<leader>c', '<cmd>PickColorInsert<cr>', opts)
diff --git a/after/plugin/git.lua b/after/plugin/git.lua
@@ -6,7 +6,6 @@ end
 
 local has_cmp_git, cmp_git = pcall(require, 'cmp_git')
 if has_cmp_git then
-
   local function filter_repo(git_info)
     -- dpgw issues are in one repo dpgw/dpgw
     if git_info.host == 'devel.bigroot.cz' then
@@ -48,6 +47,7 @@ if has_igit then
   })
 end
 
+require('gitsigns')
 local has_gsigns, gsigns = pcall(require, 'gitsigns')
 if has_gsigns then
   local get_theme = function()
@@ -86,42 +86,16 @@ if has_gsigns then
     keymaps = {},
   }
 
-  vim.keymap.set('n', '>c', function()
-    gsigns.next_hunk()
-  end, { desc = 'Git Next Hunk' })
-  vim.keymap.set('n', '>[', function()
-    gsigns.next_hunk()
-  end, { desc = 'Git Next Hunk' })
-  vim.keymap.set('n', '<c', function()
-    gsigns.prev_hunk()
-  end, { desc = 'Git Previous Hunk' })
-  vim.keymap.set('n', '<[', function()
-    gsigns.prev_hunk()
-  end, { desc = 'Git Previous Hunk' })
-  vim.keymap.set('n', '<leader>hs', function()
-    gsigns.stage_hunk()
-  end, { desc = 'Git Stage Hunk' })
-  vim.keymap.set('n', '<leader>hu', function()
-    gsigns.undo_stage_hunk()
-  end, { desc = 'Git Undo Stage Hunk' })
-  vim.keymap.set('n', '<leader>hr', function()
-    gsigns.reset_hunk()
-  end, { desc = 'Git Reset Hunk' })
-  vim.keymap.set('n', '<leader>hR', function()
-    gsigns.reset_buffer()
-  end, { desc = 'Git Reset Buffer' })
-  vim.keymap.set('n', '<leader>hp', function()
-    gsigns.preview_hunk()
-  end, { desc = 'Git Preview Hunk' })
-  vim.keymap.set('n', '<leader>hb', function()
-    gsigns.toggle_current_line_blame()
-  end, { desc = 'Git Toggle Blame Line' })
-  vim.keymap.set('n', '<leader>hl', function()
-    gsigns.toggle_linehl()
-  end, { desc = 'Git Highlight Lines' })
-  vim.keymap.set('n', '<leader>hn', function()
-    gsigns.toggle_numhl()
-  end, { desc = 'Git Highlight Num' })
+  vim.keymap.set('n', '<c-l><c-c>', gsigns.next_hunk, { desc = 'Git Next Hunk' })
+  vim.keymap.set('n', '<c-h><c-c>', gsigns.prev_hunk, { desc = 'Git Previous Hunk' })
+  vim.keymap.set('n', '<leader>hs', gsigns.stage_hunk, { desc = 'Git Stage Hunk' })
+  vim.keymap.set('n', '<leader>hu', gsigns.undo_stage_hunk, { desc = 'Git Undo Stage Hunk' })
+  vim.keymap.set('n', '<leader>hr', gsigns.reset_hunk, { desc = 'Git Reset Hunk' })
+  vim.keymap.set('n', '<leader>hR', gsigns.reset_buffer, { desc = 'Git Reset Buffer' })
+  vim.keymap.set('n', '<leader>hp', gsigns.preview_hunk, { desc = 'Git Preview Hunk' })
+  vim.keymap.set('n', '<leader>hb', gsigns.toggle_current_line_blame, { desc = 'Git Toggle Blame Line' })
+  vim.keymap.set('n', '<leader>hl', gsigns.toggle_linehl, { desc = 'Git Highlight Lines' })
+  vim.keymap.set('n', '<leader>hn', gsigns.toggle_numhl, { desc = 'Git Highlight Num' })
   vim.keymap.set('o', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
   vim.keymap.set('x', 'ig', ':<C-U>lua require("gitsigns").select_hunk()<cr>')
 end
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -6,12 +6,12 @@ local telescope = require('telescope')
 local actions = require('telescope.actions')
 
 telescope.setup {
-  defaults = { mappings = { i = { ['<esc>'] = actions.close, ['<c-y>'] = actions.select_default } } },
-  -- extensions = { fzy_native = { override_generic_sorter = false, override_file_sorter = true } },
+  defaults = { mappings = { i = { ['<esc>'] = actions.close,['<c-y>'] = actions.select_default } } },
+  extensions = { fzy_native = { override_generic_sorter = false, override_file_sorter = true } },
 }
 
 -- extensions
--- pcall(telescope.load_extension, 'fzy_native')
+pcall(telescope.load_extension, 'fzy_native')
 pcall(telescope.load_extension, 'dap')
 pcall(telescope.load_extension, 'zk')
 pcall(telescope.load_extension, 'git_worktree')
@@ -22,7 +22,7 @@ _ = pcall(telescope.load_extension, 'packer')
 
 local l = require('tms.p.telescope').L
 
-local builtin = function(name, theme)
+local function builtin(name, theme)
   return function()
     require('telescope.builtin')[name](theme)
   end
@@ -37,12 +37,13 @@ vim.keymap.set('n', '<space>p', require('telescope').extensions.packer.packer, {
 vim.keymap.set('n', '<space>c', builtin('git_status', l.dd_large()), { desc = 'Telescope Git Status' })
 vim.keymap.set('n', '<space>e', builtin('grep_string'), { desc = 'Telescope Grep String' })
 vim.keymap.set('n', '<space>l', builtin('current_buffer_fuzzy_find', l.dd_large_noprev()),
-               { desc = 'Telescope Buffer Lines' })
+  { desc = 'Telescope Buffer Lines' })
 vim.keymap.set('n', '<space>b', builtin('buffers', l.dd_large()), { desc = 'Telescope Buffers' })
 vim.keymap.set('n', '<space>h', builtin('help_tags'), { desc = 'Telescope Help Tags' })
 vim.keymap.set('n', '<space>d', builtin('diagnostics', l.dd_large()), { desc = 'Telescope Diagnostics' })
-vim.keymap.set('n', '<space>f', builtin('git_files', l.dd_large_noprev({ show_untracked = true })),
-               { desc = 'Telescope Find Files' })
+vim.keymap.set('n', '<space>f',
+  builtin('git_files', l.dd_large_noprev({ show_untracked = true, use_git_root = false })),
+  { desc = 'Telescope Find Files' })
 vim.keymap.set('n', '<space>F', function()
   local opts = l.dd_large_noprev()
   opts.no_ignore = true