From c9395198b6920d0d806af582ed67a9bad771ba64 Mon Sep 17 00:00:00 2001 From: Jeff LANCE Date: Sun, 7 Sep 2025 12:13:29 +0200 Subject: [PATCH] up --- lua/custom/keymaps/buffers.lua | 32 +++++++++++++------------------- lua/custom/keymaps/edit.lua | 2 +- lua/custom/keymaps/explore.lua | 7 ++++--- lua/custom/keymaps/obsidian.lua | 6 ++++-- lua/custom/keymaps/terminal.lua | 12 +++++++----- lua/kickstart/plugins/bbye.lua | 6 +++++- lua/kickstart/plugins/latex.lua | 1 + 7 files changed, 35 insertions(+), 31 deletions(-) diff --git a/lua/custom/keymaps/buffers.lua b/lua/custom/keymaps/buffers.lua index ffb2798..acbaf66 100644 --- a/lua/custom/keymaps/buffers.lua +++ b/lua/custom/keymaps/buffers.lua @@ -6,44 +6,38 @@ if not status_wk then return end -local status_mbr, mbr = pcall(require, 'mini.bufremove') -if not status_mbr then - return -end - local status_tele, tele = pcall(require, 'telescope.builtin') if not status_tele then return end +local opts = { noremap = true, silent = true } + wk.add { { - mode = { 'n', 'v', 'i' }, - -- { 'bd', mbr.delete, desc = '[d]elete buffer', noremap = true, silent = true }, + mode = { 'n', 'v' }, { 'bF', function() require('conform').format { async = true, lsp_format = 'fallback' } end, desc = '[F]ormat buffer', - noremap = true, - silent = true, + opts, }, { 'bf', tele.buffers, desc = '[f]ind existing buffers' }, - { 'bl', 'Neotree buffers', desc = '[l]ist buffers ', noremap = true, silent = true }, - { 'bs', 'source %', desc = '[s]ource buffer', noremap = true, silent = true }, - { 'bw', 'w', desc = '[w]rite buffer', noremap = true, silent = true }, - { 'bp', 'bprevious', desc = '[p]revious buffer', noremap = true, silent = true }, - { 'bn', 'bnext', desc = '[n]ext buffer', noremap = true, silent = true }, - - { '', 'bprevious', desc = 'Previous buffer', noremap = true, silent = true, hidden = true }, - { '', 'bnext', desc = 'Next buffer', noremap = true, silent = true, hidden = true }, + { 'bl', 'Neotree buffers', desc = '[l]ist buffers ', opts }, + { 'bs', 'source %', desc = '[s]ource buffer', opts }, + { 'bw', 'w', desc = '[w]rite buffer', opts }, + { 'bp', 'bprevious', desc = '[p]revious buffer', opts }, + { 'bn', 'bnext', desc = '[n]ext buffer', opts }, }, { mode = { 'n', 'v', 'i' }, -- mapping runs here as which-key intercepts ctrl-z signal before term - { '', 'Bdelete', desc = 'Close current buffer', noremap = true, silent = true, hidden = true }, - { '', 'w', desc = 'Save buffer', noremap = true, silent = true, hidden = true }, + { '', 'w', desc = 'Save buffer', opts, hidden = true }, + + { '', 'bprevious', desc = 'Previous buffer', opts, hidden = true }, + { '', 'bnext', desc = 'Next buffer', opts, hidden = true }, }, } diff --git a/lua/custom/keymaps/edit.lua b/lua/custom/keymaps/edit.lua index e7d1a34..b8e5e15 100644 --- a/lua/custom/keymaps/edit.lua +++ b/lua/custom/keymaps/edit.lua @@ -6,7 +6,7 @@ if not status_kh then return end -kh.map({ 'n', 'v', 'i' }, '', 'undo', { silent = true, noremap = true, desc = 'Undo' }) +kh.map({ 'n', 'v', 'i' }, '', 'undo', { noremap = true, silent = true, desc = 'Undo' }) -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/custom/keymaps/explore.lua b/lua/custom/keymaps/explore.lua index c0fd8a6..c2394ea 100644 --- a/lua/custom/keymaps/explore.lua +++ b/lua/custom/keymaps/explore.lua @@ -11,6 +11,8 @@ if not status_nth then return end +local opts = { noremap = true, silent = true } + wk.add { { mode = { 'n', 'v' }, @@ -19,13 +21,12 @@ wk.add { 'ec', 'Neotree position=left toggle dir=' .. os.getenv 'XDG_CONFIG_HOME' .. '/nvim', desc = 'explore [c]onfiguration files', - silent = true, - noremap = true, + opts, }, }, { mode = { 'n', 'v', 'i' }, - { '', nth.smart_open, desc = 'File explorer', silent = true, noremap = true, hidden = true }, + { '', nth.smart_open, desc = 'File explorer', opts, hidden = true }, }, } diff --git a/lua/custom/keymaps/obsidian.lua b/lua/custom/keymaps/obsidian.lua index d3469d1..cc7fc48 100644 --- a/lua/custom/keymaps/obsidian.lua +++ b/lua/custom/keymaps/obsidian.lua @@ -6,11 +6,13 @@ if not status_wk then return end +local opts = { silent = true, noremap = true } + wk.add { { mode = { 'n', 'v', 'i' }, - { 'on', 'Obsidian new', desc = 'create [n]ew note', silent = true, noremap = true }, - { 'os', 'Obsidian search', desc = '[s]earch note', silent = true, noremap = true }, + { 'on', 'Obsidian new', desc = 'create [n]ew note', opts }, + { 'os', 'Obsidian search', desc = '[s]earch note', opts }, }, } diff --git a/lua/custom/keymaps/terminal.lua b/lua/custom/keymaps/terminal.lua index d5001d4..ea358ea 100644 --- a/lua/custom/keymaps/terminal.lua +++ b/lua/custom/keymaps/terminal.lua @@ -11,14 +11,16 @@ if not status_th then return end +local opts = { silent = true, noremap = true } + wk.add { { mode = { 'n', 'v', 'i' }, - { 'Ti', th.new_terminal_ipython, desc = 'new [i]python terminal', silent = true, noremap = true }, - { 'Tj', th.new_terminal_julia, desc = 'new [j]ulia terminal', silent = true, noremap = true }, - { 'Ts', th.new_terminal_shell, desc = 'new terminal with [s]hell', silent = true, noremap = true }, - { 'Tp', th.new_terminal_python, desc = 'new [p]ython terminal', silent = true, noremap = true }, - { 'TR', th.new_terminal_r, desc = 'new [R] terminal', silent = true, noremap = true }, + { 'Ti', th.new_terminal_ipython, desc = 'new [i]python terminal', opts }, + { 'Tj', th.new_terminal_julia, desc = 'new [j]ulia terminal', opts }, + { 'Ts', th.new_terminal_shell, desc = 'new terminal with [s]hell', opts }, + { 'Tp', th.new_terminal_python, desc = 'new [p]ython terminal', opts }, + { 'TR', th.new_terminal_r, desc = 'new [R] terminal', opts }, }, } diff --git a/lua/kickstart/plugins/bbye.lua b/lua/kickstart/plugins/bbye.lua index fa7a359..bdafb37 100644 --- a/lua/kickstart/plugins/bbye.lua +++ b/lua/kickstart/plugins/bbye.lua @@ -5,16 +5,20 @@ -- https://github.com/moll/vim-bbye -- +local opts = { silent = true, noremap = true } + return { { 'moll/vim-bbye', keys = { - { 'bc', 'Bdelete', desc = '[c]lose current buffer' }, + { 'bc', 'Bdelete', desc = '[c]lose current buffer', opts }, { 'bC', 'bufdo :Bdelete', desc = '[C]lose all buffers', + opts, }, + { '', 'Bdelete', desc = 'Close current buffer', opts, hidden = true }, }, }, } diff --git a/lua/kickstart/plugins/latex.lua b/lua/kickstart/plugins/latex.lua index 08cc198..c92ff22 100644 --- a/lua/kickstart/plugins/latex.lua +++ b/lua/kickstart/plugins/latex.lua @@ -13,6 +13,7 @@ return { lazy = false, -- lazy-loading will disable inverse search config = function() vim.g.vimtex_mappings_disable = { ['n'] = { 'K' } } -- disable `K` as it conflicts with LSP hover + vim.g.vimtex_mappings_enabled = false vim.g.vimtex_quickfix_method = vim.fn.executable 'pplatex' == 1 and 'pplatex' or 'latexlog' end, -- keys = {