nvim: add luasnip

nvim/.config/nvim/init.lua

@@ -7,6 +7,7 @@ require("plugins.auto-session")
 require("plugins.colorscheme")
 require("plugins.conform")
 require("plugins.flash")
+require("plugins.luasnip")
 require("plugins.multicursor")
 require("plugins.nvim-various-textobjs")
 require("plugins.oil")

nvim/.config/nvim/lua/plugins/luasnip.lua

@@ -0,0 +1,48 @@
+vim.api.nvim_create_autocmd("PackChanged", {
+	group = vim.api.nvim_create_augroup("luasnip-update", { clear = true }),
+	callback = function(ev)
+		local name, kind = ev.data.spec.name, ev.data.kind
+		if name == "luasnip" and (kind == "install" or kind == "update") then
+			vim.system({ "make install_jsregexp" }, { cwd = ev.data.path }):wait()
+			print("luasnip make done.")
+		end
+	end,
+})
+
+vim.pack.add({ { src = "https://github.com/L3MON4D3/LuaSnip", version = vim.version.range("^2.0.0") } })
+local ok, ls = pcall(require, "luasnip")
+
+if ok then
+	vim.keymap.set({ "i" }, "<C-K>", function()
+		ls.expand()
+	end, { silent = true })
+	vim.keymap.set({ "i", "s" }, "<C-L>", function(fallback)
+		if ls.locally_jumpable() then
+			ls.jump(1)
+		else
+			local key = vim.api.nvim_replace_termcodes("<C-L>", true, false, true)
+			vim.api.nvim_feedkeys(key, "n", false)
+		end
+	end, { silent = true })
+	vim.keymap.set({ "i", "s" }, "<C-J>", function()
+		if ls.locally_jumpable() then
+			ls.jump(-1)
+		else
+			local key = vim.api.nvim_replace_termcodes("<C-J>", true, false, true)
+			vim.api.nvim_feedkeys(key, "n", false)
+		end
+	end, { silent = true })
+
+	vim.keymap.set({ "i", "s" }, "<C-E>", function()
+		if ls.choice_active() then
+			ls.change_choice(1)
+		else
+			local key = vim.api.nvim_replace_termcodes("<C-E>", true, false, true)
+			vim.api.nvim_feedkeys(key, "n", false)
+		end
+	end, { silent = true })
+
+	require("luasnip.loaders.from_lua").load({ paths = vim.fs.joinpath(vim.fn.stdpath("config"), "lua", "snippets") })
+else
+	print("plugin luasnip missing")
+end

nvim/.config/nvim/lua/plugins/snacks.lua

@@ -11,7 +11,7 @@ end
 
 local set = vim.keymap.set
 
