From bb659a72ac02b2bf47311b913015cb7f581436e9 Mon Sep 17 00:00:00 2001 From: Gilad Sher Date: Fri, 12 Jul 2024 15:29:32 -0400 Subject: [PATCH] update which-key configuration --- init.lua | 18 ++++++++++++------ lazy-lock.json | 5 +++-- lua/custom/plugins/tree-sitter-context.lua | 6 ------ 3 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 lua/custom/plugins/tree-sitter-context.lua diff --git a/init.lua b/init.lua index 41650251..033c0f4c 100644 --- a/init.lua +++ b/init.lua @@ -284,12 +284,12 @@ require('lazy').setup { require('which-key').setup() -- Document existing key chains - require('which-key').register { - ['c'] = { name = '[C]ode', _ = 'which_key_ignore' }, - ['d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, - ['r'] = { name = '[R]ename', _ = 'which_key_ignore' }, - ['s'] = { name = '[S]earch', _ = 'which_key_ignore' }, - ['w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, + require('which-key').add { + { 'c', group = '[C]ode' }, + { 'd', group = '[D]ocument]' }, + { 'r', group = '[R]ename' }, + { 's', group = '[S]earch' }, + { 'w', group = '[W]orkspace' }, } end, }, @@ -321,6 +321,7 @@ require('lazy').setup { end, }, { 'nvim-telescope/telescope-ui-select.nvim' }, + { 'nvim-telescope/telescope-file-browser.nvim' }, -- Useful for getting pretty icons, but requires special font. -- If you already have a Nerd Font, or terminal set up with fallback fonts @@ -369,6 +370,7 @@ require('lazy').setup { -- Enable telescope extensions, if they are installed pcall(require('telescope').load_extension, 'fzf') pcall(require('telescope').load_extension, 'ui-select') + pcall(require('telescope').load_extension, 'file_browser') -- See `:help telescope.builtin` local builtin = require 'telescope.builtin' @@ -382,6 +384,7 @@ require('lazy').setup { vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + vim.keymap.set('n', '-', ':Telescope file_browser', { desc = 'Search the file browser [-]' }) -- Slightly advanced example of overriding default behavior and theme vim.keymap.set('n', '/', function() @@ -821,6 +824,9 @@ require('lazy').setup { { -- Highlight, edit, and navigate code 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', + dependencies = { + { 'nvim-treesitter/nvim-treesitter-context', opts = { enable = true, mode = 'topline', line_numbers = true } }, + }, config = function() -- [[ Configure Treesitter ]] See `:help nvim-treesitter` diff --git a/lazy-lock.json b/lazy-lock.json index 6720e604..6d66f377 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -16,7 +16,7 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, - "mini.nvim": { "branch": "main", "commit": "6c873ff81c318119923a424e3aea39000d3a10cf" }, + "mini.nvim": { "branch": "main", "commit": "27de3dd4485161470ea55004fc132f2b158d1d24" }, "multicursors.nvim": { "branch": "main", "commit": "782820896b1691ed664e4c24f1cd9793dcb33dfb" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, @@ -34,6 +34,7 @@ "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, @@ -43,5 +44,5 @@ "vim-prettier": { "branch": "master", "commit": "7dbdbb12c50a9f4ba72390cce2846248e4368fd0" }, "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, - "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" } + "which-key.nvim": { "branch": "main", "commit": "ab6331f0d381f986f47efd2d016f5a3c354d4d16" } } \ No newline at end of file diff --git a/lua/custom/plugins/tree-sitter-context.lua b/lua/custom/plugins/tree-sitter-context.lua deleted file mode 100644 index 20381f7e..00000000 --- a/lua/custom/plugins/tree-sitter-context.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'nvim-treesitter/nvim-treesitter-context', - config = function () - require('treesitter-context').setup() - end -}