summaryrefslogtreecommitdiff
path: root/config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--config/nvim/lua/autocommands.lua4
-rw-r--r--config/nvim/lua/keymaps.lua462
-rw-r--r--config/nvim/lua/keymaps_documentation.md101
-rw-r--r--config/nvim/lua/lsp.lua26
-rw-r--r--config/nvim/lua/options.lua9
-rw-r--r--config/nvim/lua/plugins.lua27
-rw-r--r--config/nvim/lua/plugins/apidocs.lua3
-rw-r--r--config/nvim/lua/plugins/autosave.lua38
-rw-r--r--config/nvim/lua/plugins/blankline.lua7
-rw-r--r--config/nvim/lua/plugins/codecompanion.lua89
-rw-r--r--config/nvim/lua/plugins/conform.lua11
-rw-r--r--config/nvim/lua/plugins/dap.lua3
-rw-r--r--config/nvim/lua/plugins/dap_go.lua51
-rw-r--r--config/nvim/lua/plugins/dapui.lua31
-rw-r--r--config/nvim/lua/plugins/goimpl.lua9
-rw-r--r--config/nvim/lua/plugins/headlines.lua5
-rw-r--r--config/nvim/lua/plugins/multicursor.lua76
-rw-r--r--config/nvim/lua/plugins/resize.lua30
-rw-r--r--config/nvim/lua/plugins/telescope.lua18
-rw-r--r--config/nvim/lua/plugins/tree.lua14
20 files changed, 714 insertions, 300 deletions
diff --git a/config/nvim/lua/autocommands.lua b/config/nvim/lua/autocommands.lua
index 1225718..f773190 100644
--- a/config/nvim/lua/autocommands.lua
+++ b/config/nvim/lua/autocommands.lua
@@ -53,7 +53,7 @@ vim.api.nvim_create_autocmd({ "BufWritePre" }, {
local TrimWhiteSpaceGrp = vim.api.nvim_create_augroup("TrimWhiteSpaceGrp", {})
vim.api.nvim_create_autocmd("BufWritePre", {
group = TrimWhiteSpaceGrp,
- pattern = "*",
+ pattern = "*.go",
command = "%s/\\s\\+$//e",
})
@@ -125,7 +125,7 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
})
vim.api.nvim_create_autocmd("FileType", {
- pattern = "go",
+ pattern = "*.go",
callback = function()
vim.opt_local.expandtab = false
vim.opt_local.tabstop = 4
diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua
index 76919a8..6f06bde 100644
--- a/config/nvim/lua/keymaps.lua
+++ b/config/nvim/lua/keymaps.lua
@@ -1,77 +1,417 @@
-local map = vim.api.nvim_set_keymap
local kmap = vim.keymap.set
--- Базовые настройки навигации --
-map("n", "<Space>", "<Nop>", { noremap = true, silent = true })
--- Навигация в начало/конец строки
-map("n", "<Home>", "^", { noremap = true, silent = true })
-map("n", "<End>", "$", { noremap = true, silent = true })
-map("v", "<Home>", "^", { noremap = true, silent = true })
-map("v", "<End>", "$", { noremap = true, silent = true })
-map("i", "<Home>", "<C-o>^", { noremap = true, silent = true })
-map("i", "<End>", "<C-o>$", { noremap = true, silent = true })
+local keys = {
+ -- ========== БАЗОВАЯ НАВИГАЦИЯ ==========
+ {
+ "<Space>",
+ "<Nop>",
+ { desc = "Disable Space in normal mode" },
+ },
+ {
+ "<Home>",
+ "^",
+ { desc = "Go to first non-blank character" },
+ },
+ {
+ "<End>",
+ "$",
+ { desc = "Go to end of line" },
+ },
+ {
+ "<Home>",
+ "^",
+ { mode = "v", desc = "Go to first non-blank character (visual)" },
+ },
+ {
+ "<End>",
+ "$",
+ { mode = "v", desc = "Go to end of line (visual)" },
+ },
+ {
+ "<Home>",
+ "<C-o>^",
+ { mode = "i", desc = "Go to first non-blank character (insert)" },
+ },
+ {
+ "<End>",
+ "<C-o>$",
+ { mode = "i", desc = "Go to end of line (insert)" },
+ },
--- Фикс для визуального режима
-map("v", "i", "<S-i>", { noremap = true, silent = true })
-map("v", "a", "<S-a>", { noremap = true, silent = true })
-map("v", "J", ":m '>+1<CR>gv=gv", { noremap = true, silent = true })
-map("v", "K", ":m '<-2<CR>gv=gv", { noremap = true, silent = true })
-map("v", "<", "<gv", { noremap = true, silent = true })
-map("v", ">", ">gv", { noremap = true, silent = true })
+ -- ========== ВИЗУАЛЬНЫЙ РЕЖИМ ==========
+ {
+ "i",
+ "<S-i>",
+ { mode = "v", desc = "Select inner object" },
+ },
+ {
+ "a",
+ "<S-a>",
+ { mode = "v", desc = "Select around object" },
+ },
+ {
+ "J",
+ ":m '>+1<CR>gv=gv",
+ { mode = "v", desc = "Move selection down" },
+ },
+ {
+ "K",
+ ":m '<-2<CR>gv=gv",
+ { mode = "v", desc = "Move selection up" },
+ },
+ {
+ "<",
+ "<gv",
+ { mode = "v", desc = "Indent left and keep selection" },
+ },
+ {
+ ">",
+ ">gv",
+ { mode = "v", desc = "Indent right and keep selection" },
+ },
--- {{{ Управление буферами --
-kmap("n", "<leader>bn", "<cmd>bnext<CR>", { noremap = true, silent = true, desc = "Next buffer" })
-kmap("n", "<leader>bp", "<cmd>bprevious<CR>", { noremap = true, silent = true, desc = "Previous buffer" })
-kmap("n", "<leader>bd", "<cmd>bdelete<CR>", { noremap = true, silent = true, desc = "Delete buffer" })
-kmap("n", "<C-s>", "<cmd>wa<CR>", { noremap = true, silent = true, desc = "Save all files" })
-kmap("n", "<leader>q", "<cmd>q<CR>", { noremap = true, silent = true, desc = "Exit" })
-kmap("n", "<leader>vs", "<cmd>vsplit<CR>", { noremap = true, silent = true, desc = "Vertical split" })
--- }}}
+ -- ========== УПРАВЛЕНИЕ БУФЕРАМИ ==========
+ {
+ "<leader>bn",
+ "<cmd>bnext<CR>",
+ { desc = "Next buffer" },
+ },
+ {
+ "<leader>bp",
+ "<cmd>bprevious<CR>",
+ { desc = "Previous buffer" },
+ },
+ {
+ "<leader>bd",
+ "<cmd>bdelete<CR>",
+ { desc = "Delete buffer" },
+ },
+ {
+ "<C-s>",
+ "<cmd>wa<CR>",
+ { desc = "Save all files" },
+ },
+ {
+ "<leader>q",
+ "<cmd>q<CR>",
+ { desc = "Exit" },
+ },
+ {
+ "<leader>vs",
+ "<cmd>vsplit<CR>",
+ { desc = "Vertical split" },
+ },
--- {{{ Управление вкладками --
-kmap("n", "<A-Right>", ":tabnext<CR>", { noremap = true, silent = true, desc = "Next tab" })
-kmap("n", "<A-Left>", ":tabprevious<CR>", { noremap = true, silent = true, desc = "Previous tab" })
-kmap("n", "<A-t>", ":tabnew<CR>", { noremap = true, silent = true, desc = "New tab" })
-kmap("n", "<A-w>", ":tabclose<CR>", { noremap = true, silent = true, desc = "Close tab" })
+ -- ========== УПРАВЛЕНИЕ ВКЛАДКАМИ ==========
+ {
+ "<A-Right>",
+ "<cmd>tabnext<CR>",
+ { desc = "Next tab" },
+ },
+ {
+ "<A-Left>",
+ "<cmd>tabprevious<CR>",
+ { desc = "Previous tab" },
+ },
+ {
+ "<A-t>",
+ "<cmd>tabnew<CR>",
+ { desc = "New tab" },
+ },
+ {
+ "<A-w>",
+ "<cmd>tabclose<CR>",
+ { desc = "Close tab" },
+ },
--- Быстрый переход по вкладкам --
-for i = 1, 9 do
- kmap("n", "<A-" .. i .. ">", ":tabn " .. i .. "<CR>", { noremap = true, silent = true, desc = "Go to tab " .. i })
-end
+ -- ========== NVIM-TREE (ФАЙЛОВЫЙ ЭКСПЛОРЕР) ==========
+ {
+ "<C-c>",
+ function()
+ local api = require("nvim-tree.api")
+ local global_cwd = vim.fn.getcwd(-1, -1)
+ api.tree.change_root(global_cwd)
+ end,
+ { desc = "Change tree root to CWD" },
+ },
+ {
+ "<F3>",
+ "<cmd>NvimTreeToggle<CR>",
+ { desc = "Toggle file tree" },
+ },
--- }}}
+ -- ========== TELESCOPE (ПОИСК) ==========
+ {
+ "<leader>ff",
+ "<cmd>Telescope find_files<CR>",
+ { desc = "Find files" },
+ },
+ {
+ "<leader>fg",
+ "<cmd>Telescope live_grep<CR>",
+ { desc = "Live grep" },
+ },
+ {
+ "<leader>fb",
+ "<cmd>Telescope current_buffer_fuzzy_find<CR>",
+ { desc = "Find in current buffer" },
+ },
+ {
+ "<F4>",
+ "<cmd>Telescope buffers<CR>",
+ { desc = "Find buffers" },
+ },
+ {
+ "<leader>gc",
+ "<cmd>Telescope git_commits<CR>",
+ { desc = "Git commits" },
+ },
+ {
+ "<leader>gs",
+ "<cmd>Telescope git_status<CR>",
+ { desc = "Git status" },
+ },
+ {
+ "<leader>ch",
+ "<cmd>Telescope commands_history<CR>",
+ { desc = "Commands history" },
+ },
+ {
+ "<leader>e",
+ "<cmd>Telescope diagnostics<CR>",
+ { desc = "Diagnostics" },
+ },
+ {
+ "gi",
+ "<cmd>Telescope lsp_implementations<CR>",
+ { desc = "LSP implementations" },
+ },
+ {
+ "gr",
+ "<cmd>Telescope lsp_references<CR>",
+ { desc = "LSP references" },
+ },
--- {{{ LSP функции
-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" })
+ -- ========== LSP (ЯЗЫКОВОЙ СЕРВЕР) ==========
+ {
+ "d[",
+ vim.diagnostic.goto_prev,
+ { desc = "Previous diagnostic" },
+ },
+ {
+ "d]",
+ vim.diagnostic.goto_next,
+ { desc = "Next diagnostic" },
+ },
+ {
+ "gD",
+ vim.lsp.buf.declaration,
+ { desc = "Go to declaration" },
+ },
+ {
+ "gd",
+ vim.lsp.buf.definition,
+ { desc = "Go to definition" },
+ },
+ {
+ "K",
+ vim.lsp.buf.hover,
+ { desc = "Show documentation" },
+ },
+ {
+ "<C-k>",
+ vim.lsp.buf.signature_help,
+ { desc = "Signature help" },
+ },
+ {
+ "<leader>sad",
+ "<cmd>ApidocsOpen<cr>",
+ { desc = "Search Api Doc" },
+ },
+ {
+ "<leader>wa",
+ vim.lsp.buf.add_workspace_folder,
+ { desc = "Add workspace folder" },
+ },
+ {
+ "<leader>wr",
+ vim.lsp.buf.remove_workspace_folder,
+ { desc = "Remove workspace folder" },
+ },
+ {
+ "<leader>im",
+ function()
+ require("telescope").extensions.goimpl.goimpl({})
+ end,
+ { desc = "Generate stub for interface on a type for golang" },
+ },
+ {
+ "<leader>wl",
+ function()
+ print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+ end,
+ { desc = "List workspace folders" },
+ },
+ {
+ "<A-CR>",
+ "<cmd>Lspsaga code_action<cr>",
+ { desc = "Code actions" },
+ },
+ {
+ "<F2>",
+ vim.lsp.buf.rename,
+ { desc = "Rename symbol" },
+ },
+ {
+ "<A-q>",
+ "gqip",
+ { desc = "Reflow line" },
+ },
-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" })
+ -- ========== ИЗМЕНЕНИЕ РАЗМЕРА ОКОН ==========
+ {
+ "<C-A-Left>",
+ function()
+ require("myplugins.resize").ResizeLeft()
+ end,
+ { desc = "Resize window left" },
+ },
+ {
+ "<C-A-Right>",
+ function()
+ require("myplugins.resize").ResizeRight()
+ end,
+ { desc = "Resize window right" },
+ },
+ {
+ "<C-A-Up>",
+ function()
+ require("myplugins.resize").ResizeUp()
+ end,
+ { desc = "Resize window up" },
+ },
+ {
+ "<C-A-Down>",
+ function()
+ require("myplugins.resize").ResizeDown()
+ end,
+ { desc = "Resize window down" },
+ },
-kmap("n", "<C-k>", vim.lsp.buf.signature_help, { noremap = true, silent = true, desc = "Signature help" })
+ -- ========== DAP (ОТЛАДКА) ==========
+ {
+ "<F6>",
+ function()
+ require("dapui").toggle()
+ end,
+ { desc = "Toggle debug UI" },
+ },
+ {
+ "<Leader>dh",
+ function()
+ require("dap.ui.widgets").hover()
+ end,
+ { desc = "Debug hover" },
+ },
+ {
+ "<Leader>dp",
+ function()
+ require("dap.ui.widgets").preview()
+ end,
+ { desc = "Debug preview" },
+ },
+ {
+ "<F9>",
+ function()
+ local widgets = require("dap.ui.widgets")
+ widgets.centered_float(widgets.scopes)
+ end,
+ { desc = "Debug scopes" },
+ },
+ {
+ "<F5>",
+ function()
+ require("dap").continue()
+ end,
+ { desc = "Debug continue" },
+ },
+ {
+ "<F17>",
+ function() -- S-F5
+ require("dap").restart()
+ end,
+ { desc = "Debug restart" },
+ },
+ {
+ "<F29>",
+ function() -- C-F5
+ require("dap").terminate()
+ end,
+ { desc = "Debug terminate" },
+ },
+ {
+ "<F8>",
+ function()
+ require("dap").step_over()
+ end,
+ { desc = "Debug step over" },
+ },
+ {
+ "<F7>",
+ function()
+ require("dap").step_into()
+ end,
+ { desc = "Debug step into" },
+ },
+ {
+ "<F19>",
+ function() -- S-F7
+ require("dap").step_out()
+ end,
+ { desc = "Debug step out" },
+ },
+ {
+ "<A-b>",
+ function()
+ require("dap").toggle_breakpoint()
+ end,
+ { desc = "Toggle breakpoint" },
+ },
-kmap(
- "n",
- "<leader>wa",
- vim.lsp.buf.add_workspace_folder,
- { noremap = true, silent = true, desc = "Add workspace folder" }
-)
+ -- ========== ФОРМАТИРОВАНИЕ ==========
+ {
+ "<leader>mp",
+ function()
+ require("conform").format({ lsp_fallback = true, async = false, timeout_ms = 500 })
+ end,
+ { desc = "Format file or range (in visual mode)" },
+ },
+}
-kmap(
- "n",
- "<leader>wr",
- vim.lsp.buf.remove_workspace_folder,
- { noremap = true, silent = true, desc = "Remove workspace folder" }
-)
+-- Добавляем быстрый переход по вкладкам (1-9)
+for i = 1, 9 do
+ table.insert(keys, {
+ "<A-" .. i .. ">",
+ "<cmd>tabn " .. i .. "<CR>",
+ { desc = "Go to tab " .. i },
+ })
+end
-kmap("n", "<leader>wl", function()
- print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-end, { noremap = true, silent = true, desc = "List workspace folders" })
+-- Применяем все кеймапинги
+for _, mapping in ipairs(keys) do
+ local key = mapping[1]
+ local action = mapping[2]
+ local opts = mapping[3] or {}
---kmap("n", "<A-CR>", vim.lsp.buf.code_action, { noremap = true, silent = true, desc = "Code actions" })
-kmap("n", "<A-CR>", "<cmd>Lspsaga code_action<cr>", { noremap = true, silent = true, desc = "Code actions" })
+ -- Извлекаем режим или используем "n" по умолчанию
+ local mode = opts.mode or "n"
+ -- Удаляем mode из opts, так как он передается отдельно
+ opts.mode = nil
-kmap("n", "<F2>", vim.lsp.buf.rename, { noremap = true, silent = true, desc = "Rename symbol" })
+ -- Устанавливаем silent = true по умолчанию
+ if opts.silent == nil then
+ opts.silent = true
+ end
--- }}}
+ kmap(mode, key, action, opts)
+end
diff --git a/config/nvim/lua/keymaps_documentation.md b/config/nvim/lua/keymaps_documentation.md
new file mode 100644
index 0000000..4a7f874
--- /dev/null
+++ b/config/nvim/lua/keymaps_documentation.md
@@ -0,0 +1,101 @@
+# Описание клавиатурных сокращений Neovim
+
+Данный документ содержит описание всех клавиатурных сокращений, настроенных в `keymaps.lua`, сгруппированных по категориям.
+
+---
+
+## Базовая навигация
+
+- `<Space>` → Ничего не делает (отключено в нормальном режиме)
+- `<Home>` → Переход к первому непустому символу строки (в нормальном режиме)
+- `<End>` → Переход к концу строки (в нормальном режиме)
+- `<Home>` → Переход к первому непустому символу строки (в визуальном режиме)
+- `<End>` → Переход к концу строки (в визуальном режиме)
+- `<Home>` → Переход к первому непустому символу строки (в режиме вставки)
+- `<End>` → Переход к концу строки (в режиме вставки)
+
+## Визуальный режим
+
+- `i` → Выделить внутреннюю часть объекта (аналог `inner` в визуальном режиме)
+- `a` → Выделить объект целиком (`around` в визуальном режиме)
+- `J` → Переместить выделенный фрагмент вниз
+- `K` → Переместить выделенный фрагмент вверх
+- `<` → Уменьшить отступ выделения и сохранить выделение
+- `>` → Увеличить отступ выделения и сохранить выделение
+
+## Управление буферами
+
+- `<leader>bn` → Следующий буфер
+- `<leader>bp` → Предыдущий буфер
+- `<leader>bd` → Удалить текущий буфер
+- `<C-s>` → Сохранить все файлы
+- `<leader>q` → Закрыть текущее окно/буфер
+- `<leader>vs` → Вертикальное разделение окна
+
+## Управление вкладками
+
+- `<A-Right>` → Следующая вкладка
+- `<A-Left>` → Предыдущая вкладка
+- `<A-t>` → Новая вкладка
+- `<A-w>` → Закрыть текущую вкладку
+- `<A-1>` до `<A-9>` → Переход к вкладке по номеру (1–9)
+
+## Файловый эксплорер (nvim-tree)
+
+- `<C-c>` → Сменить корень проводника на текущий рабочий каталог
+- `<F3>` → Показать/скрыть файловый проводник
+
+## Поиск (Telescope)
+
+- `<leader>ff` → Поиск файлов
+- `<leader>fg` → Поиск по содержимому файлов (live grep)
+- `<leader>fb` → Поиск в текущем файле
+- `<F4>` → Поиск среди открытых буферов
+- `<leader>gc` → Просмотр истории коммитов Git
+- `<leader>gs` → Просмотр статуса Git
+- `<leader>ch` → История команд
+- `<leader>e` → Просмотр диагностических сообщений
+- `gi` → Поиск реализаций LSP
+- `gr` → Поиск ссылок (references) в LSP
+
+## LSP (Языковой сервер)
+
+- `d[` → Переход к предыдущей диагностике
+- `d]` → Переход к следующей диагностике
+- `gD` → Переход к объявлению (declaration)
+- `gd` → Переход к определению (definition)
+- `K` → Показать документацию (hover)
+- `<C-k>` → Подсказка по сигнатуре функции
+- `<leader>sad` → Поиск в API-документации
+- `<leader>wa` → Добавить папку в рабочую область
+- `<leader>wr` → Удалить папку из рабочей области
+- `<leader>im` → Сгенерировать реализацию интерфейса (для Go)
+- `<leader>wl` → Вывести список рабочих папок
+- `<A-CR>` → Выполнить действие кода (code action)
+- `<F2>` → Переименовать символ
+- `<A-q>` → Перенести длинные строки (reflow)
+
+## Изменение размера окон
+
+- `<C-A-Left>` → Уменьшить ширину окна слева
+- `<C-A-Right>` → Увеличить ширину окна справа
+- `<C-A-Up>` → Уменьшить высоту окна сверху
+- `<C-A-Down>` → Увеличить высоту окна снизу
+
+## Отладка (DAP)
+
+- `<F6>` → Показать/скрыть интерфейс отладки
+- `<Leader>dh` → Подсказка при отладке (hover)
+- `<Leader>dp` → Предварительный просмотр при отладке
+- `<F9>` → Открыть области видимости в центре экрана
+- `<F5>` → Продолжить выполнение
+- `<S-F5>` → Перезапустить отладку
+- `<C-F5>` → Остановить отладку
+- `<F8>` → Шаг с обходом (step over)
+- `<F7>` → Шаг с заходом (step into)
+- `<S-F7>` → Шаг с выходом (step out)
+- `<A-b>` → Установить/удалить точку останова
+
+## Форматирование
+
+- `<leader>mp` → Отформатировать файл или выделенный диапазон
diff --git a/config/nvim/lua/lsp.lua b/config/nvim/lua/lsp.lua
index 1031287..91f22a1 100644
--- a/config/nvim/lua/lsp.lua
+++ b/config/nvim/lua/lsp.lua
@@ -1,5 +1,3 @@
--- инициализация LSP для различных ЯП
-local lspconfig = require("lspconfig")
local util = require("lspconfig/util")
local function config(_config)
@@ -19,12 +17,10 @@ local function config(_config)
capabilities = capabilities,
}, _config or {})
end
--- иницализация gopls LSP для Go
--- https://github.com/golang/tools/blob/master/gopls/doc/vim.md#neovim-install
-lspconfig.gopls.setup(config({
+vim.lsp.config("gopls", {
cmd = { "gopls", "serve" },
filetypes = { "go", "go.mod" },
- root_dir = util.root_pattern("go.work", "go.mod", ".git"),
+ root_markers = {"go.mod", ".git", "go.work"},
settings = {
gopls = {
analyses = {
@@ -34,16 +30,18 @@ lspconfig.gopls.setup(config({
gofumpt = true,
},
},
-}))
+})
-lspconfig.templ.setup(config({
+vim.lsp.config("templ", {
cmd = { "templ", "lsp" },
filetypes = { "templ" },
root_markers = { "go.work", "go.mod", ".git" },
-}))
+})
+vim.lsp.enable("gopls")
+vim.lsp.enable("templ")
-lspconfig.v_analyzer.setup(config({
- cmd = { "v-analyzer" },
- filetypes = { "v", "vv", "vsh" },
- root_markers = { "v.mod", ".git" },
-}))
+-- require('lspconfig').v_analyzer.setup(config({
+-- cmd = { "v-analyzer" },
+-- filetypes = { "v", "vv", "vsh" },
+-- root_markers = { "v.mod", ".git" },
+-- }))
diff --git a/config/nvim/lua/options.lua b/config/nvim/lua/options.lua
index 8c1366a..d30f768 100644
--- a/config/nvim/lua/options.lua
+++ b/config/nvim/lua/options.lua
@@ -23,7 +23,13 @@ local options = {
writebackup = false,
shiftwidth = 4,
tabstop = 4,
+ softtabstop = 4,
cursorline = true,
+ listchars = {
+ tab = '→→',
+ trail = '-',
+ nbsp = '+'
+ },
number = true,
relativenumber = true,
numberwidth = 4,
@@ -33,7 +39,8 @@ local options = {
foldmethod = "expr",
foldexpr = "v:lua.vim.treesitter.foldexpr()",
foldnestmax = 10,
- foldlevel = 9,
+ -- foldlevel = 9,
+ foldlevel = 3,
scrolloff = 999,
so = vim.fn.floor(vim.fn.winheight(0) / 2),
guicursor = "n-v-c:block,i-ci-ve:hor10,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175",
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index 60b032d..b7e89f0 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -1,14 +1,9 @@
require("lazy").setup({
- { "bluz71/vim-nightfly-colors", name = "nightfly", lazy = false, priority = 1000 },
{
- "sainnhe/sonokai",
- lazy = false,
- priority = 1000,
+ "p00f/alabaster.nvim",
config = function()
- -- Optionally configure and load the colorscheme
- -- directly inside the plugin declaration.
- vim.g.sonokai_enable_italic = true
- vim.cmd.colorscheme("sonokai")
+ vim.cmd.colorscheme("alabaster")
+ vim.o.termguicolors = true
end,
},
{ "nvim-lua/plenary.nvim" },
@@ -21,10 +16,20 @@ require("lazy").setup({
dependencies = { "saghen/blink.cmp" },
},
{ "Snyssfx/goerr-nvim" },
+ {
+ "NeogitOrg/neogit",
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ "sindrets/diffview.nvim",
+ },
+ },
+ {
+ "mfussenegger/nvim-dap",
+ },
+
+ require("plugins.multicursor"),
require("plugins.apidocs"),
require("plugins.resize"),
- require("plugins.blankline"),
- require("plugins.headlines"),
require("plugins.lsp_saga"),
require("plugins.lsp_signature"),
require("plugins.autosave"),
@@ -33,13 +38,13 @@ require("lazy").setup({
require("plugins.tree"),
require("plugins.conform"),
require("plugins.dapui"),
- require("plugins.dap"),
require("plugins.dap_go"),
require("plugins.go"),
require("plugins.goimpl"),
require("plugins.lualine"),
require("plugins.telescope"),
require("plugins.columns"),
+ require("plugins.codecompanion"),
}, {
performance = {
rtp = {
diff --git a/config/nvim/lua/plugins/apidocs.lua b/config/nvim/lua/plugins/apidocs.lua
index 9bc35da..2727c09 100644
--- a/config/nvim/lua/plugins/apidocs.lua
+++ b/config/nvim/lua/plugins/apidocs.lua
@@ -10,7 +10,4 @@ return {
-- require('apidocs').setup({picker = "snacks"})
-- Possible options are 'ui_select', 'telescope', and 'snacks'
end,
- keys = {
- { "<leader>sad", "<cmd>ApidocsOpen<cr>", desc = "Search Api Doc" },
- },
}
diff --git a/config/nvim/lua/plugins/autosave.lua b/config/nvim/lua/plugins/autosave.lua
index 069afbf..f6f280d 100644
--- a/config/nvim/lua/plugins/autosave.lua
+++ b/config/nvim/lua/plugins/autosave.lua
@@ -1,18 +1,12 @@
return {
"okuuva/auto-save.nvim",
enabled = true,
- cmd = "ASToggle", -- optional for lazy loading on command
- event = { "InsertLeave", "TextChanged" }, -- optional for lazy loading on trigger events
+ cmd = "ASToggle",
+ event = { "InsertLeave", "TextChanged" },
opts = {
- enabled = true, -- start auto-save when the plugin is loaded (i.e. when your package manager loads it)
- trigger_events = { -- See :h events
- -- -- vim events that trigger an immediate save
- -- -- I'm disabling this, as it's autosaving when I leave the buffer and
- -- -- that's autoformatting stuff if on insert mode and following a tutorial
- -- -- Re-enabling this to only save if NOT in insert mode in the condition below
- -- immediate_save = { nil },
- immediate_save = { "BufLeave", "FocusLost", "QuitPre", "VimSuspend" }, -- vim events that trigger an immediate save
- -- vim events that trigger a deferred save (saves after `debounce_delay`)
+ enabled = true,
+ trigger_events = {
+ immediate_save = { "BufLeave", "FocusLost", "QuitPre", "VimSuspend" },
defer_save = {
"InsertLeave",
"TextChanged",
@@ -29,28 +23,12 @@ return {
{ "User", pattern = "SnacksPickerInputEnter" },
},
},
- -- function that takes the buffer handle and determines whether to save the current buffer or not
- -- return true: if buffer is ok to be saved
- -- return false: if it's not ok to be saved
- -- if set to `nil` then no specific condition is applied
condition = function(buf)
- -- Do not save when I'm in insert mode
- -- Do NOT ADD VISUAL MODE HERE or the cancel_deferred_save wont' work
- -- If I STAY in insert mode and switch to another app, like YouTube to
- -- take notes, the BufLeave or FocusLost immediate_save will be ignored
- -- and the save will not be triggered
local mode = vim.fn.mode()
if mode == "i" then
return false
end
- -- Disable auto-save for the harpoon plugin, otherwise it just opens and closes
- -- https://github.com/ThePrimeagen/harpoon/issues/434
- --
- -- don't save for `sql` file types
- -- I do this so when working with dadbod the file is not saved every time
- -- I make a change, and a SQL query executed
- -- Run `:set filetype?` on a dadbod query to make sure of the filetype
local filetype = vim.bo[buf].filetype
if filetype == "harpoon" or filetype == "mysql" then
return false
@@ -58,12 +36,10 @@ return {
return true
end,
- write_all_buffers = true, -- write all buffers when the current one meets `condition`
+ write_all_buffers = true,
noautocmd = false,
- lockmarks = false, -- lock marks when saving, see `:h lockmarks` for more details
- -- delay after which a pending save is executed (default 1000)
+ lockmarks = false,
debounce_delay = 2000,
- -- log debug messages to 'auto-save.log' file in neovim cache directory, set to `true` to enable
debug = false,
},
}
diff --git a/config/nvim/lua/plugins/blankline.lua b/config/nvim/lua/plugins/blankline.lua
deleted file mode 100644
index b74d9e6..0000000
--- a/config/nvim/lua/plugins/blankline.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-return {
- "lukas-reineke/indent-blankline.nvim",
- main = "ibl",
- --@module "ibl"
- --@type ibl.config
- config = true,
-}
diff --git a/config/nvim/lua/plugins/codecompanion.lua b/config/nvim/lua/plugins/codecompanion.lua
new file mode 100644
index 0000000..a657d09
--- /dev/null
+++ b/config/nvim/lua/plugins/codecompanion.lua
@@ -0,0 +1,89 @@
+return {
+ "olimorris/codecompanion.nvim",
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ "nvim-treesitter/nvim-treesitter",
+ {
+ "MeanderingProgrammer/render-markdown.nvim",
+ ft = { "markdown", "codecompanion" },
+ },
+ {
+ "ravitemer/mcphub.nvim",
+ dependencies = {
+ "nvim-lua/plenary.nvim",
+ },
+ build = "npm install -g mcp-hub@latest",
+ config = function()
+ require("mcphub").setup()
+ end,
+ },
+ },
+ opts = {
+ opts = {
+ log_level = "DEBUG", -- or "TRACE"
+ },
+ extensions = {
+ mcphub = {
+ callback = "mcphub.extensions.codecompanion",
+ opts = {
+ make_tools = true, -- Make individual tools (@server__tool) and server groups (@server) from MCP servers
+ show_server_tools_in_chat = true, -- Show individual tools in chat completion (when make_tools=true)
+ add_mcp_prefix_to_tool_names = false, -- Add mcp__ prefix (e.g `@mcp__github`, `@mcp__neovim__list_issues`)
+ show_result_in_chat = true, -- Show tool results directly in chat buffer
+ format_tool = nil, -- function(tool_name:string, tool: CodeCompanion.Agent.Tool) : string Function to format tool names to show in the chat buffer
+ -- MCP Resources
+ make_vars = true, -- Convert MCP resources to #variables for prompts
+ -- MCP Prompts
+ make_slash_commands = true, -- Add MCP prompts as /slash commands
+ },
+ },
+ },
+ strategies = {
+ chat = {
+ adapter = "scbt",
+ tools = {
+ opts = {
+ default_tools = {
+ "full_stack_dev",
+ "mcp",
+ },
+ },
+ opts = {
+ system_promt = "Ты полезный ассистент в редакторе neovim в плагине codecompanion. Основной зык программирования - go. Отвечай всегда на русском языке.",
+ },
+ },
+ },
+ inline = {
+ adapter = "scbt",
+ },
+ },
+ memory = {
+ opts = {
+ chat = {
+ enabled = true,
+ },
+ },
+ },
+ adapters = {
+ http = {
+ scbt = function()
+ return require("codecompanion.adapters").extend("openai_compatible", {
+ env = {
+ api_key = "cmd: age -d -i ~/.ssh/id_ed25519 ~/.openai-api-key.age",
+ url = "http://localhost:8888/api",
+ },
+
+ schema = {
+ model = {
+ default = "qwen3-235b-it",
+ choices = {
+ "qwen3-235b-it",
+ },
+ },
+ },
+ })
+ end,
+ },
+ },
+ },
+}
diff --git a/config/nvim/lua/plugins/conform.lua b/config/nvim/lua/plugins/conform.lua
index 3204d2d..3bd4e44 100644
--- a/config/nvim/lua/plugins/conform.lua
+++ b/config/nvim/lua/plugins/conform.lua
@@ -14,7 +14,7 @@ return {
graphql = { "prettier" },
lua = { "stylua" },
python = { "isort", "black" },
- go = { "gofmt" },
+ go = { "gofumpt" },
templ = { "templ" },
},
format_on_save = {
@@ -24,12 +24,5 @@ return {
},
},
keys = {
- {
- "<leader>mp",
- function()
- require("conform").format({ lsp_fallback = true, async = false, timeout_ms = 500 })
- end,
- desc = "Format file or range (in visual mode)",
- },
- },
+ },
}
diff --git a/config/nvim/lua/plugins/dap.lua b/config/nvim/lua/plugins/dap.lua
deleted file mode 100644
index ab44a1e..0000000
--- a/config/nvim/lua/plugins/dap.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-return {
- "mfussenegger/nvim-dap",
-}
diff --git a/config/nvim/lua/plugins/dap_go.lua b/config/nvim/lua/plugins/dap_go.lua
index 262aef8..0864da1 100644
--- a/config/nvim/lua/plugins/dap_go.lua
+++ b/config/nvim/lua/plugins/dap_go.lua
@@ -104,55 +104,4 @@ return {
{ text = "→", texthl = "DapStopped", linehl = "DapStopped", numhl = "DapStopped" }
)
end,
- keys = {
- {
- "<F5>",
- function()
- require("dap").continue()
- end,
- silent = true,
- },
- {
- "<F17>", -- S-F5
- function()
- require("dap").restart()
- end,
- silent = true,
- },
- {
- "<F29>", -- C-F5
- function()
- require("dap").terminate()
- end,
- silent = true,
- },
- {
- "<F8>",
- function()
- require("dap").step_over()
- end,
- silent = true,
- },
- {
- "<F7>",
- function()
- require("dap").step_into()
- end,
- silent = true,
- },
- {
- "<F19>", -- S-F7
- function()
- require("dap").step_out()
- end,
- silent = true,
- },
- {
- "<A-b>",
- function()
- require("dap").toggle_breakpoint()
- end,
- silent = true,
- },
- },
}
diff --git a/config/nvim/lua/plugins/dapui.lua b/config/nvim/lua/plugins/dapui.lua
index 5d35e1e..8530fd1 100644
--- a/config/nvim/lua/plugins/dapui.lua
+++ b/config/nvim/lua/plugins/dapui.lua
@@ -4,37 +4,6 @@ return {
"mfussenegger/nvim-dap",
"nvim-neotest/nvim-nio",
},
- keys = {
- {
- "<F6>",
- function()
- require("dapui").toggle()
- end,
- silent = true,
- },
- {
- "<Leader>dh",
- function()
- require("dap.ui.widgets").hover()
- end,
- silent = true,
- },
- {
- "<Leader>dp",
- function()
- require("dap.ui.widgets").preview()
- end,
- silent = true,
- },
- {
- "<F9>",
- function()
- local widgets = require("dap.ui.widgets")
- widgets.centered_float(widgets.scopes)
- end,
- silent = true,
- },
- },
opts = {
icons = {
expanded = "[-]",
diff --git a/config/nvim/lua/plugins/goimpl.lua b/config/nvim/lua/plugins/goimpl.lua
index 0b906fa..9d97fb6 100644
--- a/config/nvim/lua/plugins/goimpl.lua
+++ b/config/nvim/lua/plugins/goimpl.lua
@@ -9,13 +9,4 @@ return {
config = function()
require("telescope").load_extension("goimpl")
end,
- keys = {
- {
- "<leader>im",
- function()
- require("telescope").extensions.goimpl.goimpl({})
- end,
- desc = "Generate stub for interface on a type for golang",
- },
- },
}
diff --git a/config/nvim/lua/plugins/headlines.lua b/config/nvim/lua/plugins/headlines.lua
deleted file mode 100644
index 5d92245..0000000
--- a/config/nvim/lua/plugins/headlines.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-return {
- "lukas-reineke/headlines.nvim",
- dependencies = "nvim-treesitter/nvim-treesitter",
- config = true,
- }
diff --git a/config/nvim/lua/plugins/multicursor.lua b/config/nvim/lua/plugins/multicursor.lua
new file mode 100644
index 0000000..0a762a8
--- /dev/null
+++ b/config/nvim/lua/plugins/multicursor.lua
@@ -0,0 +1,76 @@
+return {
+ "jake-stewart/multicursor.nvim",
+ branch = "1.0",
+ config = function()
+ local mc = require("multicursor-nvim")
+ mc.setup()
+
+ local set = vim.keymap.set
+
+ -- Add or skip cursor above/below the main cursor.
+ set({ "n", "x" }, "<A-up>", function()
+ mc.lineAddCursor(-1)
+ end )
+ set({ "n", "x" }, "<A-down>", function()
+ mc.lineAddCursor(1)
+ end )
+ set({ "n", "x" }, "<leader><up>", function()
+ mc.lineSkipCursor(-1)
+ end)
+ set({ "n", "x" }, "<leader><down>", function()
+ mc.lineSkipCursor(1)
+ end)
+
+ -- Add or skip adding a new cursor by matching word/selection
+ set({ "n", "x" }, "<leader>n", function()
+ mc.matchAddCursor(1)
+ end)
+ set({ "n", "x" }, "<leader>s", function()
+ mc.matchSkipCursor(1)
+ end)
+ set({ "n", "x" }, "<leader>N", function()
+ mc.matchAddCursor(-1)
+ end)
+ set({ "n", "x" }, "<leader>S", function()
+ mc.matchSkipCursor(-1)
+ end)
+
+ -- Add and remove cursors with control + left click.
+ set("n", "<c-leftmouse>", mc.handleMouse)
+ set("n", "<c-leftdrag>", mc.handleMouseDrag)
+ set("n", "<c-leftrelease>", mc.handleMouseRelease)
+
+ -- Disable and enable cursors.
+ set({ "n", "x" }, "<c-q>", mc.toggleCursor)
+
+ -- Mappings defined in a keymap layer only apply when there are
+ -- multiple cursors. This lets you have overlapping mappings.
+ mc.addKeymapLayer(function(layerSet)
+ -- Select a different cursor as the main one.
+ layerSet({ "n", "x" }, "<left>", mc.prevCursor)
+ layerSet({ "n", "x" }, "<right>", mc.nextCursor)
+
+ -- Delete the main cursor.
+ layerSet({ "n", "x" }, "<leader>x", mc.deleteCursor)
+
+ -- Enable and clear cursors using escape.
+ layerSet("n", "<esc>", function()
+ if not mc.cursorsEnabled() then
+ mc.enableCursors()
+ else
+ mc.clearCursors()
+ end
+ end)
+ end)
+
+ -- Customize how cursors look.
+ local hl = vim.api.nvim_set_hl
+ hl(0, "MultiCursorCursor", { reverse = true })
+ hl(0, "MultiCursorVisual", { link = "Visual" })
+ hl(0, "MultiCursorSign", { link = "SignColumn" })
+ hl(0, "MultiCursorMatchPreview", { link = "Search" })
+ hl(0, "MultiCursorDisabledCursor", { reverse = true })
+ hl(0, "MultiCursorDisabledVisual", { link = "Visual" })
+ hl(0, "MultiCursorDisabledSign", { link = "SignColumn" })
+ end,
+}
diff --git a/config/nvim/lua/plugins/resize.lua b/config/nvim/lua/plugins/resize.lua
index 7e22517..bdb3ff6 100644
--- a/config/nvim/lua/plugins/resize.lua
+++ b/config/nvim/lua/plugins/resize.lua
@@ -1,34 +1,4 @@
return {
name = "resize",
dir = "~/.config/nvim/lua/myplugins",
- keys = {
- {
- "<C-A-Left>",
- function()
- require("myplugins.resize").ResizeLeft()
- end,
- silent = true,
- },
- {
- "<C-A-Right>",
- function()
- require("myplugins.resize").ResizeRight()
- end,
- silent = true,
- },
- {
- "<C-A-Up>",
- function()
- require("myplugins.resize").ResizeUp()
- end,
- silent = true,
- },
- {
- "<C-A-Down>",
- function()
- require("myplugins.resize").ResizeDown()
- end,
- silent = true,
- },
- },
}
diff --git a/config/nvim/lua/plugins/telescope.lua b/config/nvim/lua/plugins/telescope.lua
index aabcd9c..018d95c 100644
--- a/config/nvim/lua/plugins/telescope.lua
+++ b/config/nvim/lua/plugins/telescope.lua
@@ -29,22 +29,4 @@ return {
},
})
end,
- keys = {
- { "<leader>ff", "<cmd>Telescope find_files<CR>", noremap = true, silent = true, desc = "Find files" },
- { "<leader>fg", "<cmd>Telescope live_grep<CR>", noremap = true, silent = true, desc = "Live grep" },
- {
- "<leader>fb",
- "<cmd>Telescope current_buffer_fuzzy_fund<CR>",
- noremap = true,
- silent = true,
- desc = "Find current file",
- },
- { "<F4>", "<cmd>Telescope buffers<CR>", noremap = true, silent = true, desc = "Find buffers" },
- { "<leader>gc", "<cmd>Telescope git_commits<CR>", noremap = true, silent = true },
- { "<leader>gs", "<cmd>Telescope git_status<CR>", noremap = true, silent = true },
- { "<leader>ch", "<cmd>Telescope commands_history<CR>", noremap = true, silent = true },
- { "<leader>e", "<cmd>Telescope diagnostics<CR>", noremap = true, silent = true },
- { "gi", "<cmd>Telescope lsp_implementations<CR>", noremap = true, silent = true },
- { "gr", "<cmd>Telescope lsp_references<CR>", noremap = true, silent = true },
- },
}
diff --git a/config/nvim/lua/plugins/tree.lua b/config/nvim/lua/plugins/tree.lua
index 3bf9eed..30c0599 100644
--- a/config/nvim/lua/plugins/tree.lua
+++ b/config/nvim/lua/plugins/tree.lua
@@ -37,18 +37,4 @@ return {
enable = true,
},
},
- keys = {
- {
- "<C-c>",
- function()
- local api = require("nvim-tree.api")
- local global_cwd = vim.fn.getcwd(-1, -1)
- api.tree.change_root(global_cwd)
- end,
- noremap = true,
- silent = true,
- desc = "Change tree root to CWD",
- },
- { "<F3>", ":NvimTreeToggle<CR>", noremap = true, silent = true, desc = "Toggle file tree" },
- },
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 10:47:14 +0000