diff --git a/lua/custom/plugins/copilot.lua b/lua/custom/plugins/copilot.lua index a67d4fc6..eb6ceb12 100644 --- a/lua/custom/plugins/copilot.lua +++ b/lua/custom/plugins/copilot.lua @@ -6,15 +6,15 @@ return { 'copilotlsp-nvim/copilot-lsp', }, opts = { - nes = { - enabled = true, - keymap = { - accept_and_goto = 'p', - accept = false, - dismiss = '', - }, - }, - suggestion = { enabled = false }, + -- nes = { + -- enabled = true, + -- keymap = { + -- accept_and_goto = '', + -- accept = false, + -- dismiss = '', + -- }, + -- }, + suggestion = { enabled = true }, panel = { enabled = false }, }, } diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 5501e197..8ada39a4 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -15,7 +15,7 @@ local function telescope_lsp(picker, fallback, picker_opts) end end -map('n', 'gr', telescope_lsp('lsp_references', vim.lsp.buf.references), { desc = 'LSP: references (telescope)' }) +map('n', 'grr', telescope_lsp('lsp_references', vim.lsp.buf.references), { desc = 'LSP: references (telescope)' }) map('n', 'gi', telescope_lsp('lsp_implementations', vim.lsp.buf.implementation), { desc = 'LSP: implementations (telescope)' }) map('n', 'gt', telescope_lsp('lsp_type_definitions', vim.lsp.buf.type_definition), { desc = 'LSP: type definitions (telescope)' }) map('n', 'gO', telescope_lsp('lsp_document_symbols', vim.lsp.buf.document_symbol), { desc = 'LSP: document symbols (telescope)' }) diff --git a/lua/kickstart/plugins/neo-tree.lua b/lua/kickstart/plugins/neo-tree.lua index c7067891..4640a3e3 100644 --- a/lua/kickstart/plugins/neo-tree.lua +++ b/lua/kickstart/plugins/neo-tree.lua @@ -1,6 +1,5 @@ -- Neo-tree is a Neovim plugin to browse the file system -- https://github.com/nvim-neo-tree/neo-tree.nvim - return { 'nvim-neo-tree/neo-tree.nvim', version = '*', @@ -21,5 +20,37 @@ return { }, }, }, + -- your config here + event_handlers = { + -- save layout before opening neotree + { + event = 'neo_tree_window_before_open', + handler = function() + -- vim.cmd("set noequalalways") + local layout = {} + for _, win in ipairs(vim.api.nvim_list_wins()) do + layout[win] = { + height = vim.api.nvim_win_get_height(win), + width = vim.api.nvim_win_get_width(win), + } + end + vim._neotree_layout = layout + end, + }, + -- restore layout after closing neotree + { + event = 'neo_tree_window_after_close', + handler = function() + if vim._neotree_layout then + for win, dims in pairs(vim._neotree_layout) do + if vim.api.nvim_win_is_valid(win) then + pcall(vim.api.nvim_win_set_height, win, dims.height) + pcall(vim.api.nvim_win_set_width, win, dims.width) + end + end + end + end, + }, + }, }, }