up

lua/custom/keymaps/buffers.lua

@@ -1,27 +1,35 @@
 -- Neo-tree mappings
 --
 
-local wk = require 'which-key'
-local bufremove = require 'mini.bufremove'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
+
+local status_mbr, mbr = pcall(require, 'mini.bufremove')
+if not status_mbr then
+  return
+end
 
 wk.add {
   { '<leader>b', group = '[b]uffers' }, -- group
   {
     mode = { 'n', 'v', 'i' },
-    { '<leader>bd', bufremove.delete, desc = '[d]elete buffer', silent = true },
-    { '<leader>bl', '<CMD>Neotree buffers<CR>', desc = '[l]ist buffers ', silent = true },
-    { '<leader>bs', '<CMD>source %<CR>', desc = '[s]ource buffer', silent = true },
-    { '<leader>bw', '<CMD>w<CR>', desc = '[w]rite buffer', silent = true },
-    { '<leader>bp', '<CMD>bprevious<CR>', desc = '[p]revious buffer', silent = true },
-    { '<leader>bn', '<CMD>bnext<CR>', desc = '[n]ext buffer', silent = true },
+    { '<leader>bd', mbr.delete, desc = '[d]elete buffer', noremap = true, silent = true },
+    { '<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 },
+    { '<leader>bp', '<CMD>bprevious<CR>', desc = '[p]revious buffer', noremap = true, silent = true },
+    { '<leader>bn', '<CMD>bnext<CR>', desc = '[n]ext buffer', noremap = true, silent = true },
 
-    { '<C-PageUp>', '<CMD>bprevious<CR>', desc = 'Previous buffer', silent = true, hidden = true },
-    { '<C-PageDown>', '<CMD>bnext<CR>', desc = 'Next buffer', silent = true, hidden = true },
+    { '<C-PageUp>', '<CMD>bprevious<CR>', desc = 'Previous buffer', noremap = true, silent = true, hidden = true },
+    { '<C-PageDown>', '<CMD>bnext<CR>', desc = 'Next buffer', noremap = true, silent = true, hidden = true },
   },
   {
-    mode = { 'n', 'v' },
-    { '<C-c>', bufremove.delete, desc = 'Delete buffer', silent = true, hidden = true },
-    { '<C-s>', '<CMD>w<CR>', desc = 'Save buffer', silent = true, hidden = true },
+    mode = { 'n', 'v', 'i' },
+    -- mapping runs here as which-key intercepts ctrl-z signal before term
+    { '<C-c>', mbr.delete, desc = 'Delete buffer', noremap = true, silent = true, hidden = true },
+    { '<C-s>', '<CMD>w<CR><ESC>', desc = 'Save buffer', noremap = true, silent = true, hidden = true },
   },
 }
 

lua/custom/keymaps/edit.lua

@@ -1,12 +1,17 @@
 -- Edition mappings
 --
 
-local wk = require 'which-key'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
 
 wk.add {
-  mode = { 'n', 'v', 'i' },
-  -- mapping runs here as which-key intercepts ctrl-z signal before term
-  { '<C-z>', '<CMD>undo<CR>', desc = 'Undo', silent = true, noremap = true, hidden = true },
+  {
+    mode = { 'n', 'v', 'i' },
+    -- mapping runs here as which-key intercepts ctrl-z signal before term
+    { '<C-z>', '<CMD>undo<CR>', desc = 'Undo', silent = true, noremap = true, hidden = true },
+  },
 }
 
 -- The line beneath this is called `modeline`. See `:help modeline`

lua/custom/keymaps/files.lua

@@ -1,17 +1,24 @@
 -- Neo-tree mappings
 --
 
-local wk = require 'which-key'
-local neotree_helper = require 'custom.plugins.neotree-helper'
+local status_wk, wk = pcall(require, 'which-key')
+if not status_wk then
+  return
+end
+
+local status_nth, nth = pcall(require, 'custom.plugins.neotree-helper')
+if not status_nth then
+  return
+end
 
 wk.add {
   {
     mode = { 'n', 'v', 'i' },
-    { '<leader>e', neotree_helper.smart_open, desc = 'File [e]xplorer', silent = true, noremap = true },
+    { '<leader>e', nth.smart_open, desc = 'File [e]xplorer', silent = true, noremap = true },
   },
   {
     mode = { 'n', 'v' },
-    { '<C-e>', neotree_helper.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true },
+    { '<C-e>', nth.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true },
   },
 }
 

lua/custom/keymaps/general.lua

@@ -1,9 +1,12 @@
 -- General mappings
 --
 
-local key = require 'custom.plugins.keymaps-helper'
+local status_kh, kh = pcall(require, 'custom.plugins.keymaps-helper')
+if not status_kh then
+  return
+end
 
-key.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/init.lua

@@ -7,7 +7,6 @@ require 'custom.keymaps.buffers'
 require 'custom.keymaps.files'
 require 'custom.keymaps.edit'
 require 'custom.keymaps.display'
-require 'custom.keymaps.quarto'
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et

lua/custom/keymaps/quarto.lua

@@ -1,13 +0,0 @@
--- Quarto mappings
---
-
-local wk = require 'which-key'
-
-wk.add {
-  mode = { 'n', 'v', 'i' },
-  { '<leader>q', group = '[q]uarto' }, -- group
-  { '<leader>qp', '<CMD>QuartoPreview<CR>', desc = '[p]review quarto' },
-}
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et