diff --git a/lazy-lock.json b/lazy-lock.json index f49b7cf..0631e79 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,12 +18,13 @@ "nvim-lspconfig": { "branch": "master", "commit": "a3f8422b752e03334dbaf4a46940d8aee0acdebf" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" }, - "nvim-treesitter": { "branch": "master", "commit": "99487eb34a397befce8182ff63347a21c5f4b881" }, + "nvim-treesitter": { "branch": "master", "commit": "f37b1668a63b0d1c3ec165f6ba202367604df1a2" }, "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "render-markdown.nvim": { "branch": "main", "commit": "595ac4f7e7c0eaba7bf1d8fd6ec0f6ac91c7e33b" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "vim-nightfly-colors": { "branch": "master", "commit": "e4fd65b08c5ae590511d77c2ad26c59c353fc64a" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "zoxide.vim": { "branch": "master", "commit": "b1e70b6fc1682a83929aee63680d2b43456fe9a5" } } diff --git a/lua/config/common-settings.lua b/lua/config/common-settings.lua index aa3e43a..4335200 100644 --- a/lua/config/common-settings.lua +++ b/lua/config/common-settings.lua @@ -34,8 +34,6 @@ vim.api.nvim_set_keymap('i', '', '', { noremap = true, silent = true } -- Настройка терминала vim.api.nvim_set_keymap('n', 't', ':terminal', { noremap = true, silent = true }) --- Назначаем её на t -vim.keymap.set('n', 't', ':OpenTermInFileDir', { noremap = true, silent = true }) -- установить время ожидания в 200 миллисекунд vim.o.timeoutlen = 300 diff --git a/lua/config/fzf.lua b/lua/config/fzf.lua index cf5366e..0736ce6 100644 --- a/lua/config/fzf.lua +++ b/lua/config/fzf.lua @@ -25,7 +25,9 @@ require("fzf-lua").setup({ -vim.api.nvim_set_keymap('n', 'o', ':FzfLua files', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', 'f', ':FzfLua live_grep', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'f', ':FzfLua files', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'g', ':FzfLua live_grep', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'z', ':FzfLua zoxide', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('n', 'o', ':FzfLua oldfiles', { noremap = true, silent = true }) diff --git a/lua/plugins.lua b/lua/plugins.lua index 14f9cb4..fef06d5 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -99,7 +99,10 @@ return { { 'lambdalisue/suda.vim' }, - + + { + 'nanotee/zoxide.vim' + }, {"nvim-lualine/lualine.nvim", dependencies = { "kyazdani42/nvim-web-devicons", optional = true } }, { "morhetz/gruvbox" }, { "folke/tokyonight.nvim" },