commit 00151b4c64cc0ca2ec0fd6f16617652982e5d55d
parent 1fe8e24c15a572638ab3e3ac8543e53053a81109
Author: Tomas Nemec <nemi@skaut.cz>
Date: Wed, 7 Dec 2022 07:44:36 +0100
update
Diffstat:
3 files changed, 77 insertions(+), 94 deletions(-)
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
@@ -5,6 +5,9 @@ end
local telescope = require('telescope')
local actions = require('telescope.actions')
local action_generate = require('telescope.actions.generate')
+local builtin = require('telescope.builtin')
+local extensions = telescope.extensions
+local themes = require('telescope.themes')
telescope.setup {
defaults = {
@@ -25,34 +28,76 @@ vim.cmd [[packadd packer.nvim]]
require('packer').init()
_ = telescope.load_extension('packer')
-local map = function(mode, lhs, picker, opts)
- opts = opts or {}
- opts.desc = 'Telescope ' .. picker
- vim.keymap.set(mode, lhs, require('tms.p.telescope')[picker], opts)
-end
+local layout = require('tms.p.telescope').layout
+
+vim.keymap.set('n', '<space>h', function()
+ builtin.help_tags()
+end, { desc = 'Telescope Help Tags' })
+
+vim.keymap.set('n', '<space>d', function()
+ builtin.find_files(layout.dd_large_noprev)
+end, { desc = 'Telescope Find Files' })
+
+vim.keymap.set('n', '<space>g', function()
+ builtin.git_files()
+end, { desc = 'Telescope Git Files' })
+
+vim.keymap.set('n', '<space>b', function()
+ builtin.buffers(layout.dd_large)
+end, { desc = 'Telescope Buffers' })
+
+vim.keymap.set('n', '<space>l', function()
+ builtin.current_buffer_fuzzy_find(layout.dd_large_noprev)
+end, { desc = 'Telescope Buffer Lines' })
+
+vim.keymap.set('n', '<space>e', function()
+ builtin.grep_string()
+end, { desc = 'Telescope Grep String' })
+
+vim.keymap.set('n', '<space>c', function()
+ builtin.git_status()
+end, { desc = 'Telescope Git Status' })
+
+vim.keymap.set('n', '<space>q', function()
+ builtin.quickfix(layout.dd_large)
+end, { desc = 'Telescope Quickfix' })
+
+vim.keymap.set('n', '<space>k', function()
+ builtin.keymaps(layout.dd_large)
+end, { desc = 'Telescope Keymaps' })
+
+vim.keymap.set('n', '<space>m', function()
+ builtin.lsp_document_symbols(layout.dd_large)
+end, { desc = 'Telescope Lsp Document Symbols' })
+
+vim.keymap.set('n', '<space>M', function()
+ builtin.lsp_dynamic_workspace_symbols()
+end, { desc = 'Telescope LSP Dynamic Workspace Symbols' })
+
+vim.keymap.set('n', '<space>o', function()
+ builtin.oldfiles()
+end, { desc = 'Telescope Old Files' })
+
+vim.keymap.set('n', '<space>t', function()
+ builtin.treesitter()
+end, { desc = 'Telescope Treesitter' })
+
+vim.keymap.set('n', '<space>p', function()
+ extensions.packer.packer()
+end, { desc = 'Telescope Packer' })
+
+vim.keymap.set('n', '<space>P', function()
+ builtin.reloader(layout.dd_noprev)
+end, { desc = 'Telescope Reloader' })
+
+vim.keymap.set('n', '<space>wo', function()
+ extensions.git_worktree.git_worktrees()
+end, { desc = 'Telescope Git Worktree List' })
+
+vim.keymap.set('n', '<space>wi', function()
+ extensions.git_worktree.create_git_worktree()
+end, { desc = 'Telescope Git Worktree Create' })
-map('n', '<space>h', 'help_tags')
-map('n', '<space>d', 'find_files')
-map('n', '<space>D', 'find_files')
-map('n', '<space>g', 'git_files')
-map('n', '<space>b', 'buffers')
-map('n', '<space>l', 'lines')
-map('n', '<space>e', 'grep_string')
-map('n', '<space>c', 'git_status')
-map('n', '<space>q', 'quickfix')
-map('n', '<space>k', 'keymaps')
--- map('n', '<space>r', 'aerial')
-map('n', '<space>m', 'lsp_document_symbols')
-map('n', '<space>M', 'lsp_dynamic_workspace_symbols')
-map('n', '<space>o', 'oldfiles')
-map('n', '<space>t', 'treesitter')
-map('n', '<space>p', 'packer')
-map('n', '<space>P', 'reloader')
-map('n', '<space>wo', 'git_worktrees')
-map('n', '<space>wi', 'create_git_worktree')
-map('n', '<space>n', 'edit_neovim')
-
--- require('tms.colors').update(function(t)
--- t.Group.new('TelescopeSelection', nil, t.dimm(t.groups.Normal.bg, 0.05))
--- t.Group.new('TelescopeMatching', nil, nil, t.styles.underline + t.styles.bold)
--- end)
+vim.keymap.set('n', '<space>n', function()
+ builtin.find_files(themes.get_dropdown { prompt_title = 'dotfiles', cwd = '~/.config/nvim', previewer = false })
+end, { desc = 'Telescope Dotfiles' })
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -67,19 +67,15 @@ require'nvim-treesitter.configs'.setup {
enable = true,
goto_next_start = { --
[']]'] = '@function.outer',
- [']c'] = '@class.outer',
},
goto_next_end = { --
[']['] = '@function.inner',
- [']C'] = '@class.outer',
},
goto_previous_start = { --
['[['] = '@function.outer',
- ['[c'] = '@class.outer',
},
goto_previous_end = { --
['[]'] = '@function.inner',
- ['[C'] = '@class.outer',
},
},
lsp_interop = {
diff --git a/lua/tms/p/telescope.lua b/lua/tms/p/telescope.lua
@@ -1,17 +1,14 @@
-local telescope = require('telescope')
local themes = require('telescope.themes')
-local builtin = require('telescope.builtin')
local actions = require('telescope.actions')
local action_set = require('telescope.actions.set')
local action_state = require('telescope.actions.state')
local pickers = require('telescope.pickers')
local finders = require('telescope.finders')
local sorters = require('telescope.sorters')
-local extensions = telescope.extensions
local M = {}
-local layout = {
+M.layout = {
dd = themes.get_dropdown(),
dd_noprev = themes.get_dropdown({ previewer = false }),
dd_large = themes.get_dropdown({ layout_config = { width = 120 } }),
@@ -36,59 +33,4 @@ M.mail_address = function()
}:find()
end
-M.edit_neovim = function()
- builtin.find_files(themes.get_dropdown { prompt_title = 'dotfiles', cwd = '~/.config/nvim', previewer = false })
-end
-
-M.find_files = function()
- builtin.find_files(layout.dd_large_noprev)
-end
-M.spell_suggest = function()
- builtin.spell_suggest(layout.dd)
-end
-M.lines = function()
- builtin.current_buffer_fuzzy_find(layout.dd_large_noprev)
-end
-M.reloader = function()
- builtin.reloader(layout.dd_noprev)
-end
-M.buffers = function()
- builtin.buffers(layout.dd_large)
-end
-M.keymaps = function()
- builtin.keymaps(layout.dd_large)
-end
-M.quickfix = function()
- builtin.quickfix(layout.dd_large)
-end
-M.lsp_code_actions = function()
- builtin.lsp_code_actions(layout.dd)
-end
-M.lsp_document_symbols = function()
- builtin.lsp_document_symbols(layout.dd_large)
-end
-M.lsp_definitions = function()
- builtin.lsp_definitions(layout.dd)
-end
-M.packer = function()
- extensions.packer.packer()
-end
-M.git_worktrees = function()
- extensions.git_worktree.git_worktrees()
-end
-M.create_git_worktree = function()
- extensions.git_worktree.create_git_worktree()
-end
-M.snippets = function()
- extensions.snippets.snippets(layout.dd_large)
-end
-
-return setmetatable({}, {
- __index = function(_, k)
- if M[k] then
- return M[k]
- else
- return builtin[k]
- end
- end,
-})
+return M
