diff --git a/init.lua b/init.lua
index 1e6d791..ea686d0 100644
--- a/init.lua
+++ b/init.lua
@@ -242,10 +242,22 @@ for ft, ft_linters in pairs(linters) do
 end
 ---- LuaSnip
 require('luasnip.loaders.from_lua').lazy_load()
-cmd [[imap <silent><expr> <Tab> luasnip#expand_or_jumpable() ? '<Plug>luasnip-expand-or-jump' : '<Tab>']]
-cmd [[inoremap <silent> <S-Tab> <cmd>lua require'luasnip'.jump(-1)<Cr>]]
-cmd [[snoremap <silent> <Tab> <cmd>lua require('luasnip').jump(1)<Cr>]]
-cmd [[snoremap <silent> <S-Tab> <cmd>lua require('luasnip').jump(-1)<Cr>]]
+local luasnip = require 'luasnip'
+vim.keymap.set({"i", "s"}, "<Tab>", function()
+	if luasnip.expand_or_jumpable() then
+		luasnip.expand_or_jump()
+	else
+		vim.api.nvim_feedkeys(
+			vim.api.nvim_replace_termcodes('<Tab>',true,false,true),
+			'n', -- noremap to avoid infinite recursion
+			true)
+	end
+end, {silent = true})
+vim.keymap.set({"i", "s"}, "<S-Tab>", function()
+	if luasnip.jumpable(-1) then
+		luasnip.jump(-1)
+	end
+end, {silent = true})
 ---- completion-nvim
 local cmp = require'cmp'