From 5479675b90e829dc7174da998017c908c5d0d90c Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Sat, 15 Oct 2022 09:03:54 +0100
Subject: [PATCH] chore: update keymappings file

---
 neovim/init.lua            |  2 +-
 neovim/lua/keybindings.lua | 74 --------------------------------------
 neovim/lua/keymappings.lua | 72 +++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 75 deletions(-)
 delete mode 100644 neovim/lua/keybindings.lua
 create mode 100644 neovim/lua/keymappings.lua

diff --git a/neovim/init.lua b/neovim/init.lua
index 9c5d0cc..4ab6629 100644
--- a/neovim/init.lua
+++ b/neovim/init.lua
@@ -1,3 +1,3 @@
 require("plugins")
 require("options")
-require("keybindings")
+require("keymappings")
diff --git a/neovim/lua/keybindings.lua b/neovim/lua/keybindings.lua
deleted file mode 100644
index 3339647..0000000
--- a/neovim/lua/keybindings.lua
+++ /dev/null
@@ -1,74 +0,0 @@
-local function t(str)
-    return vim.api.nvim_replace_termcodes(str, true, true, true)
-end
-
-function _G.smart_tab()
-    return vim.fn.pumvisible() == 1 and t'<C-n>' or t'<TAB>'
-end
-
-function _G.reverse_smart_tab()
-    return vim.fn.pumvisible() == 1 and t'<C-p>' or t'<TAB>'
-end
-
-local keybind = vim.api.nvim_set_keymap
-
--- Disable arrow key navigation
-keybind("n", "<Up>", "<Nop>", { noremap = true })
-keybind("n", "<Down>", "<Nop>", { noremap = true })
-keybind("n", "<Left>", "<Nop>", { noremap = true })
-keybind("n", "<Right>", "<Nop>", { noremap = true })
-
-keybind("i", "<Up>", "<Nop>", { noremap = true })
-keybind("i", "<Down>", "<Nop>", { noremap = true })
-keybind("i", "<Left>", "<Nop>", { noremap = true })
-keybind("i", "<Right>", "<Nop>", { noremap = true })
-
-keybind("v", "<Up>", "<Nop>", { noremap = true })
-keybind("v", "<Down>", "<Nop>", { noremap = true })
-keybind("v", "<Left>", "<Nop>", { noremap = true })
-keybind("v", "<Right>", "<Nop>", { noremap = true })
-
--- Copy and paste to/from the OS clipboard
-keybind("n", "<leader>y", "\"+y", { noremap = true})
-keybind("n", "<leader>yy", "\"+yy", { noremap = true})
-keybind("v", "<leader>y", "\"+y", { noremap = true})
-
-keybind("n", "<leader>p", "\"+p", { noremap = true})
-keybind("n", "<leader>P", "\"+P", { noremap = true})
-keybind("v", "<leader>p", "\"+p", { noremap = true})
-keybind("v", "<leader>P", "\"+P\"`\"`", { noremap = true})
-
--- copy the whole file to the OS clipboard
-keybind("n", "<leader>c", ":%y+<CR>", { noremap = true})
-
--- Control buffer splits
-keybind("n", "<C-l>", ":vert resize +5<CR>", { noremap = true })
-keybind("n", "<C-h>", ":vert resize -5<CR>", { noremap = true })
-keybind("n", "<C-k>", ":resize -5<CR>", { noremap = true })
-keybind("n", "<C-j>", ":resize +5<CR>", { noremap = true })
-
--- Add matching curly brace
-keybind("i", "\\{", "{<cr>}<ESC>O", { noremap = true })
-keybind("i", ">{", "{}<ESC>a", { noremap = true })
-keybind("i", "<{", "{}<ESC>i", { noremap = true })
-
--- Add matching parenthesis
-keybind("i", "\\(", "(<cr>)<ESC>O", { noremap = true })
-keybind("i", ">(", "()<ESC>a", { noremap = true })
-keybind("i", "<(", "()<ESC>i", { noremap = true })
-
--- Add matching square brace
-keybind("i", "\\[", "[<cr>]<ESC>O", { noremap = true })
-keybind("i", ">[", "[]<ESC>a", { noremap = true })
-keybind("i", "<[", "[]<ESC>i", { noremap = true })
-
--- Use the TAB key to cycle through the autocompletion popup menu
-keybind("i", "<TAB>", "v:lua.smart_tab()", { expr = true, noremap = true })
-keybind("i", "<S-TAB>", "v:lua.reverse_smart_tab()", { expr = true, noremap = true })
-
--- Use CTRL+Space to open the autocompletion popup menu
-keybind("i", "<C-SPACE>", "<C-x><C-o>", { noremap = true })
-
--- Bufferline
-keybind("n", "<leader>bn", ":BufferLineCycleNext<CR>", { noremap = true})
-keybind("n", "<leader>bp", ":BufferLineCyclePrev<CR>", { noremap = true})
diff --git a/neovim/lua/keymappings.lua b/neovim/lua/keymappings.lua
new file mode 100644
index 0000000..8b03f8b
--- /dev/null
+++ b/neovim/lua/keymappings.lua
@@ -0,0 +1,72 @@
+local function t(str)
+    return vim.api.nvim_replace_termcodes(str, true, true, true)
+end
+
+function _G.smart_tab()
+    return vim.fn.pumvisible() == 1 and t'<C-n>' or t'<TAB>'
+end
+
+function _G.reverse_smart_tab()
+    return vim.fn.pumvisible() == 1 and t'<C-p>' or t'<TAB>'
+end
+
+-- Disable arrow key navigation
+vim.keymap.set("n", "<Up>", "<Nop>", { noremap = true })
+vim.keymap.set("n", "<Down>", "<Nop>", { noremap = true })
+vim.keymap.set("n", "<Left>", "<Nop>", { noremap = true })
+vim.keymap.set("n", "<Right>", "<Nop>", { noremap = true })
+
+vim.keymap.set("i", "<Up>", "<Nop>", { noremap = true })
+vim.keymap.set("i", "<Down>", "<Nop>", { noremap = true })
+vim.keymap.set("i", "<Left>", "<Nop>", { noremap = true })
+vim.keymap.set("i", "<Right>", "<Nop>", { noremap = true })
+
+vim.keymap.set("v", "<Up>", "<Nop>", { noremap = true })
+vim.keymap.set("v", "<Down>", "<Nop>", { noremap = true })
+vim.keymap.set("v", "<Left>", "<Nop>", { noremap = true })
+vim.keymap.set("v", "<Right>", "<Nop>", { noremap = true })
+
+-- Copy and paste to/from the OS clipboard
+vim.keymap.set("n", "<leader>y", "\"+y", { noremap = true})
+vim.keymap.set("n", "<leader>yy", "\"+yy", { noremap = true})
+vim.keymap.set("v", "<leader>y", "\"+y", { noremap = true})
+
+vim.keymap.set("n", "<leader>p", "\"+p", { noremap = true})
+vim.keymap.set("n", "<leader>P", "\"+P", { noremap = true})
+vim.keymap.set("v", "<leader>p", "\"+p", { noremap = true})
+vim.keymap.set("v", "<leader>P", "\"+P\"`\"`", { noremap = true})
+
+-- copy the whole file to the OS clipboard
+vim.keymap.set("n", "<leader>c", ":%y+<CR>", { noremap = true})
+
+-- Control buffer splits
+vim.keymap.set("n", "<C-l>", ":vert resize +5<CR>", { noremap = true })
+vim.keymap.set("n", "<C-h>", ":vert resize -5<CR>", { noremap = true })
+vim.keymap.set("n", "<C-k>", ":resize -5<CR>", { noremap = true })
+vim.keymap.set("n", "<C-j>", ":resize +5<CR>", { noremap = true })
+
+-- Add matching curly brace
+vim.keymap.set("i", "\\{", "{<cr>}<ESC>O", { noremap = true })
+vim.keymap.set("i", ">{", "{}<ESC>a", { noremap = true })
+vim.keymap.set("i", "<{", "{}<ESC>i", { noremap = true })
+
+-- Add matching parenthesis
+vim.keymap.set("i", "\\(", "(<cr>)<ESC>O", { noremap = true })
+vim.keymap.set("i", ">(", "()<ESC>a", { noremap = true })
+vim.keymap.set("i", "<(", "()<ESC>i", { noremap = true })
+
+-- Add matching square brace
+vim.keymap.set("i", "\\[", "[<cr>]<ESC>O", { noremap = true })
+vim.keymap.set("i", ">[", "[]<ESC>a", { noremap = true })
+vim.keymap.set("i", "<[", "[]<ESC>i", { noremap = true })
+
+-- Use the TAB key to cycle through the autocompletion popup menu
+vim.keymap.set("i", "<TAB>", "v:lua.smart_tab()", { expr = true, noremap = true })
+vim.keymap.set("i", "<S-TAB>", "v:lua.reverse_smart_tab()", { expr = true, noremap = true })
+
+-- Use CTRL+Space to open the autocompletion popup menu
+vim.keymap.set("i", "<C-SPACE>", "<C-x><C-o>", { noremap = true })
+
+-- Bufferline
+vim.keymap.set("n", "<leader>bn", ":BufferLineCycleNext<CR>", { noremap = true})
+vim.keymap.set("n", "<leader>bp", ":BufferLineCyclePrev<CR>", { noremap = true})