-set("n", "<leader>e", function()
+set("n", "<leader>ea", function()
 	Snacks.explorer()
 end, { desc = "File Explorer" })
 

nvim/.config/nvim/lua/plugins/telescope.lua

@@ -30,14 +30,23 @@ if ok then
 	set("n", "<leader><space>", function()
 		require("telescope-frecency").start()
 	end, { desc = "Telescope frecency" })
+	set("n", "<leader>;", function()
+		require("telescope-frecency").start({ workspace = "CWD" })
+	end, { desc = "Telescope frecency" })
 	set("n", "<leader>b", builtin.buffers, { desc = "Telescope buffers" })
 	set("n", "<leader>cc", builtin.commands, { desc = "Telescope commands" })
 	set("n", "<leader>ch", builtin.command_history, { desc = "Telescope command history" })
 	set("n", "<leader>cH", builtin.highlights, { desc = "Telescope highlights" })
-	set("n", "<leader>d", builtin.diagnostics, { desc = "Telescope diagnostics" })
-	set("n", "<leader>f", builtin.git_files, { desc = "Telescope git files" })
+	set("n", "<leader>da", builtin.diagnostics, { desc = "Telescope diagnostics" })
+	set("n", "<leader>ec", function()
+		builtin.find_files({ cwd = vim.fn.stdpath("config") })
+	end, { desc = "Telescope nvim config files" })
+	set("n", "<leader>ep", function()
+		builtin.find_files({ cwd = vim.fs.joinpath(vim.fn.stdpath("data"), "site") })
+	end, { desc = "Telescope find files" })
+	set("n", "<leader>fa", builtin.git_files, { desc = "Telescope nvim package files" })
 	set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
-	set("n", "<leader>xF", function()
+	set("n", "<leader>fh", function()
 		builtin.find_files({ hidden = true })
 	end, { desc = "Telescope find files (hidden)" })
 	set("n", "<leader>gB", builtin.git_branches, { desc = "Telescope git branches" })
@@ -45,32 +54,32 @@ if ok then
 	set("n", "<leader>gC", builtin.git_commits, { desc = "Telescope git commits" })
 	set("n", "<leader>gs", builtin.git_status, { desc = "Telescope git status" })
 	set("n", "<leader>gS", builtin.git_stash, { desc = "Telescope git stash" })
-	set("n", "<leader>h", builtin.help_tags, { desc = "Telescope help tags" })
-	set("n", "<leader>H", builtin.keymaps, { desc = "Telescope keymaps" })
+	set("n", "<leader>ha", builtin.help_tags, { desc = "Telescope help tags" })
+	set("n", "<leader>hk", builtin.keymaps, { desc = "Telescope keymaps" })
 	set("n", "<leader>l", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" })
 	set("n", "<leader>L", function()
 		builtin.live_grep({ grep_open_files = true })
 	end, { desc = "Telescope grep open files" })
-	set({ "n", "v" }, "<leader>y", function()
-		require("git_grep").grep()
-	end, { desc = "Telescope git grep word" })
-	set("n", "<leader>Y", function()
-		builtin.grep_string({ grep_open_files = true })
-	end, { desc = "Telescope grep open files" })
 	set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" })
 	set("n", "<leader>M", builtin.man_pages, { desc = "Telescope man pages" })
 	set("n", "<leader>o", builtin.oldfiles, { desc = "Telescope oldfiles" })
-	set("n", "<leader>qq", builtin.quickfix, { desc = "Telescope quickfix" })
+	set("n", "<leader>qa", builtin.quickfix, { desc = "Telescope quickfix" })
 	set("n", "<leader>qh", builtin.quickfixhistory, { desc = "Telescope quickfix history" })
 	set("n", "<leader>ql", builtin.loclist, { desc = "Telescope loclist" })
 	set("n", "<leader>r", builtin.resume, { desc = "Telescope resume" })
 	set("n", "<leader>t", builtin.treesitter, { desc = "Telescope treesitter symbols" })
 	set("n", "<leader>R", builtin.registers, { desc = "Telescope registers" })
-	set("n", "<leader>s", function()
+	set("n", "<leader>sa", function()
 		require("git_grep").live_grep()
 	end, { desc = "Telescope git live grep" })
 	set("n", "<leader>S", builtin.live_grep, { desc = "Telescope live grep" })
-	set("n", "<leader>S", builtin.live_grep, { desc = "Telescope live grep" })
+	set("n", "<leader>sh", builtin.search_history, { desc = "Telescope search history" })
+	set("n", "<leader>so", function()
+		builtin.grep_string({ grep_open_files = true })
+	end, { desc = "Telescope grep open files" })
+	set({ "n", "v" }, "<leader>sw", function()
+		require("git_grep").grep()
+	end, { desc = "Telescope git grep word" })
 	set("n", "<leader>wd", builtin.lsp_document_symbols, { desc = "Telescope document symbols" })
 	set("n", "<leader>wp", builtin.lsp_workspace_symbols, { desc = "Telescope workspace symbols" })
 	set("n", "<leader>ws", function()
@@ -78,7 +87,7 @@ if ok then
 	end, { desc = "Telescope workspace git live grep" })
 	set("n", "<leader>wy", function()
 		require("git_grep").workspace_grep()
-	end, { desc = "Telescope workspace git grep" })
+	end, { desc = "Telescope workspace git grep word" })
 	set("n", "<leader>:", builtin.builtin, { desc = "Telescope builtin" })
 
 	set("n", "gd", builtin.lsp_definitions, { desc = "Goto Definition" })

nvim/.config/nvim/lua/snippets/go.lua

@@ -0,0 +1,33 @@
+return {
+	s(
+		"ife",
+		fmt(
+			[[
+			if err != nil {
+				<>
+			}
+			]],
+			{
+				i(0),
+			},
+			{ delimiters = "<>" }
+		)
+	),
+
+	s(
+		"ifse",
+		fmt(
+			[[
+			if <>err = <>; err != nil {
+				<>
+			}
+			]],
+			{
+				i(1),
+				i(2),
+				i(0),
+			},
+			{ delimiters = "<>" }
+		)
+	),
+}

nvim/.config/nvim/nvim-pack-lock.json

@@ -1,5 +1,10 @@
 {
   "plugins": {
+    "LuaSnip": {
+      "rev": "5a1e39223db9a0498024a77b8441169d260c8c25",
+      "src": "https://github.com/L3MON4D3/LuaSnip",
+      "version": "2.0.0 - 3.0.0"
+    },
     "arrow.nvim": {
       "rev": "6e0f726f55f99332dd726a53effd6813786b6d49",
       "src": "https://github.com/otavioschwanck/arrow.nvim"