diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 462fe0d..3c10049 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -26,7 +26,7 @@ "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.nvim": { "branch": "main", "commit": "2d873a0eaa9f37b105c7751bb0a2e30eb448120d" }, "monokai-pro.nvim": { "branch": "master", "commit": "872f774303f79416000e8049630052f4124d9534" }, - "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "1ef260eb4f54515fe121a2267b477efb054d108a" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nordic.nvim": { "branch": "main", "commit": "62acfd4eb008153180670daf81874eb47dd37739" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, diff --git a/nvim/lua/kickstart/plugins/file-tree.lua b/nvim/lua/kickstart/plugins/file-tree.lua index da9df01..17c0ddb 100644 --- a/nvim/lua/kickstart/plugins/file-tree.lua +++ b/nvim/lua/kickstart/plugins/file-tree.lua @@ -1,10 +1,11 @@ -- 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 = '*', + branch = 'v3.x', dependencies = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended @@ -18,11 +19,14 @@ return { }, }, }, - cmd = 'Neotree', + lazy = false, -- neo-tree will lazily load itself keys = { { '\\', ':Neotree reveal', desc = 'NeoTree reveal', silent = true }, }, + ---@module "neo-tree" + ---@type neotree.Config? opts = { + close_if_last_window = true, filesystem = { window = { mappings = { diff --git a/nvim/lua/kickstart/plugins/telescope.lua b/nvim/lua/kickstart/plugins/telescope.lua index 060badb..a34e508 100644 --- a/nvim/lua/kickstart/plugins/telescope.lua +++ b/nvim/lua/kickstart/plugins/telescope.lua @@ -91,7 +91,7 @@ return { vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', function() builtin.buffers { sort_mru = true, ignore_current_buffer = true } - end, { desc = '[ ] Find etisting buffers' }) + end, { desc = '[ ] Find existing buffers' }) vim.keymap.set('n', 'st', ':Telescope colorscheme', { desc = '[S]earch [T]hemes' }) -- Slightly advanced example of overriding default behavior and theme diff --git a/nvim/lua/kickstart/settings.lua b/nvim/lua/kickstart/settings.lua index 10ddbe9..503ffd1 100644 --- a/nvim/lua/kickstart/settings.lua +++ b/nvim/lua/kickstart/settings.lua @@ -51,6 +51,12 @@ vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, { command = 'set filetype=toml', }) +-- Disable netrw for file tree +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 +-- optionally enable 24-bit colour +-- vim.opt.termguicolors = true + -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a'