mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-01 11:01:15 +00:00
Telescope: fix projects binding, add Telescope resume in default (#370)
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Set up binary cache / cachix (maximal) (push) Has been cancelled
Set up binary cache / cachix (nix) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Has been cancelled
Validate flake & check formatting / Validate Flake (push) Has been cancelled
Validate flake & check formatting / Formatting via Alejandra (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Set up binary cache / cachix (maximal) (push) Has been cancelled
Set up binary cache / cachix (nix) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-html) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-json) (push) Has been cancelled
Validate flake & check documentation / Validate Flake Documentation (docs-manpages) (push) Has been cancelled
Validate flake & check formatting / Validate Flake (push) Has been cancelled
Validate flake & check formatting / Formatting via Alejandra (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled
* Telescope: fix projects binding, add Telescope resume in default The projects command had a typo preventing it from working; the keybinding description was the same as for Telescope files. Added `<leader>fr` for Telescope resume per default. * Add info to release notes
This commit is contained in:
parent
67abc51902
commit
9eb6159ca3
3 changed files with 73 additions and 64 deletions
|
@ -150,3 +150,9 @@ configuration formats.
|
||||||
- `nvf-print-config-path` will display the path to _a clone_ of your
|
- `nvf-print-config-path` will display the path to _a clone_ of your
|
||||||
`init.lua`. This is not the path used by the Neovim wrapper, but an
|
`init.lua`. This is not the path used by the Neovim wrapper, but an
|
||||||
identical clone.
|
identical clone.
|
||||||
|
|
||||||
|
[ppenguin](https://github.com/ppenguin):
|
||||||
|
|
||||||
|
- Telescope:
|
||||||
|
- Fixed `project-nvim` command and keybinding
|
||||||
|
- Added default ikeybind/command for `Telescope resume` (`<leader>fr`)
|
||||||
|
|
|
@ -17,75 +17,78 @@
|
||||||
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
|
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
|
||||||
in {
|
in {
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
vim.startPlugins = [
|
vim = {
|
||||||
"telescope"
|
startPlugins = [
|
||||||
"plenary-nvim"
|
"telescope"
|
||||||
];
|
"plenary-nvim"
|
||||||
|
];
|
||||||
|
|
||||||
vim.maps.normal = mkMerge [
|
maps.normal = mkMerge [
|
||||||
(mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
|
(mkSetBinding mappings.findFiles "<cmd> Telescope find_files<CR>")
|
||||||
(mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
|
(mkSetBinding mappings.liveGrep "<cmd> Telescope live_grep<CR>")
|
||||||
(mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
|
(mkSetBinding mappings.buffers "<cmd> Telescope buffers<CR>")
|
||||||
(mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
|
(mkSetBinding mappings.helpTags "<cmd> Telescope help_tags<CR>")
|
||||||
(mkSetBinding mappings.open "<cmd> Telescope<CR>")
|
(mkSetBinding mappings.open "<cmd> Telescope<CR>")
|
||||||
|
(mkSetBinding mappings.resume "<cmd> Telescope resume<CR>")
|
||||||
|
|
||||||
(mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
|
(mkSetBinding mappings.gitCommits "<cmd> Telescope git_commits<CR>")
|
||||||
(mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
|
(mkSetBinding mappings.gitBufferCommits "<cmd> Telescope git_bcommits<CR>")
|
||||||
(mkSetBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
|
(mkSetBinding mappings.gitBranches "<cmd> Telescope git_branches<CR>")
|
||||||
(mkSetBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
|
(mkSetBinding mappings.gitStatus "<cmd> Telescope git_status<CR>")
|
||||||
(mkSetBinding mappings.gitStash "<cmd> Telescope git_stash<CR>")
|
(mkSetBinding mappings.gitStash "<cmd> Telescope git_stash<CR>")
|
||||||
|
|
||||||
(mkIf config.vim.lsp.enable (mkMerge [
|
(mkIf config.vim.lsp.enable (mkMerge [
|
||||||
(mkSetBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
|
(mkSetBinding mappings.lspDocumentSymbols "<cmd> Telescope lsp_document_symbols<CR>")
|
||||||
(mkSetBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
|
(mkSetBinding mappings.lspWorkspaceSymbols "<cmd> Telescope lsp_workspace_symbols<CR>")
|
||||||
|
|
||||||
(mkSetBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
|
(mkSetBinding mappings.lspReferences "<cmd> Telescope lsp_references<CR>")
|
||||||
(mkSetBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
|
(mkSetBinding mappings.lspImplementations "<cmd> Telescope lsp_implementations<CR>")
|
||||||
(mkSetBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
|
(mkSetBinding mappings.lspDefinitions "<cmd> Telescope lsp_definitions<CR>")
|
||||||
(mkSetBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
|
(mkSetBinding mappings.lspTypeDefinitions "<cmd> Telescope lsp_type_definitions<CR>")
|
||||||
(mkSetBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
|
(mkSetBinding mappings.diagnostics "<cmd> Telescope diagnostics<CR>")
|
||||||
]))
|
]))
|
||||||
|
|
||||||
(
|
(
|
||||||
mkIf config.vim.treesitter.enable
|
mkIf config.vim.treesitter.enable
|
||||||
(mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
|
(mkSetBinding mappings.treesitter "<cmd> Telescope treesitter<CR>")
|
||||||
)
|
)
|
||||||
|
|
||||||
(
|
(
|
||||||
mkIf config.vim.projects.project-nvim.enable
|
mkIf config.vim.projects.project-nvim.enable
|
||||||
(mkSetBinding mappings.findProjects "<cmd Telescope projects<CR>")
|
(mkSetBinding mappings.findProjects "<cmd> Telescope projects<CR>")
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
|
||||||
vim.binds.whichKey.register = pushDownDefault {
|
binds.whichKey.register = pushDownDefault {
|
||||||
"<leader>f" = "+Telescope";
|
"<leader>f" = "+Telescope";
|
||||||
"<leader>fl" = "Telescope LSP";
|
"<leader>fl" = "Telescope LSP";
|
||||||
"<leader>fm" = "Cellular Automaton";
|
"<leader>fm" = "Cellular Automaton";
|
||||||
"<leader>fv" = "Telescope Git";
|
"<leader>fv" = "Telescope Git";
|
||||||
"<leader>fvc" = "Commits";
|
"<leader>fvc" = "Commits";
|
||||||
|
};
|
||||||
|
|
||||||
|
pluginRC.telescope = entryAnywhere ''
|
||||||
|
local telescope = require('telescope')
|
||||||
|
telescope.setup(${toLuaObject cfg.setupOpts})
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.ui.noice.enable
|
||||||
|
then "telescope.load_extension('noice')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.notify.nvim-notify.enable
|
||||||
|
then "telescope.load_extension('notify')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
|
||||||
|
${
|
||||||
|
if config.vim.projects.project-nvim.enable
|
||||||
|
then "telescope.load_extension('projects')"
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
vim.pluginRC.telescope = entryAnywhere ''
|
|
||||||
local telescope = require('telescope')
|
|
||||||
telescope.setup(${toLuaObject cfg.setupOpts})
|
|
||||||
|
|
||||||
${
|
|
||||||
if config.vim.ui.noice.enable
|
|
||||||
then "telescope.load_extension('noice')"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
|
|
||||||
${
|
|
||||||
if config.vim.notify.nvim-notify.enable
|
|
||||||
then "telescope.load_extension('notify')"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
|
|
||||||
${
|
|
||||||
if config.vim.projects.project-nvim.enable
|
|
||||||
then "telescope.load_extension('projects')"
|
|
||||||
else ""
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,13 +150,13 @@
|
||||||
in {
|
in {
|
||||||
options.vim.telescope = {
|
options.vim.telescope = {
|
||||||
mappings = {
|
mappings = {
|
||||||
findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";
|
findProjects = mkMappingOption "Find projects [Telescope]" "<leader>fp";
|
||||||
|
|
||||||
findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
|
findFiles = mkMappingOption "Find files [Telescope]" "<leader>ff";
|
||||||
liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
|
liveGrep = mkMappingOption "Live grep [Telescope]" "<leader>fg";
|
||||||
buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
|
buffers = mkMappingOption "Buffers [Telescope]" "<leader>fb";
|
||||||
helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
|
helpTags = mkMappingOption "Help tags [Telescope]" "<leader>fh";
|
||||||
open = mkMappingOption "Open [Telescope]" "<leader>ft";
|
open = mkMappingOption "Open [Telescope]" "<leader>ft";
|
||||||
|
resume = mkMappingOption "Resume (previous search) [Telescope]" "<leader>fr";
|
||||||
|
|
||||||
gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
|
gitCommits = mkMappingOption "Git commits [Telescope]" "<leader>fvcw";
|
||||||
gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";
|
gitBufferCommits = mkMappingOption "Git buffer commits [Telescope]" "<leader>fvcb";
|
||||||
|
|
Loading…
Reference in a new issue