From bbbd416de5eb973243c5c15d6b4ae23a44a7302f Mon Sep 17 00:00:00 2001
From: Fabrice Mouhartem <fabrice.mouhartem@ens-lyon.org>
Date: Sun, 24 Dec 2023 22:08:52 +0100
Subject: [PATCH] mappings: add <esc> working in terminal mode + <leader>y to
 copy

+ rename vim.keymap.set with keymap
---
 lua/mappings.lua | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/lua/mappings.lua b/lua/mappings.lua
index 76880e0..ec2e89f 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -3,36 +3,37 @@ local map_list = {
   ["gi"] = ":bprevious", ["ge"] = ":bnext",
   ["W"] = ":w", ["<C-t>"] = ":tabnew",
 }
-for key, binding in pairs(map_list) do
-  vim.api.nvim_set_keymap("n", key, binding .. "<CR>", {noremap = true, silent = true})
-end
 
--- spelling maps
-vim.api.nvim_set_keymap("n", "<Leader>s", "mz[s1z=`z", {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", "à", "]s", {noremap = true, silent = true})
+local keymap = vim.keymap.set
+
+for key, binding in pairs(map_list) do
+  keymap("n", key, binding .. "<CR>", {noremap = true, silent = true})
+end
 
 -- [[ kickstart.nvim ]]
 -- Keymaps for better default experience
--- See `:help vim.keymap.set()`
-vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
+-- See `:help remap()`
+keymap({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 
 -- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+keymap('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+keymap('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 
 -- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
+keymap('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
+keymap('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
+keymap('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
+keymap('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 
-vim.api.nvim_set_keymap("n", "<Leader>y", '"+y', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("v", "<Leader>y", '"+y', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("n", "<Leader>pp", '"+p', {noremap = true, silent = true})
-vim.api.nvim_set_keymap("v", "<Leader>pp", '"+p', {noremap = true, silent = true})
+keymap("n", "<Leader>y", '"+y', {noremap = true, silent = true})
+keymap("v", "<Leader>y", '"+y', {noremap = true, silent = true})
+keymap("n", "<Leader>p", '"+p', {noremap = true, silent = true})
+keymap("v", "<Leader>p", '"+p', {noremap = true, silent = true})
 
 -- z0…z9 to open folds to a certain level
-
 for i=0,9 do
-	vim.api.nvim_set_keymap('n', 'z' .. i , ':set fdl=' .. i .. '<CR>', {noremap = true, silent = false})
+  keymap('n', 'z' .. i , ':set fdl=' .. i .. '<CR>', {noremap = true, silent = false})
 end
+
+-- in :terminal esc exits edit mode
+keymap('t', '<Esc>', '<C-\\><C-n>', {noremap = true, silent = true})