diff --git a/nvim/.config/nvim/after/plugin/easyalign.lua b/nvim/.config/nvim/after/plugin/easyalign.lua
index 1c303b3..1c0ca30 100644
--- a/nvim/.config/nvim/after/plugin/easyalign.lua
+++ b/nvim/.config/nvim/after/plugin/easyalign.lua
@@ -1,5 +1,5 @@
-vim.api.nvim_set_keymap('x', 'gA', '<Plug>(EasyAlign)', {})
-vim.api.nvim_set_keymap('n', 'gA', '<Plug>(EasyAlign)', {})
+vim.keymap.set('x', 'gA', '<Plug>(EasyAlign)', {})
+vim.keymap.set('n', 'gA', '<Plug>(EasyAlign)', {})
 
 vim.g.easy_align_delimiters = {
   [';']  = { pattern = ';'        , left_margin = 0 },
diff --git a/nvim/.config/nvim/after/plugin/fzf-preview.lua b/nvim/.config/nvim/after/plugin/fzf-preview.lua
index 7257483..d6c37af 100644
--- a/nvim/.config/nvim/after/plugin/fzf-preview.lua
+++ b/nvim/.config/nvim/after/plugin/fzf-preview.lua
@@ -1,4 +1,4 @@
-local remap = vim.api.nvim_set_keymap
+local remap = vim.keymap.set
 
 remap('n', '<Leader>fg',  ':FZFGGrep<CR>',   { noremap = true })
 remap('n', '<Leader>fG',  ':FZFGrep<CR>',    { noremap = true })
diff --git a/nvim/.config/nvim/after/plugin/hop.lua b/nvim/.config/nvim/after/plugin/hop.lua
index fe5d29d..e80fbca 100644
--- a/nvim/.config/nvim/after/plugin/hop.lua
+++ b/nvim/.config/nvim/after/plugin/hop.lua
@@ -1,4 +1,4 @@
-local remap = vim.api.nvim_set_keymap
+local remap = vim.keymap.set
 local opts  = { noremap=true, silent=true, unique=true }
 
 require'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
diff --git a/nvim/.config/nvim/after/plugin/marks.lua b/nvim/.config/nvim/after/plugin/marks.lua
index b605ba1..1cf2821 100644
--- a/nvim/.config/nvim/after/plugin/marks.lua
+++ b/nvim/.config/nvim/after/plugin/marks.lua
@@ -1,4 +1,4 @@
-local remap     = vim.api.nvim_set_keymap
+local remap     = vim.keymap.set
 local opts      = { noremap=true, silent=true, unique=true }
 
 require'marks'.setup {
diff --git a/nvim/.config/nvim/after/plugin/nvim-lint.lua b/nvim/.config/nvim/after/plugin/nvim-lint.lua
index 0312b85..c32c2ab 100644
--- a/nvim/.config/nvim/after/plugin/nvim-lint.lua
+++ b/nvim/.config/nvim/after/plugin/nvim-lint.lua
@@ -1,6 +1,6 @@
 local nvim_lint = require 'lint'
 
-vim.api.nvim_set_keymap('n', '<LocalLeader>l', ':lua require(\'lint\').try_lint()<CR>', { noremap = true, unique = true })
+vim.keymap.set('n', '<LocalLeader>l', ':lua require(\'lint\').try_lint()<CR>', { noremap = true, unique = true })
 
 nvim_lint.linters_by_ft = {
   dockerfile = { 'hadolint' },
diff --git a/nvim/.config/nvim/lua/keymappings.lua b/nvim/.config/nvim/lua/keymappings.lua
index 2bf0e8f..e881876 100644
--- a/nvim/.config/nvim/lua/keymappings.lua
+++ b/nvim/.config/nvim/lua/keymappings.lua
@@ -1,4 +1,4 @@
-local remap       = vim.api.nvim_set_keymap
+local remap       = vim.keymap.set
 local expr_opts   = { noremap=true, unique=true, expr=true }
 local silent_opts = { noremap=true, unique=true, silent=true }
 local opts        = { noremap=true, unique=true }