From b1039c9a2b2c2caed7f82553bd1e7613ddd9fbe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 27 May 2022 01:31:33 +0200 Subject: [PATCH] feat(neovim): extend telescope key bindings --- home/editors/neovim/default.nix | 1 + home/editors/neovim/gitsigns.lua | 2 +- home/editors/neovim/init.lua | 5 --- home/editors/neovim/telescope.lua | 59 +++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 home/editors/neovim/telescope.lua diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix index 4d79778..24ba25c 100644 --- a/home/editors/neovim/default.nix +++ b/home/editors/neovim/default.nix @@ -77,6 +77,7 @@ in { ./dap/dap.lua ./dap/mappings.lua ./treesitter.lua + ./telescope.lua ./neorg.lua ]); withNodeJs = false; diff --git a/home/editors/neovim/gitsigns.lua b/home/editors/neovim/gitsigns.lua index f41d1a2..cd856f9 100644 --- a/home/editors/neovim/gitsigns.lua +++ b/home/editors/neovim/gitsigns.lua @@ -22,7 +22,7 @@ require("gitsigns").setup { d = { "Gitsigns diffthis", "Diff" }, D = { require"gitsigns".diffthis('~'), "Diff" }, }, - t = { + ht = { name = "Git sign toggles", b = { "Gitsigns toggle_current_line_blame", "Toggle current line" }, d = { "Gitsigns toggle_deleted", "Toggle deleted" }, diff --git a/home/editors/neovim/init.lua b/home/editors/neovim/init.lua index e995633..058135d 100644 --- a/home/editors/neovim/init.lua +++ b/home/editors/neovim/init.lua @@ -37,11 +37,6 @@ vim.g.closetag_regions = { local wk = require("which-key") -wk.register({ - [";"] = { require("telescope.builtin").find_files, "Find files" }, - [","] = { require("telescope.builtin").live_grep, "Find content" }, -}, { mode = "n" }) - require("nvim-tree").setup {} wk.register({ [""] = { require("nvim-tree").toggle, "Toggle NVimTree" }, diff --git a/home/editors/neovim/telescope.lua b/home/editors/neovim/telescope.lua new file mode 100644 index 0000000..1ec5689 --- /dev/null +++ b/home/editors/neovim/telescope.lua @@ -0,0 +1,59 @@ +local wk = require("which-key") + +wk.register({ + [";"] = { require("telescope.builtin").find_files, "Find files" }, + [","] = { require("telescope.builtin").live_grep, "Live grep" }, +}, { mode = "n" }) + +wk.register({ + t = { + name = "Telescope", + a = { require("telescope.builtin").autocommands, "Autocommands" }, + b = { require("telescope.builtin").current_buffer_fuzzy_find, "Current buffer" }, + B = { require("telescope.builtin").buffers, "Buffers" }, + c = { require("telescope.builtin").live_grep, "Live grep" }, + C = { require("telescope.builtin").commands, "Commands" }, + f = { require("telescope.builtin").find_files, "Files" }, + g = { + name = "Git", + b = { require("telescope.builtin").git_branches, "Branches" }, + c = { require("telescope.builtin").git_bcommits, "Commits in buffer" }, + C = { require("telescope.builtin").git_commits, "Commits" }, + f = { require("telescope.builtin").git_files, "Files" }, + s = { require("telescope.builtin").git_statu, "Status" }, + S = { require("telescope.builtin").git_stash, "Stash" }, + }, + h = { require("telescope.builtin").search_history, "Search history" }, + H = { require("telescope.builtin").command_history, "Command history" }, + j = { require("telescope.builtin").jumplist, "Jump List" }, + l = { + name = "LSP", + d = { require("telescope.builtin").lsp_definitions, "Definitions" }, + D = { require("telescope.builtin").diagnostics, "Diagnostics" }, + i = { require("telescope.builtin").lsp_implementations, "Implementations" }, + r = { require("telescope.builtin").lsp_references, "References" }, + s = { require("telescope.builtin").lsp_document_symbols, "Document symbols" }, + S = { require("telescope.builtin").lsp_workspace_symbols, "Workspace symbols" }, + y = { require("telescope.builtin").lsp_type_definitions, "Type definitions" }, + }, + L = { require("telescope.builtin").loclist, "Location list" }, + m = { require("telescope.builtin").marks, "Marks" }, + M = { require("telescope.builtin").man_pages, "Man pages" }, + o = { require("telescope.builtin").oldfiles, "Previously open files" }, + p = { require("telescope.builtin").pickers, "Pickers" }, + q = { require("telescope.builtin").quickfix, "Quickfix" }, + Q = { require("telescope.builtin").quickfixhistory, "Quickfix history" }, + r = { require("telescope.builtin").resume, "Resume" }, + R = { require("telescope.builtin").registers, "Registers" }, + s = { require("telescope.builtin").grep_string, "Grep string under cursor" }, + t = { require("telescope.builtin").tags, "Tags" }, + T = { require("telescope.builtin").current_buffer_tags, "Tags in current buffer" }, + v = { require("telescope.builtin").vim_options, "Vim options" }, + x = { + name = "More", + h = { require("telescope.builtin").highlights, "Highlights" }, + H = { require("telescope.builtin").help_tags, "Help tags" }, + t = { require("telescope.builtin").treesitter, "Treesitter" }, + }, + }, +}, { mode = "n", prefix = "" })