diff --git a/lua/mappings.lua b/lua/mappings.lua
index 8825757..92d4ddd 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -1,26 +1,26 @@
 vim.g.mapleader = ' '
 
 -- Quick write
-vim.keymap.set('n', '<leader>w', ':w!<CR>', {noremap = true})
+vim.keymap.set('n', '<leader>w', ':w!<CR>', { remap = false })
 
 -- Treat long lines as line containing breaks
-vim.keymap.set('n', 'j', 'gj', {noremap = true})
-vim.keymap.set('n', 'k', 'gk', {noremap = true})
+vim.keymap.set('n', 'j', 'gj', { remap = false })
+vim.keymap.set('n', 'k', 'gk', { remap = false })
 
-vim.keymap.set('n', '<leader>tn', ':tabnew<Space>', {noremap = true})
-vim.keymap.set('n', '<leader>tc', ':tabclose<CR>', {noremap = true})
-vim.keymap.set('n', '<leader>to', ':tabonly<CR>', {noremap = true})
-vim.keymap.set('n', '<leader>tm', ':tabmove<Space>', {noremap = true})
+vim.keymap.set('n', '<leader>tn', ':tabnew<Space>', { remap = false })
+vim.keymap.set('n', '<leader>tc', ':tabclose<CR>', { remap = false })
+vim.keymap.set('n', '<leader>to', ':tabonly<CR>', { remap = false })
+vim.keymap.set('n', '<leader>tm', ':tabmove<Space>', { remap = false })
 
 -- Quickly access spelling menu
-vim.keymap.set('i', '<C-s>', '<C-g>u<C-X>s', {noremap = true})
-vim.keymap.set('n', '<C-s>', 'i<C-g>u<C-X>s', {noremap = true})
+vim.keymap.set('i', '<C-s>', '<C-g>u<C-X>s', { remap = false })
+vim.keymap.set('n', '<C-s>', 'i<C-g>u<C-X>s', { remap = false })
 
 -- Clear search highlights
-vim.keymap.set('n', '<leader><Space>', ':nohlsearch<CR>', {noremap = true})
+vim.keymap.set('n', '<leader><Space>', ':nohlsearch<CR>', { remap = false })
 
 -- Disable 'Q' from opening Ex mode
-vim.keymap.set('n', 'Q', '<nop>', {noremap = true})
+vim.keymap.set('n', 'Q', '<nop>', { remap = false })
 
 -- Yank and put mappings
 -- TODO: This doesn't handle all use cases, only the basics. For example,
@@ -35,10 +35,10 @@ vim.keymap.set('n', 'Q', '<nop>', {noremap = true})
   -- call osc52#autocmd()
 -- else
   -- System clipboard yank/put
-  vim.keymap.set('', '<leader>y', '"+y', { noremap = true })
-  vim.keymap.set('', '<leader>Y', '"+Y', { noremap = true })
-  vim.keymap.set('', '<leader>p', '"+p', { noremap = true })
-  vim.keymap.set('', '<leader>P', '"+P', { noremap = true })
+  vim.keymap.set('', '<leader>y', '"+y', { remap = false })
+  vim.keymap.set('', '<leader>Y', '"+Y', { remap = false })
+  vim.keymap.set('', '<leader>p', '"+p', { remap = false })
+  vim.keymap.set('', '<leader>P', '"+P', { remap = false })
 -- end
 
 -- Undo neovim's default mapping of Y to y$
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 0a4111d..5bf62da 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -106,9 +106,9 @@ return {
 
     -- Diagnostic mappings
     -- TODO: trouble.nvim mappings instead? https://youtu.be/MuUrCcvE-Yw?t=631
-    vim.keymap.set('n', '<C-n>', vim.diagnostic.goto_next, { noremap = true })
-    vim.keymap.set('n', '<C-p>', vim.diagnostic.goto_prev, { noremap = true })
-    vim.keymap.set('n', '<leader>sd', vim.diagnostic.open_float, { noremap = true })
+    vim.keymap.set('n', '<C-n>', vim.diagnostic.goto_next, { remap = false })
+    vim.keymap.set('n', '<C-p>', vim.diagnostic.goto_prev, { remap = false })
+    vim.keymap.set('n', '<leader>sd', vim.diagnostic.open_float, { remap = false })
 
     -- LSP mappings created when attached to a buffer
     local augroup = vim.api.nvim_create_augroup('lsp', { clear = true })