From 7fc7225f5db640148ac328c1721e37f19e0070e4 Mon Sep 17 00:00:00 2001 From: urec56 Date: Sun, 13 Jul 2025 18:09:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=BF=D0=BB=D0=B0=D0=B3?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0=20=D0=B4=D0=BB=D1=8F=20md=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86.=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nvim/lazy-lock.json | 13 +- nvim/lua/kickstart/plugins/themes.lua | 256 +++++++++++++------------- 2 files changed, 129 insertions(+), 140 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 8336938..e355c26 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,39 +1,31 @@ { "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "edge": { "branch": "master", "commit": "8eeab1bc9d93eec3511cb4d3c87d2d599c7ce3d4" }, - "everforest": { "branch": "master", "commit": "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" }, "gitsigns.nvim": { "branch": "main", "commit": "d600d3922c1d001422689319a8f915136bb64e1e" }, "go.nvim": { "branch": "master", "commit": "ecffa1757ac8e84e1e128f12e0fdbf8418354f6f" }, - "gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" }, "gruvbox.nvim": { "branch": "main", "commit": "a933d8666dad9363dc6908ae72cfc832299c2f59" }, "guihua.lua": { "branch": "master", "commit": "3bce83823fe59fe438b0484777e56250153aaebf" }, "hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" }, "image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, - "markdown-table-mode.nvim": { "branch": "main", "commit": "fe207ea7cef615ccaf2c0f1257c58ffa0a50a9f5" }, + "markdown-table-mode.nvim": { "branch": "main", "commit": "302ca4c1016c4895938027003a7b71d65a618b09" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.nvim": { "branch": "main", "commit": "a8b1d74f45dadf3554c0eed784c6ccd8ade67883" }, - "monokai-pro.nvim": { "branch": "master", "commit": "872f774303f79416000e8049630052f4124d9534" }, "multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" }, "neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, - "nordic.nvim": { "branch": "main", "commit": "6afe957722fb1b0ec7ca5fbea5a651bcca55f3e1" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, @@ -49,14 +41,11 @@ "nvim-treesitter-context": { "branch": "master", "commit": "b8ec6e391020a3ee18547f3343b25fc7c9ada9cc" }, "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rose-pine": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, - "sonokai": { "branch": "master", "commit": "f59c796780655c3b9da442d310ad2f2d735f2e56" }, "symbol-usage.nvim": { "branch": "main", "commit": "e8712de8f339d40f96c0c89566f9bb97e647599d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/nvim/lua/kickstart/plugins/themes.lua b/nvim/lua/kickstart/plugins/themes.lua index 486365a..e3fa9f7 100644 --- a/nvim/lua/kickstart/plugins/themes.lua +++ b/nvim/lua/kickstart/plugins/themes.lua @@ -12,84 +12,84 @@ -- https://dotfyle.com/neovim/colorscheme/top --- Убедитесь, что Sonokai установлен через lazy.nvim или другой менеджер -local variants = { 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' } +-- -- Убедитесь, что Sonokai установлен через lazy.nvim или другой менеджер +-- local variants = { 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' } --- Создаем псевдонимы для каждой темы -for _, variant in ipairs(variants) do - local alias = 'sonokai-' .. variant - vim.api.nvim_create_user_command('Colorscheme' .. variant, function() - vim.g.sonokai_style = variant - vim.cmd 'colorscheme sonokai' - end, {}) +-- -- Создаем псевдонимы для каждой темы +-- for _, variant in ipairs(variants) do +-- local alias = 'sonokai-' .. variant +-- vim.api.nvim_create_user_command('Colorscheme' .. variant, function() +-- vim.g.sonokai_style = variant +-- vim.cmd 'colorscheme sonokai' +-- end, {}) - -- Регистрируем в Neovim как отдельный colorscheme - vim.api.nvim_set_hl(0, alias, {}) - vim.cmd(string.format("autocmd ColorSchemePre %s let g:sonokai_style = '%s' | colorscheme sonokai", alias, variant)) -end +-- -- Регистрируем в Neovim как отдельный colorscheme +-- vim.api.nvim_set_hl(0, alias, {}) +-- vim.cmd(string.format("autocmd ColorSchemePre %s let g:sonokai_style = '%s' | colorscheme sonokai", alias, variant)) +-- end return { - { - 'folke/tokyonight.nvim', - priority = 1000, - init = function() - -- 'tokyonight-storm', 'tokyonight-moon', 'tokyonight-day', 'tokyonight-night' - -- vim.cmd.colorscheme 'tokyonight-night' - vim.cmd.hi 'Comment gui=none' -- Убрать курсив у коммента в коде - end, - }, - { - 'rose-pine/neovim', - name = 'rose-pine', - priority = 1000, - init = function() - -- 'rose-pine-moon', 'rose-pine-main', 'rose-pine-dawn' - -- vim.cmd.colorscheme 'rose-pine-main' - end, - }, - { - 'loctvl842/monokai-pro.nvim', - priority = 1000, - config = function() - -- 'monokai-pro', 'monokai-pro-classic', 'monokai-pro-default', 'monokai-pro-machine', - -- 'monokai-pro-octagon', 'monokai-pro-spectrum', 'monokai-pro-ristretto' - -- vim.cmd.colorscheme 'monokai-pro' - end, - }, - { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 1000, - config = function() - -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe', - -- 'catppuccin-macchiato', 'catppuccin-mocha' - -- vim.cmd.colorscheme 'catppuccin' - end, - }, - { - 'rebelot/kanagawa.nvim', - priority = 1000, - config = function() - -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus', - -- vim.cmd.colorscheme 'kanagawa-dragon' - end, - }, - { - 'EdenEast/nightfox.nvim', - priority = 1000, - config = function() - -- 'nightfox', 'dayfox', 'dawnfox', 'duskfox' - -- 'nordfox', 'terafox', 'carbonfox' - -- vim.cmd.colorscheme 'carbonfox' - end, - }, - { - 'AlexvZyl/nordic.nvim', - priority = 1000, - config = function() - -- vim.cmd.colorscheme 'nordic' - end, - }, + -- { + -- 'folke/tokyonight.nvim', + -- priority = 1000, + -- init = function() + -- -- 'tokyonight-storm', 'tokyonight-moon', 'tokyonight-day', 'tokyonight-night' + -- -- vim.cmd.colorscheme 'tokyonight-night' + -- vim.cmd.hi 'Comment gui=none' -- Убрать курсив у коммента в коде + -- end, + -- }, + -- { + -- 'rose-pine/neovim', + -- name = 'rose-pine', + -- priority = 1000, + -- init = function() + -- -- 'rose-pine-moon', 'rose-pine-main', 'rose-pine-dawn' + -- -- vim.cmd.colorscheme 'rose-pine-main' + -- end, + -- }, + -- { + -- 'loctvl842/monokai-pro.nvim', + -- priority = 1000, + -- config = function() + -- -- 'monokai-pro', 'monokai-pro-classic', 'monokai-pro-default', 'monokai-pro-machine', + -- -- 'monokai-pro-octagon', 'monokai-pro-spectrum', 'monokai-pro-ristretto' + -- -- vim.cmd.colorscheme 'monokai-pro' + -- end, + -- }, + -- { + -- 'catppuccin/nvim', + -- name = 'catppuccin', + -- priority = 1000, + -- config = function() + -- -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe', + -- -- 'catppuccin-macchiato', 'catppuccin-mocha' + -- -- vim.cmd.colorscheme 'catppuccin' + -- end, + -- }, + -- { + -- 'rebelot/kanagawa.nvim', + -- priority = 1000, + -- config = function() + -- -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus', + -- -- vim.cmd.colorscheme 'kanagawa-dragon' + -- end, + -- }, + -- { + -- 'EdenEast/nightfox.nvim', + -- priority = 1000, + -- config = function() + -- -- 'nightfox', 'dayfox', 'dawnfox', 'duskfox' + -- -- 'nordfox', 'terafox', 'carbonfox' + -- -- vim.cmd.colorscheme 'carbonfox' + -- end, + -- }, + -- { + -- 'AlexvZyl/nordic.nvim', + -- priority = 1000, + -- config = function() + -- -- vim.cmd.colorscheme 'nordic' + -- end, + -- }, ---------------------------------------------------------- -- Гандоны не дают выбрать тему нормально -- @@ -149,59 +149,59 @@ return { vim.cmd.colorscheme 'gruvbox' end, }, - { - 'sainnhe/gruvbox-material', - priority = 1000, - init = function() - -- 'hard', 'medium', 'soft' - vim.g.gruvbox_material_background = 'medium' - -- 'material', 'mix', 'original' - vim.g.gruvbox_material_foreground = 'mix' - -- 'grey', 'colored', 'highlighted' - vim.g.gruvbox_material_diagnostic_virtual_text = 'colored' - vim.g.gruvbox_material_diagnostic_line_highlight = 1 - vim.g.gruvbox_material_diagnostic_text_highlight = 1 + -- { + -- 'sainnhe/gruvbox-material', + -- priority = 1000, + -- init = function() + -- -- 'hard', 'medium', 'soft' + -- vim.g.gruvbox_material_background = 'medium' + -- -- 'material', 'mix', 'original' + -- vim.g.gruvbox_material_foreground = 'mix' + -- -- 'grey', 'colored', 'highlighted' + -- vim.g.gruvbox_material_diagnostic_virtual_text = 'colored' + -- vim.g.gruvbox_material_diagnostic_line_highlight = 1 + -- vim.g.gruvbox_material_diagnostic_text_highlight = 1 - -- vim.g.gruvbox_material_inlay_hints_background = 'dimmed' - -- vim.g.gruvbox_material_better_performance = 1 - -- vim.g.gruvbox_material_spell_foreground = 'colored' - -- vim.g.gruvbox_material_enable_bold = 1 - -- vim.g.gruvbox_material_enable_italic = true - -- vim.cmd.colorscheme 'gruvbox-material' - end, - }, - { - 'sainnhe/everforest', - priority = 1000, - init = function() - -- 'hard', 'medium', 'soft' - vim.g.everforest_background = 'hard' - vim.g.everforest_better_performance = 1 - -- vim.g.everforest_enable_italic = true - -- vim.cmd.colorscheme 'everforest' - end, - }, - { - 'sainnhe/sonokai', - priority = 1000, - init = function() - -- Очень разные темы - -- 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' - vim.g.sonokai_style = 'shusia' - vim.g.sonokai_better_performance = 1 - -- vim.g.sonokai_enable_italic = true - -- vim.cmd.colorscheme 'sonokai' - end, - }, - { - 'sainnhe/edge', - priority = 1000, - init = function() - -- 'default', 'aura', 'neon' - vim.g.edge_style = 'default' - vim.g.edge_better_performance = 1 - -- vim.g.edge_enable_italic = true - -- vim.cmd.colorscheme 'edge' - end, - }, + -- -- vim.g.gruvbox_material_inlay_hints_background = 'dimmed' + -- -- vim.g.gruvbox_material_better_performance = 1 + -- -- vim.g.gruvbox_material_spell_foreground = 'colored' + -- -- vim.g.gruvbox_material_enable_bold = 1 + -- -- vim.g.gruvbox_material_enable_italic = true + -- -- vim.cmd.colorscheme 'gruvbox-material' + -- end, + -- }, + -- { + -- 'sainnhe/everforest', + -- priority = 1000, + -- init = function() + -- -- 'hard', 'medium', 'soft' + -- vim.g.everforest_background = 'hard' + -- vim.g.everforest_better_performance = 1 + -- -- vim.g.everforest_enable_italic = true + -- -- vim.cmd.colorscheme 'everforest' + -- end, + -- }, + -- { + -- 'sainnhe/sonokai', + -- priority = 1000, + -- init = function() + -- -- Очень разные темы + -- -- 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' + -- vim.g.sonokai_style = 'shusia' + -- vim.g.sonokai_better_performance = 1 + -- -- vim.g.sonokai_enable_italic = true + -- -- vim.cmd.colorscheme 'sonokai' + -- end, + -- }, + -- { + -- 'sainnhe/edge', + -- priority = 1000, + -- init = function() + -- -- 'default', 'aura', 'neon' + -- vim.g.edge_style = 'default' + -- vim.g.edge_better_performance = 1 + -- -- vim.g.edge_enable_italic = true + -- -- vim.cmd.colorscheme 'edge' + -- end, + -- }, }