minor uplifts qol

This commit is contained in:
Solomon Laing 2024-02-29 09:09:12 +10:30
parent 8b302b42af
commit 59f1991821
4 changed files with 40 additions and 37 deletions

View File

@ -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" },

View File

@ -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" },
},
},
},
}

View File

@ -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" }, },
},
},
}

View File

@ -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 = {