From daf05a06848d76b6de41d46eb37b46bfd86d2186 Mon Sep 17 00:00:00 2001
From: Norm Rasmussen <norman.rasmussen@me.com>
Date: Fri, 28 Jul 2023 17:23:18 -0400
Subject: [PATCH] Added buffer to nvim-cmp. A few small changes to completions
 and snippets.

---
 nvim/.config/nvim/lazy-lock.json           | 14 ++---
 nvim/.config/nvim/lua/plugins/init.lua     | 17 +++----
 nvim/.config/nvim/lua/plugins/nvim-cmp.lua | 59 +++++++++++++---------
 3 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 130ae0f..702f5e2 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,5 +1,5 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "e81cbe6004051c390721d8570a4a0541ceb0df10" },
+  "LuaSnip": { "branch": "master", "commit": "0b4950a237ce441a6a3a947d501622453f6860ea" },
   "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
   "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" },
   "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" },
@@ -18,9 +18,9 @@
   "f-string-toggle.nvim": { "branch": "main", "commit": "eeaa03be94a0d248aabbb39c29369e97398d9e08" },
   "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" },
   "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
-  "gitsigns.nvim": { "branch": "main", "commit": "11b80e7eea249affc8776483272bcfc627b5552a" },
-  "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" },
-  "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" },
+  "glow.nvim": { "branch": "main", "commit": "0bd87753b052205d271a790b48a09882a9e79f35" },
+  "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" },
   "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
   "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
   "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" },
@@ -43,14 +43,14 @@
   "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" },
   "nvim": { "branch": "main", "commit": "737f60a3a25c79d9bb9574092f6c6c958a3d747a" },
   "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
-  "nvim-dap": { "branch": "master", "commit": "0a02ed103e4da1928dc88428248dec7bb5ee6f34" },
+  "nvim-dap": { "branch": "master", "commit": "2f28ea843bcdb378b171a66ddcd568516e431d55" },
   "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
   "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
   "nvim-lspconfig": { "branch": "master", "commit": "b6091272422bb0fbd729f7f5d17a56d37499c54f" },
   "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-tree.lua": { "branch": "master", "commit": "273c1700eb68c27dce4e518efafc8144fd7ce4ab" },
-  "nvim-treesitter": { "branch": "master", "commit": "736a672afe852dbad4199002c89b7461b285c47f" },
+  "nvim-treesitter": { "branch": "master", "commit": "5e27645a2b7ecce1f8e0971d78f55de0f392ba23" },
   "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
   "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
@@ -58,7 +58,7 @@
   "starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" },
   "styler.nvim": { "branch": "main", "commit": "d5b7e43af4fdaa06e4175c84f4f57b633ae7e6ff" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "e03ff55962417b69c85ef41424079bb0580546ba" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "6c234e863444c246611ad7458185c771ad8cd6e6" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" },
   "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" },
diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua
index 239cb33..b07fa15 100755
--- a/nvim/.config/nvim/lua/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/init.lua
@@ -23,22 +23,17 @@ return {
   { 'neovim/nvim-lspconfig' },
 
   {
-    'L3MON4D3/LuaSnip', version = "1.2.1",
+    'L3MON4D3/LuaSnip', version = "2.0.0",
+      build = "make install_jsregexp",
       dependencies = { "friendly-snippets" },
---  {
---    'bennypowers/nvim-regexplainer',
---    dependencies = {
---      'nvim-treesitter/nvim-treesitter',
---      'MunifTanjim/nui.nvim',
---    },
---      config = function() require('regexplainer').setup{} end,
---  },
-
-  {"ellisonleao/glow.nvim", config = function() require("glow").setup() end},
   },
+
+  {"ellisonleao/glow.nvim", config = function() require("glow").setup() end },
+
     'saadparwaiz1/cmp_luasnip',
     'hrsh7th/cmp-nvim-lsp-signature-help',
     'lukas-reineke/cmp-under-comparator',
+
   {
     'asiryk/auto-hlsearch.nvim',
     version = "1.1.0",
diff --git a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua
index 81deca2..d219cc2 100644
--- a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua
@@ -25,12 +25,13 @@ return {
 
       require("luasnip.loaders.from_vscode").lazy_load()
 
-      cmp.setup {
+      cmp.setup({
 	-- Load snippet support
-	--snippet = {
-	--  expand = function(args)
-	--    luasnip.lsp_expand(args.body)
-	 -- },
+	snippet = {
+	  expand = function(args)
+	    luasnip.lsp_expand(args.body)
+	  end
+	  },
 
 	-- Completion settings
 	completion = {
@@ -73,29 +74,37 @@ return {
 	    end
 	  end,
 	},
-	snippet = {
-	  expand = function(args)
-	    require('luasnip').lsp_expand(args.body)
-	  end,
-	},
-	-- Load sources, see: https://github.com/topics/nvim-cmp
 	sources = {
-	  { name = 'nvim-lsp' },
-	  { name = 'luasnip' },
+	  { name = 'nvim-lsp', keyword_length = 1 },
+	  { name = 'luasnip', keyword_length=2 },
 	  { name = 'path' },
-	--  { name = 'buffer' },
+	  { name = 'nvim_lsp_signature_help' },
+	  { name = 'buffer', keyword_length = 3 },
 	-- { name = 'zsh' },
-	sorting = {
-		comparators = {
-			cmp.config.compare.offset,
-			cmp.config.compare.exact,
-			cmp.config.compare.score,
-			cmp.config.compare.recently_used,
-			require("cmp-under-comparator").under,
-			cmp.config.compare.kind,
-		},
 	},
-	}
-      }
+	formatting = {
+	  fields = {'menu', 'abbr', 'kind'},
+	  format = function(entry, item)
+	    local menu_icon = {
+	      nvim_lsp = 'λ',
+	      luasnip = '⋗',
+	      buffer = 'Ω',
+	      path = '',
+	    }
+	  item.menu = menu_icon[entry.source.name]
+	  return item
+	end,
+      },
+	sorting = {
+	  comparators = {
+		  cmp.config.compare.offset,
+		  cmp.config.compare.exact,
+		  cmp.config.compare.score,
+		  cmp.config.compare.recently_used,
+		  require("cmp-under-comparator").under,
+		  cmp.config.compare.kind,
+	  },
+	},
+  })
     end
 }