diff --git a/config/nvim/after/ftplugin/help.lua b/config/nvim/after/ftplugin/help.lua
index 195feb5..2607001 100644
--- a/config/nvim/after/ftplugin/help.lua
+++ b/config/nvim/after/ftplugin/help.lua
@@ -1,3 +1,3 @@
-local nmap = require 'fs.util'.buf_nmap
-nmap { 'q', '<cmd>q<cr>' }
+local nmap = require 'fs.util'.nmap
+nmap { 'q', '<cmd>q<cr>', { buffer = true } }
 
diff --git a/config/nvim/after/ftplugin/lua.lua b/config/nvim/after/ftplugin/lua.lua
index 4873123..04491f1 100644
--- a/config/nvim/after/ftplugin/lua.lua
+++ b/config/nvim/after/ftplugin/lua.lua
@@ -1,10 +1,11 @@
 vim.bo.tabstop = 2
 
-local nmap = require 'fs.util'.buf_nmap
+local nmap = require 'fs.util'.nmap
+local buffer = { buffer = true }
 
 -- execute the current line
-nmap { '<leader>x', [[<cmd>call luaeval(getline("."))<cr>]] }
+nmap { '<leader>x', [[<cmd>call luaeval(getline("."))<cr>]], buffer }
 
 -- save and execute the current file
-nmap { '<leader><leader>x', '<cmd>silent write | luafile %<cr>' }
+nmap { '<leader><leader>x', '<cmd>silent write | luafile %<cr>', buffer }
 
diff --git a/config/nvim/lua/fs/config/vim-markdown.lua b/config/nvim/lua/fs/config/vim-markdown.lua
index c580d0b..c2c14e9 100644
--- a/config/nvim/lua/fs/config/vim-markdown.lua
+++ b/config/nvim/lua/fs/config/vim-markdown.lua
@@ -1,4 +1,4 @@
-local nmap = require'fs.util'.buf_nmap
+local nmap = require'fs.util'.nmap
 
 local setup = function()
   -- Disable concealling on italic, bold, etc.
@@ -13,9 +13,9 @@ local setup = function()
 end
 
 local config = function()
-  nmap { '<leader>+', '<cmd>.,.HeaderIncrease<cr>' }
-  nmap { '<leader>=', '<cmd>.,.HeaderIncrease<cr>' }
-  nmap { '<leader>-', '<cmd>.,.HeaderDecrease<cr>' }
+  nmap { '<leader>+', '<cmd>.,.HeaderIncrease<cr>', { buffer = true } }
+  nmap { '<leader>=', '<cmd>.,.HeaderIncrease<cr>', { buffer = true } }
+  nmap { '<leader>-', '<cmd>.,.HeaderDecrease<cr>', { buffer = true } }
 end
 
 return { setup = setup, config = config }
diff --git a/config/nvim/lua/fs/util.lua b/config/nvim/lua/fs/util.lua
index f6e6915..e7ae962 100644
--- a/config/nvim/lua/fs/util.lua
+++ b/config/nvim/lua/fs/util.lua
@@ -1,20 +1,8 @@
 local M = {}
 
-local map = function(mode, lhs, rhs, opts)
-  local opts = vim.tbl_extend('keep', opts or {}, { noremap = true })
-  vim.api.nvim_set_keymap(mode, lhs, rhs, opts)
-end
-
-local buf_map = function(mode, lhs, rhs, opts)
-  local opts = vim.tbl_extend('keep', opts or {}, { noremap = true })
-  vim.api.nvim_buf_set_keymap(0, mode, lhs, rhs, opts)
-end
-
-M.nmap     = function(tbl) map('n', tbl[1], tbl[2], tbl[3]) end
-M.imap     = function(tbl) map('i', tbl[1], tbl[2], tbl[3]) end
-M.vmap     = function(tbl) map('v', tbl[1], tbl[2], tbl[3]) end
-M.buf_nmap = function(tbl) buf_map('n', tbl[1], tbl[2], tbl[3]) end
-M.buf_imap = function(tbl) buf_map('i', tbl[1], tbl[2], tbl[3]) end
+M.nmap = function(tbl) vim.keymap.set('n', tbl[1], tbl[2], tbl[3]) end
+M.imap = function(tbl) vim.keymap.set('i', tbl[1], tbl[2], tbl[3]) end
+M.vmap = function(tbl) vim.keymap.set('v', tbl[1], tbl[2], tbl[3]) end
 
 M.colors = function(gui)
   if gui or vim.opt.termguicolors:get() then