Compare commits

..

2 Commits

3 changed files with 68 additions and 61 deletions

View File

@@ -8,5 +8,3 @@ vim.opt.relativenumber = true
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes"
vim.opt.timeout = false vim.opt.timeout = false
vim.o.undofile = true

View File

@@ -11,38 +11,14 @@ end
local set = vim.keymap.set local set = vim.keymap.set
set("n", "<leader><space>", function()
Snacks.picker.smart()
end, { desc = "Smart Find Files" })
set("n", "<leader>e", function() set("n", "<leader>e", function()
Snacks.explorer() Snacks.explorer()
end, { desc = "File Explorer" }) end, { desc = "File Explorer" })
set("n", "<leader>ga", function()
Snacks.lazygit()
end, { desc = "Lazygit" })
set("n", "<leader>gh", function()
Snacks.picker.git_diff()
end, { desc = "Git Diff (Hunks)" })
set("n", "<leader>gl", function()
Snacks.picker.git_log_line()
end, { desc = "Git Log Line" })
set("n", "<leader>gL", function()
Snacks.picker.git_log()
end, { desc = "Git Log" })
set("n", "<leader>gr", function()
Snacks.lazygit.log_file()
end, { desc = "Git Log File (reflog)" })
set({ "n", "v" }, "<leader>gw", function()
Snacks.picker.grep_word()
end, { desc = "Grep Visual Selection or Word" })
set({ "n", "v" }, "<leader>gx", function()
Snacks.gitbrowse()
end, { desc = "Git Browse" })
set("n", "<leader>xr", function() set("n", "<leader>xr", function()
Snacks.picker.recent() Snacks.picker.recent()
end, { desc = "Recent files" }) end, { desc = "Recent files" })
@@ -51,11 +27,51 @@ set("n", "<leader>xR", function()
Snacks.picker.resume() Snacks.picker.resume()
end, { desc = "Resume" }) end, { desc = "Resume" })
set("n", "<leader>p", function()
Snacks.picker.projects()
end, { desc = "Projects" })
set({ "n", "v" }, "<leader>xB", function()
Snacks.gitbrowse()
end, { desc = "Git Browse" })
set("n", "<leader>gl", function()
Snacks.picker.git_log_line()
end, { desc = "Git Log Line" })
set("n", "<leader>I", function()
Snacks.picker.git_log()
end, { desc = "Git Log" })
set("n", "<leader>t", function()
Snacks.picker.git_status()
end, { desc = "Git Status" })
set("n", "<leader>H", function()
Snacks.picker.git_diff()
end, { desc = "Git Diff (Hunks)" })
set("n", "<leader>xS", function()
Snacks.picker.git_stash()
end, { desc = "Git Stash" })
set({ "n", "v" }, "<leader>o", function()
Snacks.picker.grep_word()
end, { desc = "Grep Visual Selection or Word" })
set("n", "<leader>gg", function()
Snacks.lazygit()
end, { desc = "Lazygit" })
set("n", "<leader>gL", function()
Snacks.lazygit.log_file()
end, { desc = "Git Log File" })
set("n", "<leader>U", function() set("n", "<leader>U", function()
Snacks.picker.undo() Snacks.picker.undo()
end, { desc = "Undo History" }) end, { desc = "Undo History" })
set("n", "<leader>xC", function() set("n", "<leader>xs", function()
Snacks.picker.colorschemes() Snacks.picker.colorschemes()
end, { desc = "Colorschemes" }) end, { desc = "Colorschemes" })
@@ -67,6 +83,14 @@ set("n", "<leader>N", function()
Snacks.picker.notifications() Snacks.picker.notifications()
end, { desc = "Notifications" }) end, { desc = "Notifications" })
set("n", "<leader>xC", function()
Snacks.picker.commands()
end, { desc = "Commands" })
set("n", "<leader>xc", function()
Snacks.picker.command_history()
end, { desc = "Command History" })
set("n", "<leader>$", function() set("n", "<leader>$", function()
Snacks.rename.rename_file() Snacks.rename.rename_file()
end, { desc = "Rename File" }) end, { desc = "Rename File" })

