up

lua/custom/keymaps/buffers.lua

@@ -1,4 +1,4 @@
--- Neo-tree mappings
+-- Buffer group mappings
 --
 
 local status_wk, wk = pcall(require, 'which-key')
@@ -11,11 +11,25 @@ if not status_mbr then
   return
 end
 
+local status_tele, tele = pcall(require, 'telescope.builtin')
+if not status_tele then
+  return
+end
+
 wk.add {
-  { '<leader>b', group = '[b]uffers' }, -- group
   {
     mode = { 'n', 'v', 'i' },
     { '<leader>bd', mbr.delete, desc = '[d]elete buffer', noremap = true, silent = true },
+    {
+      '<leader>bF',
+      function()
+        require('conform').format { async = true, lsp_format = 'fallback' }
+      end,
+      desc = '[F]ormat buffer',
+      noremap = true,
+      silent = true,
+    },
+    { '<leader>bf', tele.buffers, desc = '[f]ind existing buffers' },
     { '<leader>bl', '<CMD>Neotree buffers<CR>', desc = '[l]ist buffers ', noremap = true, silent = true },
     { '<leader>bs', '<CMD>source %<CR>', desc = '[s]ource buffer', noremap = true, silent = true },
     { '<leader>bw', '<CMD>w<CR>', desc = '[w]rite buffer', noremap = true, silent = true },

lua/custom/keymaps/display.lua

@@ -1,12 +0,0 @@
--- Display mappings
---
-
-local wk = require 'which-key'
-
-wk.add {
-  mode = { 'n', 'v', 'i' },
-  { '<leader>d', group = '[d]isplay' }, -- group
-}
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/files.lua

@@ -13,11 +13,18 @@ end
 
 wk.add {
   {
-    mode = { 'n', 'v', 'i' },
-    { '<leader>e', nth.smart_open, desc = 'File [e]xplorer', silent = true, noremap = true },
+    mode = { 'n', 'v' },
+    { '<leader>ef', nth.smart_open, desc = 'explore [f]iles', silent = true, noremap = true },
+    {
+      '<leader>ec',
+      '<CMD>Neotree position=left toggle dir=' .. os.getenv 'XDG_CONFIG_HOME' .. '/nvim<CR>',
+      desc = 'explore [c]onfiguration files',
+      silent = true,
+      noremap = true,
+    },
   },
   {
-    mode = { 'n', 'v' },
+    mode = { 'n', 'v', 'i' },
     { '<C-e>', nth.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true },
   },
 }

lua/custom/keymaps/general.lua

@@ -6,7 +6,7 @@ if not status_kh then
   return
 end
 
-kh.map({ 'n', 'v', 'i' }, '<leader>q', '<CMD>qall<CR>', { silent = true, noremap = true, desc = '[Q]uit all' })
+kh.map({ 'n', 'v', 'i' }, '<leader>Q', '<CMD>qall<CR>', { silent = true, noremap = true, desc = '[Q]uit all' })
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/groups.lua

@@ -0,0 +1,25 @@
+-- Key mappings groups
+--
+
+local wk = require 'which-key'
+
+wk.add {
+  {
+    {
+      mode = { 'n' },
+      { '<leader>s', group = '[s]earch' },
+      { '<leader>t', group = '[t]oggles' },
+    },
+
+    {
+      mode = { 'n', 'v' },
+      { '<leader>e', group = '[e]xplore' },
+      { '<leader>b', group = '[b]uffers' },
+      { '<leader>g', group = '[g]it hunk' },
+    },
+  },
+  {},
+}
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/init.lua

@@ -2,11 +2,13 @@
 --
 
 require 'custom.keymaps.nop'
+require 'custom.keymaps.groups'
 require 'custom.keymaps.general'
 require 'custom.keymaps.buffers'
 require 'custom.keymaps.files'
 require 'custom.keymaps.edit'
-require 'custom.keymaps.display'
+require 'custom.keymaps.search'
+require 'custom.keymaps.toggles'
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/search.lua

@@ -0,0 +1,53 @@
+-- Search group mappings
+--
+
+local wk = require 'which-key'
+local tele = require 'telescope.builtin'
+
+wk.add {
+  mode = { 'n' },
+  { '<leader>sh', tele.help_tags, desc = 'search [h]elp' },
+  { '<leader>sk', tele.keymaps, desc = 'search [k]eymaps' },
+  { '<leader>sf', tele.find_files, desc = 'search [f]iles' },
+  { '<leader>ss', tele.builtin, desc = 'search [s]elect Telescope' },
+  { '<leader>sw', tele.grep_string, desc = 'search current [w]ord' },
+  { '<leader>sg', tele.live_grep, desc = 'search by [g]rep' },
+  { '<leader>sd', tele.diagnostics, desc = 'search [d]iagnostics' },
+  { '<leader>sr', tele.resume, desc = 'search [r]esume' },
+  { '<leader>s.', tele.oldfiles, desc = '[.] search recent Files ("." for repeat)' },
+  -- Slightly advanced example of overriding default behavior and theme
+  {
+    '<leader>/',
+    function()
+      -- You can pass additional configuration to Telescope to change the theme, layout, etc.
+      tele.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
+        winblend = 10,
+        previewer = false,
+      })
+    end,
+    desc = '[/] fuzzily search in current buffer',
+  },
+  -- It's also possible to pass additional configuration options.
+  --  See `:help telescope.builtin.live_grep()` for information about particular keys
+  {
+    '<leader>s/',
+    function()
+      tele.live_grep {
+        grep_open_files = true,
+        prompt_title = 'Live Grep in Open Files',
+      }
+    end,
+    desc = '[/] search in Open Files',
+  },
+  -- Shortcut for searching your Neovim configuration files
+  {
+    '<leader>sn',
+    function()
+      tele.find_files { cwd = vim.fn.stdpath 'config' }
+    end,
+    desc = 'search [n]eovim files',
+  },
+}
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/toggles.lua

@@ -0,0 +1,15 @@
+-- Toggles group mappings
+--
+
+local wk = require 'which-key'
+local gitsigns = require 'gitsigns'
+
+wk.add {
+  mode = { 'n' },
+  -- gitsigns
+  { '<leader>tb', gitsigns.toggle_current_line_blame, desc = 'toggle git show [b]lame line' },
+  { '<leader>tD', gitsigns.preview_hunk_inline, desc = 'toggle git show [D]eleted' },
+}
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et