diff --git a/lazy-lock.json b/lazy-lock.json index 1876bc6..12656f7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,17 +13,18 @@ "mini.nvim": { "branch": "main", "commit": "581724ebb39f4aa70bdbffb891d57d6141d29035" }, "mkdx": { "branch": "master", "commit": "ee667cad506954b706c3fa972fbaaad46b1bf028" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, "nvim-lspconfig": { "branch": "master", "commit": "84e0cd5a3c58e88ef706fdf4a1eed59ded1d3ce2" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" }, - "nvim-treesitter": { "branch": "master", "commit": "55c5c762fee2e813b4e43bbfaf5b91d182bd2875" }, + "nvim-treesitter": { "branch": "master", "commit": "794cf2f6309691d4e9d3945ae33943a3d90ddd84" }, "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "render-markdown.nvim": { "branch": "main", "commit": "b56fa1bc7b513f16a1c361b81438f4944b420a32" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "vim-mutton": { "branch": "master", "commit": "1601de411cfebcb358ab4ed469190d861901ce70" }, "vim-nightfly-colors": { "branch": "master", "commit": "5de76d0f53fd7084027c9bfe75e2bb8e93757087" }, "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 326ea44..c765a12 100644 --- a/lua/config/common-settings.lua +++ b/lua/config/common-settings.lua @@ -20,13 +20,6 @@ vim.keymap.set('v', 'l', 'k', { noremap = true, silent = true }) vim.keymap.set('v', ';', 'l', { noremap = true, silent = true }) --- Настройка сохранения на Ctrl+S -vim.api.nvim_set_keymap('n', '', ':w', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('i', '', ':wa', { noremap = true, silent = true }) - --- Выход из сессии -vim.api.nvim_set_keymap('n', '', ':q!', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('i', '', ':q!', { noremap = true, silent = true }) -- Настройка выхода из режима ввода через Atl+i vim.api.nvim_set_keymap('i', '', '', { noremap = true, silent = true }) @@ -96,8 +89,8 @@ vim.opt.showmatch = true --------------------------------------------------------------------------[[ВИЗУАЛ]]-------------------------------------------------------------------------- vim.o.laststatus = 0 -- Отключает строку состояния ---vim.cmd("colorscheme tokyonight") -vim.cmd("colorscheme gruvbox") +vim.cmd("colorscheme tokyonight-night") +--vim.cmd("colorscheme gruvbox") --vim.cmd("colorscheme astra") -- Применение темы --vim.cmd("colorscheme kanagawa") -- Основная схема --vim.cmd("colorscheme kanagawa-wave") -- Более светлая версия @@ -106,6 +99,7 @@ vim.cmd("colorscheme gruvbox") --vim.cmd("colorscheme nightfly") --vim.cmd("colorscheme randomhue") + vim.defer_fn(function() vim.opt.laststatus = 0 end, 35) local laststatus_values = {0, 3} @@ -115,10 +109,47 @@ vim.keymap.set('n', '', function() vim.opt.laststatus = laststatus_values[current_index] end, { noremap = true, silent = true }) +-- Для Mutton +local normal_bg = vim.fn.synIDattr(vim.fn.hlID("Normal"), "bg") +vim.api.nvim_set_hl(0, "EndOfBuffer", { fg = normal_bg} ) -- overrides `~` character at the end of buffer +vim.api.nvim_set_hl(0, "VertSplit", { fg = normal_bg} ) -- overrides `~` character at the end of buffer +vim.api.nvim_set_hl(0, "WinSeparator", { fg = normal_bg }) --- Включение относительной нумерации строк ---vim.opt.number = true -- Включить абсолютную нумерацию строк ---vim.opt.relativenumber = true -- Включить относительную нумерацию строк + + + + +local function run_once_on_md() + local executed = false -- Флаг для отслеживания выполнения + vim.api.nvim_create_autocmd("BufEnter", { + pattern = "*.md", + callback = function() + if not executed then + vim.defer_fn(function() + vim.cmd("MuttonToggle") -- Выполнение команды через 200 мс + end, 1) + executed = true -- Установить флаг после выполнения + end + end, + }) +end + +run_once_on_md() + + + + + +--vim.opt.number = true -- Включить абсолютную нумерацию слева +--vim.opt.relativenumber = true -- Включить относительную нумерацию справа + + + + + + + +vim.api.nvim_set_hl(0, "SignColumn", { bg = "None", fg = "#abb2bf" }) -- прозрачный фон -- Определение функции для переключения number и relativenumber local function toggle_number_and_relativenumber() local number = vim.opt.number:get() diff --git a/lua/config/image.lua b/lua/config/image.lua new file mode 100644 index 0000000..ce5a15f --- /dev/null +++ b/lua/config/image.lua @@ -0,0 +1,37 @@ +require("image").setup({ + backend = "ueberzug", + processor = "magick_cli", -- or "magick_cli" + integrations = { + markdown = { + enabled = true, + clear_in_insert_mode = false, + download_remote_images = true, + only_render_image_at_cursor = true, + floating_windows = false, -- if true, images will be rendered in floating markdown windows + filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here + }, + neorg = { + enabled = true, + filetypes = { "norg" }, + }, + typst = { + enabled = true, + filetypes = { "typst" }, + }, + html = { + enabled = false, + }, + css = { + enabled = false, + }, + }, + max_width = nil, + max_height = nil, + max_width_window_percentage = nil, + max_height_window_percentage = 50, + window_overlap_clear_enabled = true, -- toggles images when windows are overlapped + window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" }, + editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus + tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off) + hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened +}) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 9b8b61b..eeb3864 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -29,9 +29,9 @@ require("lazy").setup({ }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "habamax" } }, - -- automatically check for plugin updates - checker = { enabled = true }, + install = { colorscheme = { "habamax" } }, + -- automatically check for plugin updates + checker = { enabled = true }, }) local function augroup(name) diff --git a/lua/config/render-markdown.lua b/lua/config/render-markdown.lua index 2514e85..75f475e 100644 --- a/lua/config/render-markdown.lua +++ b/lua/config/render-markdown.lua @@ -5,7 +5,7 @@ require('render-markdown').setup({ left_pad = 2, right_pad = 4, border = true, - border_virtual = true, + border_virtual = false, }, sign = { enabled = false }, }) diff --git a/lua/config/telescope.lua b/lua/config/telescope.lua deleted file mode 100644 index 020afa8..0000000 --- a/lua/config/telescope.lua +++ /dev/null @@ -1,43 +0,0 @@ -require('telescope').setup({ ---дополнения - extensions = { - fzf = { - fuzzy = true, -- false will only do exact matching - override_generic_sorter = true, -- override the generic sorter - override_file_sorter = true, -- override the file sorter - case_mode = "ignore_case", -- or "ignore_case" or "respect_case" - -- the default case_mode is "smart_case" - } - }, ---настройки - defaults = { - debug = true, - mappings = { - i = { - -- Замена j на l для перемещения вниз - ["k"] = "move_selection_next", - -- Замена k на h для перемещения вверх - ["l"] = "move_selection_previous", - -- Отключение оригинальных j и k, если нужно - ["j"] = false, - }, - n = { - -- Аналогично для режима normal - ["k"] = "move_selection_next", - ["l"] = "move_selection_previous", - ["j"] = false, - }, - }, - }, -}) - - - --- To get fzf loaded and working with telescope, you need to call --- load_extension, somewhere after setup function: -require('telescope').load_extension('fzf') - -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'o', builtin.find_files, { desc = 'Telescope find files' }) -vim.keymap.set('n', 'f', builtin.live_grep, { desc = 'Telescope live grep' }) - diff --git a/lua/plugins.lua b/lua/plugins.lua index 763b9a4..9d04001 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -103,4 +103,5 @@ return { --{ "akinsho/bufferline.nvim", version = "*", dependencies = "nvim-tree/nvim-web-devicons" }, { "williamboman/mason.nvim" }, { "nvim-lua/plenary.nvim", lazy = true }, + {'gabenespoli/vim-mutton'}, }