View File

@@ -31,32 +31,24 @@ if ok then
require("telescope-frecency").start() require("telescope-frecency").start()
end, { desc = "Telescope frecency" }) end, { desc = "Telescope frecency" })
set("n", "<leader>b", builtin.buffers, { desc = "Telescope buffers" }) 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>f", builtin.git_files, { desc = "Telescope git files" })
set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
set("n", "<leader>xF", function()
builtin.find_files({ hidden = true })
end, { desc = "Telescope find files (hidden)" })
set("n", "<leader>gB", builtin.git_branches, { desc = "Telescope git branches" })
set("n", "<leader>gc", builtin.git_bcommits, { desc = "Telescope git buffer commits" })
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>l", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" }) set("n", "<leader>l", builtin.current_buffer_fuzzy_find, { desc = "Telescope current buffer fuzzy find" })
set("n", "<leader>L", function() set("n", "<leader>L", function()
builtin.live_grep({ grep_open_files = true }) builtin.live_grep({ grep_open_files = true })
end, { desc = "Telescope grep open files" }) end, { desc = "Telescope grep open files" })
set({ "n", "v" }, "<leader>y", function() set("n", "<leader>s", function()
require("git_grep").grep() builtin.live_grep({ command = "git 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" }) end, { desc = "Telescope grep open files" })
set("n", "<leader>d", builtin.diagnostics, { desc = "Telescope diagnostics" })
set("n", "<leader>f", builtin.git_files, { desc = "Telescope git files" })
set("n", "<leader>F", builtin.find_files, { desc = "Telescope find files" })
set("n", "<leader>gB", builtin.git_branches, { desc = "Telescope git branches" })
set("n", "<leader>gc", builtin.git_bcommits, { desc = "Telescope git buffer commits" })
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>h", builtin.help_tags, { desc = "Telescope help tags" })
set("n", "<leader>H", builtin.keymaps, { desc = "Telescope keymaps" })
set("n", "<leader>xH", builtin.highlights, { desc = "Telescope highlights" })
set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" }) set("n", "<leader>m", builtin.marks, { desc = "Telescope marks" })
set("n", "<leader>M", builtin.man_pages, { desc = "Telescope man pages" }) set("n", "<leader>M", builtin.man_pages, { desc = "Telescope man pages" })
set("n", "<leader>o", builtin.oldfiles, { desc = "Telescope oldfiles" }) set("n", "<leader>o", builtin.oldfiles, { desc = "Telescope oldfiles" })
@@ -68,17 +60,10 @@ if ok then
set("n", "<leader>R", builtin.registers, { desc = "Telescope registers" }) set("n", "<leader>R", builtin.registers, { desc = "Telescope registers" })
set("n", "<leader>s", function() set("n", "<leader>s", function()
require("git_grep").live_grep() require("git_grep").live_grep()
end, { desc = "Telescope git live grep" }) end, { desc = "Telescope git 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>S", builtin.live_grep, { desc = "Telescope live grep" }) set("n", "<leader>w", builtin.lsp_document_symbols, { desc = "Telescope document symbols" })
set("n", "<leader>wd", builtin.lsp_document_symbols, { desc = "Telescope document symbols" }) set("n", "<leader>W", builtin.lsp_workspace_symbols, { desc = "Telescope workspace symbols" })
set("n", "<leader>wp", builtin.lsp_workspace_symbols, { desc = "Telescope workspace symbols" })
set("n", "<leader>ws", function()
require("git_grep").workspace_live_grep()
end, { desc = "Telescope workspace git live grep" })
set("n", "<leader>wy", function()
require("git_grep").workspace_grep()
end, { desc = "Telescope workspace git grep" })
set("n", "<leader>:", builtin.builtin, { desc = "Telescope builtin" }) set("n", "<leader>:", builtin.builtin, { desc = "Telescope builtin" })
set("n", "gd", builtin.lsp_definitions, { desc = "Goto Definition" }) set("n", "gd", builtin.lsp_definitions, { desc = "Goto Definition" })