From 59f19918211e4debdf0b0c6103dfe88b0680d282 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Thu, 29 Feb 2024 09:09:12 +1030
Subject: [PATCH] minor uplifts qol

---
 .config/nvim/lua/lazyvim/plugins/cmp.lua      | 14 +++----
 .config/nvim/lua/lazyvim/plugins/flash.lua    | 21 +++++-----
 .config/nvim/lua/lazyvim/plugins/snippets.lua | 38 +++++++++----------
 .config/nvim/lua/lazyvim/plugins/whichkey.lua |  4 +-
 4 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/.config/nvim/lua/lazyvim/plugins/cmp.lua b/.config/nvim/lua/lazyvim/plugins/cmp.lua
index 7128969..370f8a2 100644
--- a/.config/nvim/lua/lazyvim/plugins/cmp.lua
+++ b/.config/nvim/lua/lazyvim/plugins/cmp.lua
@@ -7,7 +7,7 @@ return {
             "hrsh7th/cmp-path",
             "hrsh7th/cmp-emoji",
             "hrsh7th/cmp-buffer",
-            -- "saadparwaiz1/cmp_luasnip",
+            "saadparwaiz1/cmp_luasnip",
             {
                 "zbirenbaum/copilot-cmp",
                 dependencies = "copilot.lua",
@@ -31,11 +31,11 @@ return {
                 completion = {
                     completeopt = "menu,menuone,noinsert",
                 },
-                -- snippet = {
-                --     expand = function(args)
-                --         require("luasnip").lsp_expand(args.body)
-                --     end,
-                -- },
+                snippet = {
+                    expand = function(args)
+                        require("luasnip").lsp_expand(args.body)
+                    end,
+                },
                 mapping = cmp.mapping.preset.insert({
                     ["<C-b>"] = cmp.mapping.scroll_docs(-4),
                     ["<C-f>"] = cmp.mapping.scroll_docs(4),
@@ -47,7 +47,7 @@ return {
                 }),
                 sources = cmp.config.sources({
                     { name = "nvim_lsp" },
-                    -- { name = "luasnip" },
+                    { name = "luasnip" },
                     { name = "path" },
                     { name = "emoji" },
                     { name = "buffer" },
diff --git a/.config/nvim/lua/lazyvim/plugins/flash.lua b/.config/nvim/lua/lazyvim/plugins/flash.lua
index ae23f31..6e4e567 100644
--- a/.config/nvim/lua/lazyvim/plugins/flash.lua
+++ b/.config/nvim/lua/lazyvim/plugins/flash.lua
@@ -1,15 +1,16 @@
 return {
-	{
-		"folke/flash.nvim",
-		event = "VeryLazy",
-		opts = {},
+    {
+        "folke/flash.nvim",
+        event = "VeryLazy",
+        opts = {},
         -- stylua: ignore
         keys = {
-          { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-          { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-          { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-          { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-          { "<leader>oS", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+            { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
+            { "S", mode = { "n", "o", "x" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
+            { "r", mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+            { "R", mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+            -- no command mode keys using leader as space...
+            -- { "<leader>oS", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
         },
-	},
+    },
 }
diff --git a/.config/nvim/lua/lazyvim/plugins/snippets.lua b/.config/nvim/lua/lazyvim/plugins/snippets.lua
index 215dc00..fbcdd58 100644
--- a/.config/nvim/lua/lazyvim/plugins/snippets.lua
+++ b/.config/nvim/lua/lazyvim/plugins/snippets.lua
@@ -1,21 +1,21 @@
 return {
-    -- {
-    -- 	"L3MON4D3/LuaSnip",
-    -- 	dependencies = {
-    -- 		"rafamadriz/friendly-snippets",
-    -- 		config = function()
-    -- 			require("luasnip.loaders.from_vscode").lazy_load()
-    -- 		end,
-    -- 	},
-    -- 	opts = {
-    -- 		history = true,
-    -- 		delete_check_events = "TextChanged",
-    -- 	},
-    --        -- stylua: ignore
-    -- 	keys = {
-    -- 		{ "<tab>", function() return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>" end, expr = true, silent = true, mode = "i", },
-    -- 		{ "<tab>", function() require("luasnip").jump(1) end, mode = "s", },
-    -- 		{ "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" }, },
-    -- 	},
-    -- },
+    {
+        "L3MON4D3/LuaSnip",
+        dependencies = {
+            "rafamadriz/friendly-snippets",
+            config = function()
+                require("luasnip.loaders.from_vscode").lazy_load()
+            end,
+        },
+        opts = {
+            history = true,
+            delete_check_events = "TextChanged",
+        },
+        -- stylua: ignore
+        keys = {
+            { "<tab>",   function() return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>" end, expr = true,         silent = true, mode = "i", },
+            { "<tab>",   function() require("luasnip").jump(1) end,                                                     mode = "s", },
+            { "<s-tab>", function() require("luasnip").jump(-1) end,                                                    mode = { "i", "s" }, },
+        },
+    },
 }
diff --git a/.config/nvim/lua/lazyvim/plugins/whichkey.lua b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
index d337655..0e6caad 100644
--- a/.config/nvim/lua/lazyvim/plugins/whichkey.lua
+++ b/.config/nvim/lua/lazyvim/plugins/whichkey.lua
@@ -76,7 +76,9 @@ return {
 
                 c = {
                     name = "+copilot",
-                    c = { "<cmd>Copilot<cr>", "Start Copilot" },
+                    c = { "<cmd>Copilot enable<cr>", "Enable Copilot" },
+                    d = { "<cmd>Copilot disable<cr>", "Disable Copilot" },
+                    t = { "<cmd>Copilot toggle<cr>", "Toggle Copilot" },
                 },
 
                 n = {