From 0aeec225539cc6b74736106223a21da9635d240c Mon Sep 17 00:00:00 2001 From: Alexander Neonxp Kiryukhin Date: Mon, 21 Apr 2025 20:21:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=B2=D1=8B=D1=85=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nvim/lua/keymaps.lua | 155 +++++++++++++++++++++++---------- nvim/lua/plugins/telescope.lua | 12 +-- 2 files changed, 114 insertions(+), 53 deletions(-) diff --git a/nvim/lua/keymaps.lua b/nvim/lua/keymaps.lua index 969c629..71ddbd9 100644 --- a/nvim/lua/keymaps.lua +++ b/nvim/lua/keymaps.lua @@ -1,65 +1,126 @@ local map = vim.api.nvim_set_keymap local kmap = vim.keymap.set -local opts = { noremap = true, silent = true } -map("n", "", "", opts) -map("n", "", "^", opts) -map("n", "", "$", opts) -map("v", "", "^", opts) -map("v", "", "$", opts) -map("i", "", "^", opts) -map("i", "", "$", opts) +-- Базовые настройки навигации -- +map("n", "", "", { noremap = true, silent = true }) -map("v", "i", "", opts) -map("v", "a", "", opts) +-- Навигация в начало/конец строки +map("n", "", "^", { noremap = true, silent = true }) +map("n", "", "$", { noremap = true, silent = true }) +map("v", "", "^", { noremap = true, silent = true }) +map("v", "", "$", { noremap = true, silent = true }) +map("i", "", "^", { noremap = true, silent = true }) +map("i", "", "$", { noremap = true, silent = true }) --- Перемещение между буферами -map("n", "bn", "bnext", opts) -- Следующий буфер -map("n", "bp", "bprevious", opts) -- Предыдущий буфер -map("n", "bd", "bdelete", opts) -- Закрыть текущий буфер -map("n", "w", "wa", opts) +-- Фикс для визуального режима +map("v", "i", "", { noremap = true, silent = true }) +map("v", "a", "", { noremap = true, silent = true }) --- Tree -map("n", "", ":NvimTreeToggle", opts) +-- Управление буферами -- +kmap("n", "bn", "bnext", { noremap = true, silent = true, desc = "Next buffer" }) +kmap("n", "bp", "bprevious", { noremap = true, silent = true, desc = "Previous buffer" }) +kmap("n", "bd", "bdelete", { noremap = true, silent = true, desc = "Delete buffer" }) +kmap("n", "w", "wa", { noremap = true, silent = true, desc = "Save all files" }) +kmap("n", "qq", "q") +-- Управление вкладками -- +kmap("n", "", ":tabnext", { noremap = true, silent = true, desc = "Next tab" }) +kmap("n", "", ":tabprevious", { noremap = true, silent = true, desc = "Previous tab" }) +kmap("n", "tn", ":tabnew", { noremap = true, silent = true, desc = "New tab" }) +kmap("n", "tc", ":tabclose", { noremap = true, silent = true, desc = "Close tab" }) --- Telescope -map("n", "ff", "Telescope find_files", opts) -map("n", "fg", "Telescope live_grep", opts) -map("n", "fb", "Telescope buffers", opts) +-- Быстрый переход по вкладкам -- +for i = 1, 9 do + kmap("n", "", ":tabn " .. i .. "", { noremap = true, silent = true, desc = "Go to tab " .. i }) +end --- LSP -kmap("n", "e", vim.diagnostic.open_float, opts) -kmap("n", "[d", vim.diagnostic.goto_prev, opts) -kmap("n", "]d", vim.diagnostic.goto_next, opts) -kmap("n", "q", vim.diagnostic.setloclist, opts) +-- Файловый менеджер -- +kmap("n", "", ":NvimTreeToggle", { noremap = true, silent = true, desc = "Toggle file tree" }) --- стандартные горячие клавиши для LSP, больше в документации --- https://github.com/neovim/nvim-lspconfig -kmap("n", "gD", vim.lsp.buf.declaration, opts) -kmap("n", "gd", vim.lsp.buf.definition, opts) -kmap("n", "K", vim.lsp.buf.hover, opts) -kmap("n", "gi", vim.lsp.buf.implementation, opts) -kmap("n", "", vim.lsp.buf.signature_help, opts) -kmap("n", "wa", vim.lsp.buf.add_workspace_folder, opts) -kmap("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) +-- Поиск с Telescope -- +kmap("n", "ff", "Telescope find_files", { noremap = true, silent = true, desc = "Find files" }) +kmap("n", "fg", "Telescope live_grep", { noremap = true, silent = true, desc = "Live grep" }) +kmap("n", "fb", "Telescope buffers", { noremap = true, silent = true, desc = "Find buffers" }) + +-- LSP функции -- +kmap("n", "e", vim.diagnostic.open_float, { noremap = true, silent = true, desc = "Show diagnostics" }) +kmap("n", "[d", vim.diagnostic.goto_prev, { noremap = true, silent = true, desc = "Previous diagnostic" }) +kmap("n", "]d", vim.diagnostic.goto_next, { noremap = true, silent = true, desc = "Next diagnostic" }) +kmap("n", "q", vim.diagnostic.setloclist, { noremap = true, silent = true, desc = "Add to location list" }) + +kmap("n", "gD", vim.lsp.buf.declaration, { noremap = true, silent = true, desc = "Go to declaration" }) +kmap("n", "gd", vim.lsp.buf.definition, { noremap = true, silent = true, desc = "Go to definition" }) +kmap("n", "K", vim.lsp.buf.hover, { noremap = true, silent = true, desc = "Show documentation" }) +kmap("n", "gi", vim.lsp.buf.implementation, { noremap = true, silent = true, desc = "Go to implementation" }) +kmap("n", "", vim.lsp.buf.signature_help, { noremap = true, silent = true, desc = "Signature help" }) +kmap( + "n", + "wa", + vim.lsp.buf.add_workspace_folder, + { noremap = true, silent = true, desc = "Add workspace folder" } +) +kmap( + "n", + "wr", + vim.lsp.buf.remove_workspace_folder, + { noremap = true, silent = true, desc = "Remove workspace folder" } +) kmap("n", "wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) -end, opts) -kmap("n", "D", vim.lsp.buf.type_definition, opts) -kmap("n", "rn", vim.lsp.buf.rename, opts) -kmap("n", "ca", vim.lsp.buf.code_action, opts) -kmap("n", "gr", vim.lsp.buf.references, opts) --- kmap('n', 'f', vim.lsp.buf.formatting, opts) -kmap("n", "bb", "lua require'dap'.toggle_breakpoint()", opts) -kmap("n", "", "lua require'dap'.continue()", opts) -kmap("n", "", "lua require'dap'.step_over()", opts) -kmap("n", "", "lua require'dap'.step_into()", opts) -kmap("n", "", "lua require'dapui'.toggle()", opts) +end, { noremap = true, silent = true, desc = "List workspace folders" }) +kmap("n", "D", vim.lsp.buf.type_definition, { noremap = true, silent = true, desc = "Type definition" }) +kmap("n", "rn", vim.lsp.buf.rename, { noremap = true, silent = true, desc = "Rename symbol" }) +kmap("n", "ca", vim.lsp.buf.code_action, { noremap = true, silent = true, desc = "Code actions" }) +kmap("n", "gr", vim.lsp.buf.references, { noremap = true, silent = true, desc = "Find references" }) +-- Отладка (DAP) -- +kmap("n", "", "lua require'dapui'.toggle()", { noremap = true, silent = true, desc = "Toggle debug UI" }) +kmap("n", "", function() + require("dap").continue() +end) +kmap("n", "", function() + require("dap").step_over() +end) +kmap("n", "", function() + require("dap").step_into() +end) +kmap("n", "", function() + require("dap").step_out() +end) +kmap("n", "b", function() + require("dap").toggle_breakpoint() +end) +kmap("n", "B", function() + require("dap").set_breakpoint() +end) +kmap("n", "lp", function() + require("dap").set_breakpoint(nil, nil, vim.fn.input("Log point message: ")) +end) +kmap("n", "dr", function() + require("dap").repl.open() +end) +kmap("n", "dl", function() + require("dap").run_last() +end) +kmap({ "n", "v" }, "dh", function() + require("dap.ui.widgets").hover() +end) +kmap({ "n", "v" }, "dp", function() + require("dap.ui.widgets").preview() +end) +kmap("n", "df", function() + local widgets = require("dap.ui.widgets") + widgets.centered_float(widgets.frames) +end) +kmap("n", "ds", function() + local widgets = require("dap.ui.widgets") + widgets.centered_float(widgets.scopes) +end) + +-- Кастомная функция для NvimTree -- local function change_root_to_global_cwd() local api = require("nvim-tree.api") local global_cwd = vim.fn.getcwd(-1, -1) api.tree.change_root(global_cwd) end -kmap("n", "", change_root_to_global_cwd, opts) +kmap("n", "", change_root_to_global_cwd, { noremap = true, silent = true, desc = "Change tree root to CWD" }) diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 02bc40c..9595d51 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,10 +1,10 @@ -require('telescope').setup{ +require("telescope").setup({ pickers = { buffers = { - initial_mode = 'normal' - } + initial_mode = "normal", + }, }, defaults = { - file_ignore_patterns = {"vendor", "node_modules"} - } -} + file_ignore_patterns = { "vendor", "node_modules" }, + }, +})