This commit is contained in:
СЕМА 2025-03-02 20:01:20 +03:00
parent 3dd801888d
commit c8015ebb31
7 changed files with 57 additions and 25 deletions

View File

@ -17,4 +17,5 @@ require("config.indent-blankline")
require("config.fzf")
require("config.noice")
require("config.mkdx")
require("config.vimwiki")

View File

@ -3,7 +3,8 @@
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"fzf-lua": { "branch": "main", "commit": "ae9378a48fcf07475d93b3dc7775c2aab0b9fa7b" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"fzf-lua": { "branch": "main", "commit": "480e29c20cb324bb9bf3d6f7d8e5505bcb49d555" },
"gruvbox": { "branch": "master", "commit": "f1ecde848f0cdba877acb0c740320568252cc482" },
"indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
"kanagawa.nvim": { "branch": "master", "commit": "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84" },
@ -25,6 +26,7 @@
"suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" },
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"vim-nightfly-colors": { "branch": "master", "commit": "5de76d0f53fd7084027c9bfe75e2bb8e93757087" },
"vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
"zoxide.vim": { "branch": "master", "commit": "b1e70b6fc1682a83929aee63680d2b43456fe9a5" }
}

View File

@ -1,17 +1,27 @@
vim.keymap.set('n', '<Plug>(mkdx-gen-or-upd-toc)', '<Plug>', { noremap = true, silent = true }) -- leader i
vim.keymap.set('n', '<Plug>(mkdx-toggle-checkbox-n)', '<Plug>', { noremap = true, silent = true }) -- leader t
vim.keymap.set('n', '<leader>/', '<Nop>', { noremap = true, silent = true })
vim.keymap.set('v', '<leader>/', '<Nop>', { noremap = true, silent = true })
-- Italic
vim.keymap.set('n', '<leader>/', '<Nop>', { noremap = true, silent = true })
vim.keymap.set('v', '<leader>/', '<Nop>', { noremap = true, silent = true })
vim.keymap.set('n', '<leader>i', '<Plug>(mkdx-text-italic-n)', { noremap = true, silent = true })
vim.keymap.set('v', '<leader>i', '<Plug>(mkdx-text-italic-v)', { noremap = true, silent = true })
-- Toggle Checkbox
vim.keymap.set('n', '<leader>c', '<Plug>(mkdx-toggle-checkbox-n)', { noremap = true, silent = true })
vim.keymap.set('n', '<Plug>(mkdx-toggle-checkbox-n)', '<Plug>', { noremap = true, silent = true }) -- leader t
vim.keymap.set('v', '<leader>t', '<Nop>', { noremap = true, silent = true })
vim.keymap.set('v', '<leader>lt', '<Nop>', { noremap = true, silent = true })
--vim.keymap.set('v', '<leader>c', '<Nop>', { noremap = true, silent = true })
--vim.keymap.set('v', '<leader>c', '<Plug>(mkdx-toggle-checkbox-n)', { noremap = true, silent = true })
vim.keymap.set('v', '<leader>lc', '<Plug>(mkdx-toggle-checkbox-n)', { noremap = true, silent = true })
-- Generate/Update TOC
vim.keymap.set('n', '<Plug>(mkdx-gen-or-upd-toc)', '<Plug>', { noremap = true, silent = true }) -- leader i
vim.keymap.set('n', '<leader>h', '<Plug>(mkdx-gen-or-upd-toc)', { noremap = true, silent = true })

View File

@ -20,8 +20,8 @@ cmp.setup({
{ name = 'buffer' },
{ name = 'nvim_lsp_signature_help' },
{ name = 'render-markdown' },
{ name = 'path' },
},
-- другие настройки
})
-- Diagnostic

View File

@ -1,4 +1,6 @@
require('render-markdown').setup({
--для vim wiki
file_types = { 'markdown', 'vimwiki' },
heading = {
width = 'block',
left_pad = 2,
@ -8,3 +10,6 @@ require('render-markdown').setup({
},
sign = { enabled = false },
})
-- Нужно для корректной работы с вим вики
vim.treesitter.language.register('markdown', 'vimwiki')

14
lua/config/vimwiki.lua Normal file
View File

@ -0,0 +1,14 @@
local function setup_vimwiki()
-- Настройки Vimwiki
vim.g.vimwiki_list = {
{
path = '~/desktop/govno', -- Путь к вашей директории wiki
syntax = 'markdown', -- Используйте markdown или wiki
ext = '.md', -- Расширение файла
},
}
end
return {
setup = setup_vimwiki,
}

View File

@ -70,19 +70,20 @@ return {
"rcarriga/nvim-notify",
},
},
{
"hrsh7th/nvim-cmp"
},
{
"hrsh7th/cmp-nvim-lsp"
"vimwiki/vimwiki",
lazy = false, -- Плагин должен загружаться сразу, так как он требует настройки
config = function()
-- Подключаем настройки из отдельного файла
local vimwiki_config = require("config.vimwiki")
vimwiki_config.setup()
end,
},
{"hrsh7th/nvim-cmp"},
{"hrsh7th/cmp-nvim-lsp" },
{"hrsh7th/cmp-nvim-lsp-signature-help" },
{'hrsh7th/cmp-path'},
{
"ibhagwan/fzf-lua",
-- optional for icon support
@ -110,6 +111,5 @@ return {
{ "kyazdani42/nvim-tree.lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
{ "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons" },
{ "williamboman/mason.nvim" },
{ "hrsh7th/cmp-nvim-lsp-signature-help" },
{ "nvim-lua/plenary.nvim", lazy = true },
}