From 12dc145d06742ee81b2fcf49bd1e98cc95e59eb9 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 30 Jan 2021 23:58:52 +0200
Subject: [PATCH] Fix completion keybinds

---
 home/.config/nvim/lua/keybinds.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/home/.config/nvim/lua/keybinds.lua b/home/.config/nvim/lua/keybinds.lua
index 2ddf29d9..f60256d1 100644
--- a/home/.config/nvim/lua/keybinds.lua
+++ b/home/.config/nvim/lua/keybinds.lua
@@ -1,6 +1,7 @@
-local map = function(type, key, value)
-    vim.fn.nvim_buf_set_keymap(0, type, key, value,
-                               {noremap = true, silent = true})
+local function map(mode, lhs, rhs, opts)
+  local options = {noremap = true}
+  if opts then options = vim.tbl_extend('force', options, opts) end
+  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
 end
 
 -- Open/close nerdtree
@@ -11,5 +12,5 @@ map('n', '<C-f>', '<cmd>Files<CR>')
 map('n', '<C-g>', '<cmd>Rg<CR>')
 
 -- Completion
-map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"')
-map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<S-Tab>"')
+map('i', '<S-Tab>', 'pumvisible() ? "\\<C-p>" : "\\<Tab>"', {expr = true})
+map('i', '<Tab>', 'pumvisible() ? "\\<C-n>" : "\\<Tab>"', {expr = true})