From 0cdaba658ff3129c89d2778ce86a0d7598db5bb3 Mon Sep 17 00:00:00 2001
From: Patrick Auernig <patrick.auernig@mykolab.com>
Date: Sat, 6 Jan 2024 20:37:56 +0100
Subject: [PATCH] Remove unused snippet plugins

---
 lazy-lock.json                   |  2 --
 lua/valeth/plugins/lsp/cmp.lua   | 25 ++++++++++++-------------
 lua/valeth/plugins/statuscol.lua |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 81f050b..bb5e766 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -5,11 +5,9 @@
   "cloak.nvim": { "branch": "main", "commit": "951b163e55ce7639eb320c450bde9283c4fe968b" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" },
   "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" },
-  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
   "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" },
   "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
   "indent-blankline.nvim": { "branch": "master", "commit": "877c1db2bf957300097dd5348a665666a4d900cb" },
diff --git a/lua/valeth/plugins/lsp/cmp.lua b/lua/valeth/plugins/lsp/cmp.lua
index d9a3a76..3c561c1 100644
--- a/lua/valeth/plugins/lsp/cmp.lua
+++ b/lua/valeth/plugins/lsp/cmp.lua
@@ -3,39 +3,38 @@ local spec = {
 }
 
 spec.dependencies = {
-    "VonHeikemen/lsp-zero.nvim",
     "hrsh7th/cmp-nvim-lsp",
     "hrsh7th/cmp-path",
     "onsails/lspkind.nvim",
-    "saadparwaiz1/cmp_luasnip",
-    "L3MON4D3/LuaSnip",
-    "rafamadriz/friendly-snippets",
+    "L3MON4D3/LuaSnip", -- just here so snippets returned from LSP servers don't throw errors
 }
 
-spec.event = "LspAttach"
-
 spec.config = function()
     local cmp = require("cmp")
     local lspk = require("lspkind")
 
     local cmp_select = { behavior = cmp.SelectBehavior.Select }
 
-    cmp.setup {
+    cmp.setup({
         formatting = {
             format = lspk.cmp_format({
                 mode = "symbol_text",
-            }),
+            })
+        },
+        window = {
+            completion = cmp.config.window.bordered()
         },
         mapping = {
             ["<CR>"] = cmp.mapping.confirm({ select = true }),
             ["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
             ["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
             ["<C-Space>"] = cmp.mapping.complete(),
-            ["<Tab>"] = nil,
-            ["<S-Tab>"] = nil,
-        }
-    }
-
+        },
+        sources = cmp.config.sources({
+            { name = "nvim_lsp" },
+            { name = "path"},
+        })
+    })
 end
 
 return spec
diff --git a/lua/valeth/plugins/statuscol.lua b/lua/valeth/plugins/statuscol.lua
index ba036a5..d8fe0d3 100644
--- a/lua/valeth/plugins/statuscol.lua
+++ b/lua/valeth/plugins/statuscol.lua
@@ -4,7 +4,7 @@ local spec = {
 }
 
 spec.dependencies = {
-    "lewis6991/gitsigns.nvim",
+    { "lewis6991/gitsigns.nvim", opts = {}},
 }
 
 spec.config = function()