diff --git a/neovim/.config/nvim/after/plugin/comp.lua b/neovim/.config/nvim/after/plugin/comp.lua
index 9af548f..fb60af7 100644
--- a/neovim/.config/nvim/after/plugin/comp.lua
+++ b/neovim/.config/nvim/after/plugin/comp.lua
@@ -13,20 +13,20 @@ cmp.setup({
     ["<CR>"] = cmp.mapping(function(fallback)
       fallback()
     end),
-    ["<C-u>"] = cmp.mapping(function(fallback)
+    ["<C-n>"] = cmp.mapping(function(fallback)
       if ls.jumpable(1) then
         ls.jump(1)
       else
         fallback()
       end
-    end),
-    ["<C-i>"] = cmp.mapping(function(fallback)
+    end, { "i", "s" }),
+    ["<C-p>"] = cmp.mapping(function(fallback)
       if ls.jumpable(-1) then
         ls.jump(-1)
       else
         fallback()
       end
-    end),
+    end, { "i", "s" }),
     ["<C-j>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item({ behavior = cmp.SelectBehavior.Select })
@@ -58,20 +58,20 @@ cmp.setup({
         fallback()
       end
     end),
-    ["<C-n>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.mapping.scroll_docs(4)
-      else
-        fallback()
-      end
-    end),
-    ["<C-m>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.mapping.scroll_docs(-4)
-      else
-        fallback()
-      end
-    end),
+    -- ["<C-n>"] = cmp.mapping(function(fallback)
+    --   if cmp.visible() then
+    --     cmp.mapping.scroll_docs(4)
+    --   else
+    --     fallback()
+    --   end
+    -- end),
+    -- ["<C-m>"] = cmp.mapping(function(fallback)
+    --   if cmp.visible() then
+    --     cmp.mapping.scroll_docs(-4)
+    --   else
+    --     fallback()
+    --   end
+    -- end),
     ["<C-f>"] = cmp.mapping(function(fallback)
       if ls.expand_or_jumpable() then
         ls.expand_or_jump()
@@ -123,4 +123,5 @@ cmp.setup.filetype("gitcommit", {
   }),
 })
 
-require("luasnip.loaders.from_vscode").lazy_load()
+require("luasnip").setup({ enable_autosnippets = true })
+require("luasnip.loaders.from_lua").load({ paths = vim.fn.stdpath("config") .. "/snippets" })
diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index 714683e..1996877 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -33,7 +33,6 @@ pack.add({
   src = "L3MON4D3/LuaSnip",
   deps = {
     "saadparwaiz1/cmp_luasnip",
-    "rafamadriz/friendly-snippets",
   },
 })
 
diff --git a/neovim/.config/nvim/nvim-pack-lock.json b/neovim/.config/nvim/nvim-pack-lock.json
index bf2ab3c..bc8995b 100644
--- a/neovim/.config/nvim/nvim-pack-lock.json
+++ b/neovim/.config/nvim/nvim-pack-lock.json
@@ -36,10 +36,6 @@
       "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
       "src": "https://github.com/saadparwaiz1/cmp_luasnip"
     },
-    "friendly-snippets": {
-      "rev": "6cd7280adead7f586db6fccbd15d2cac7e2188b9",
-      "src": "https://github.com/rafamadriz/friendly-snippets"
-    },
     "gitsigns.nvim": {
       "rev": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3",
       "src": "https://github.com/lewis6991/gitsigns.nvim"
diff --git a/neovim/.config/nvim/snippets/go.lua b/neovim/.config/nvim/snippets/go.lua
new file mode 100644
index 0000000..44a1f4f
--- /dev/null
+++ b/neovim/.config/nvim/snippets/go.lua
@@ -0,0 +1,15 @@
+---@diagnostic disable:undefined-global
+
+return {
+  s(
+    { trig = "iferr", snippetType = "autosnippet" },
+    fmta(
+      [[
+    if err != nil {
+        return <>
+    }
+    ]],
+      { i(0) }
+    )
+  ),
+}
diff --git a/neovim/.config/nvim/snippets/lua.lua b/neovim/.config/nvim/snippets/lua.lua
new file mode 100644
index 0000000..c48e917
--- /dev/null
+++ b/neovim/.config/nvim/snippets/lua.lua
@@ -0,0 +1,15 @@
+---@diagnostic disable:undefined-global
+
+return {
+  s(
+    { trig = "if" },
+    fmta(
+      [[
+      if <> then
+        <>
+      fi
+      ]],
+      { i(1), i(2) }
+    )
+  ),
+}