From 94c332368f8e18cdb55cc763712c0783268e7773 Mon Sep 17 00:00:00 2001
From: "Kenneth Benzie (Benie)" <benie@infektor.net>
Date: Tue, 14 May 2024 22:33:50 +0100
Subject: [PATCH] Make most generic mappings silent

---
 lua/mappings.lua | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/lua/mappings.lua b/lua/mappings.lua
index f225e9c..3b31237 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -1,41 +1,42 @@
 vim.g.mapleader = ' '
 
+local opts = { remap = false, silent = true }
+
 -- Quick write
-vim.keymap.set('n', '<leader>w', ':w!<CR>', { remap = false })
+vim.keymap.set('n', '<leader>w', ':w!<CR>', opts)
 
 -- Treat long lines as line containing breaks
-vim.keymap.set('n', 'j', 'gj', { remap = false })
-vim.keymap.set('n', 'k', 'gk', { remap = false })
+vim.keymap.set('n', 'j', 'gj', opts)
+vim.keymap.set('n', 'k', 'gk', opts)
 
 vim.keymap.set('n', '<leader>tn', ':tabnew<Space>', { remap = false })
-vim.keymap.set('n', '<leader>tc', ':tabclose<CR>', { remap = false })
-vim.keymap.set('n', '<leader>to', ':tabonly<CR>', { remap = false })
 vim.keymap.set('n', '<leader>tm', ':tabmove<Space>', { remap = false })
+vim.keymap.set('n', '<leader>tc', ':tabclose<CR>', opts)
+vim.keymap.set('n', '<leader>to', ':tabonly<CR>', opts)
 
 -- Quickly access spelling menu
-vim.keymap.set('i', '<C-s>', '<C-g>u<C-X>s', { remap = false })
-vim.keymap.set('n', '<C-s>', 'i<C-g>u<C-X>s', { remap = false })
+vim.keymap.set('i', '<C-s>', '<C-g>u<C-X>s', opts)
+vim.keymap.set('n', '<C-s>', 'i<C-g>u<C-X>s', opts)
 
 -- Clear search highlights
-vim.keymap.set('n', '<leader><Space>', ':nohlsearch<CR>', { remap = false })
+vim.keymap.set('n', '<leader><Space>', ':nohlsearch<CR>', opts)
 
 -- Disable 'Q' from opening Ex mode
-vim.keymap.set('n', 'Q', '<nop>', { remap = false })
+vim.keymap.set('n', 'Q', '<nop>', opts)
 
 -- System clipboard yank/put
-vim.keymap.set('', '<leader>y', '"+y', { remap = false })
-vim.keymap.set('', '<leader>Y', '"+Y', { remap = false })
-vim.keymap.set('', '<leader>p', '"+p', { remap = false })
-vim.keymap.set('', '<leader>P', '"+P', { remap = false })
+vim.keymap.set('', '<leader>y', '"+y', opts)
+vim.keymap.set('', '<leader>Y', '"+Y', opts)
+vim.keymap.set('', '<leader>p', '"+p', opts)
+vim.keymap.set('', '<leader>P', '"+P', opts)
 
 -- Undo neovim's default mapping of Y to y$
 vim.cmd.unmap('Y')
 
 -- Make nvim :terminal more like vim :terminal
-vim.keymap.set('t', '<C-w>N', '<C-\\><C-n>', { remap = true })
+vim.keymap.set('t', '<C-w>N', '<C-\\><C-n>', opts)
 
 -- Mappings to make navigating :Termdebug
-local opts = { remap = false, silent = true }
 vim.keymap.set('n', '<C-w><C-g>', ':Gdb<CR>:startinsert<CR>', opts)
 vim.keymap.set('n', '<C-w><C-e>', ':Program<CR>', opts)
 vim.keymap.set('n', '<C-w><C-s>', ':Source<CR>', opts)