Compare commits

...

4 commits

5 changed files with 143 additions and 144 deletions

View file

@ -16,7 +16,7 @@
# то не получится ставить расширения. Потому что там софт ставится от рута и vscode # то не получится ставить расширения. Потому что там софт ставится от рута и vscode
# будет пытаться установить расширения в каталог nix store, куда нельзя что либо ставить без рута. # будет пытаться установить расширения в каталог nix store, куда нельзя что либо ставить без рута.
packages = with pkgs; [ packages = with pkgs; [
# vscodium vscodium
]; ];
sessionVariables = { sessionVariables = {

View file

@ -105,9 +105,19 @@ require('lazy').setup({
-- Autoformat markdown tables -- Autoformat markdown tables
{ {
'Kicamon/markdown-table-mode.nvim', -- Если не работает, то можно прописать `:Mtm`. Мб поможет 'Kicamon/markdown-table-mode.nvim',
config = function() config = function()
require('markdown-table-mode').setup() require('markdown-table-mode').setup { -- Если не работает, то можно прописать `:Mtm`
filetype = {
'*.md',
},
options = {
insert = true, -- when typing "|"
insert_leave = true, -- when leaving insert
pad_separator_line = false, -- add space in separator line
alig_style = 'default', -- default, left, center, right
},
}
end, end,
}, },

View file

@ -1,39 +1,31 @@
{ {
"LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"edge": { "branch": "master", "commit": "8eeab1bc9d93eec3511cb4d3c87d2d599c7ce3d4" },
"everforest": { "branch": "master", "commit": "ffa5a2032fd41903135fa829bd4b49ba2e1d5d18" },
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
"friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" }, "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
"gitsigns.nvim": { "branch": "main", "commit": "d600d3922c1d001422689319a8f915136bb64e1e" }, "gitsigns.nvim": { "branch": "main", "commit": "d600d3922c1d001422689319a8f915136bb64e1e" },
"go.nvim": { "branch": "master", "commit": "ecffa1757ac8e84e1e128f12e0fdbf8418354f6f" }, "go.nvim": { "branch": "master", "commit": "ecffa1757ac8e84e1e128f12e0fdbf8418354f6f" },
"gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" },
"gruvbox.nvim": { "branch": "main", "commit": "a933d8666dad9363dc6908ae72cfc832299c2f59" }, "gruvbox.nvim": { "branch": "main", "commit": "a933d8666dad9363dc6908ae72cfc832299c2f59" },
"guihua.lua": { "branch": "master", "commit": "3bce83823fe59fe438b0484777e56250153aaebf" }, "guihua.lua": { "branch": "master", "commit": "3bce83823fe59fe438b0484777e56250153aaebf" },
"hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" }, "hydra.nvim": { "branch": "main", "commit": "8c4a9f621ec7cdc30411a1f3b6d5eebb12b469dc" },
"image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" }, "image.nvim": { "branch": "master", "commit": "2e2d28b7734b5efdfc1219f4da8a46c761587bc2" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
"luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, "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-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
"mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "1255518cb067e038a4755f5cb3e980f79b6ab89c" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"mini.nvim": { "branch": "main", "commit": "a8b1d74f45dadf3554c0eed784c6ccd8ade67883" }, "mini.nvim": { "branch": "main", "commit": "a8b1d74f45dadf3554c0eed784c6ccd8ade67883" },
"monokai-pro.nvim": { "branch": "master", "commit": "872f774303f79416000e8049630052f4124d9534" },
"multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" }, "multicursors.nvim": { "branch": "main", "commit": "72225ea9e4443c3f4b9df91d0193e07c4ee8d382" },
"neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, "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" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
@ -49,14 +41,11 @@
"nvim-treesitter-context": { "branch": "master", "commit": "b8ec6e391020a3ee18547f3343b25fc7c9ada9cc" }, "nvim-treesitter-context": { "branch": "master", "commit": "b8ec6e391020a3ee18547f3343b25fc7c9ada9cc" },
"nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" }, "nvim-web-devicons": { "branch": "master", "commit": "c90dee4e930ab9f49fa6d77f289bff335b49e972" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"rose-pine": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" },
"rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
"sonokai": { "branch": "master", "commit": "f59c796780655c3b9da442d310ad2f2d735f2e56" },
"symbol-usage.nvim": { "branch": "main", "commit": "e8712de8f339d40f96c0c89566f9bb97e647599d" }, "symbol-usage.nvim": { "branch": "main", "commit": "e8712de8f339d40f96c0c89566f9bb97e647599d" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
} }

View file

@ -26,7 +26,7 @@ return {
-- Disable "format_on_save lsp_fallback" for languages that don't -- Disable "format_on_save lsp_fallback" for languages that don't
-- have a well standardized coding style. You can add additional -- have a well standardized coding style. You can add additional
-- languages here or re-enable it for the disabled ones. -- languages here or re-enable it for the disabled ones.
local disable_filetypes = { c = true, cpp = true } local disable_filetypes = { c = true, cpp = true, json = true } -- Руками можно отформатировать через `<leader>f`
local lsp_format_opt local lsp_format_opt
if disable_filetypes[vim.bo[bufnr].filetype] then if disable_filetypes[vim.bo[bufnr].filetype] then
lsp_format_opt = 'never' lsp_format_opt = 'never'

View file

@ -12,84 +12,84 @@
-- https://dotfyle.com/neovim/colorscheme/top -- https://dotfyle.com/neovim/colorscheme/top
-- Убедитесь, что Sonokai установлен через lazy.nvim или другой менеджер -- -- Убедитесь, что Sonokai установлен через lazy.nvim или другой менеджер
local variants = { 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' } -- local variants = { 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' }
-- Создаем псевдонимы для каждой темы -- -- Создаем псевдонимы для каждой темы
for _, variant in ipairs(variants) do -- for _, variant in ipairs(variants) do
local alias = 'sonokai-' .. variant -- local alias = 'sonokai-' .. variant
vim.api.nvim_create_user_command('Colorscheme' .. variant, function() -- vim.api.nvim_create_user_command('Colorscheme' .. variant, function()
vim.g.sonokai_style = variant -- vim.g.sonokai_style = variant
vim.cmd 'colorscheme sonokai' -- vim.cmd 'colorscheme sonokai'
end, {}) -- end, {})
-- Регистрируем в Neovim как отдельный colorscheme -- -- Регистрируем в Neovim как отдельный colorscheme
vim.api.nvim_set_hl(0, alias, {}) -- vim.api.nvim_set_hl(0, alias, {})
vim.cmd(string.format("autocmd ColorSchemePre %s let g:sonokai_style = '%s' | colorscheme sonokai", alias, variant)) -- vim.cmd(string.format("autocmd ColorSchemePre %s let g:sonokai_style = '%s' | colorscheme sonokai", alias, variant))
end -- end
return { return {
{ -- {
'folke/tokyonight.nvim', -- 'folke/tokyonight.nvim',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- 'tokyonight-storm', 'tokyonight-moon', 'tokyonight-day', 'tokyonight-night' -- -- 'tokyonight-storm', 'tokyonight-moon', 'tokyonight-day', 'tokyonight-night'
-- vim.cmd.colorscheme 'tokyonight-night' -- -- vim.cmd.colorscheme 'tokyonight-night'
vim.cmd.hi 'Comment gui=none' -- Убрать курсив у коммента в коде -- vim.cmd.hi 'Comment gui=none' -- Убрать курсив у коммента в коде
end, -- end,
}, -- },
{ -- {
'rose-pine/neovim', -- 'rose-pine/neovim',
name = 'rose-pine', -- name = 'rose-pine',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- 'rose-pine-moon', 'rose-pine-main', 'rose-pine-dawn' -- -- 'rose-pine-moon', 'rose-pine-main', 'rose-pine-dawn'
-- vim.cmd.colorscheme 'rose-pine-main' -- -- vim.cmd.colorscheme 'rose-pine-main'
end, -- end,
}, -- },
{ -- {
'loctvl842/monokai-pro.nvim', -- 'loctvl842/monokai-pro.nvim',
priority = 1000, -- priority = 1000,
config = function() -- config = function()
-- 'monokai-pro', 'monokai-pro-classic', 'monokai-pro-default', 'monokai-pro-machine', -- -- 'monokai-pro', 'monokai-pro-classic', 'monokai-pro-default', 'monokai-pro-machine',
-- 'monokai-pro-octagon', 'monokai-pro-spectrum', 'monokai-pro-ristretto' -- -- 'monokai-pro-octagon', 'monokai-pro-spectrum', 'monokai-pro-ristretto'
-- vim.cmd.colorscheme 'monokai-pro' -- -- vim.cmd.colorscheme 'monokai-pro'
end, -- end,
}, -- },
{ -- {
'catppuccin/nvim', -- 'catppuccin/nvim',
name = 'catppuccin', -- name = 'catppuccin',
priority = 1000, -- priority = 1000,
config = function() -- config = function()
-- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe', -- -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe',
-- 'catppuccin-macchiato', 'catppuccin-mocha' -- -- 'catppuccin-macchiato', 'catppuccin-mocha'
-- vim.cmd.colorscheme 'catppuccin' -- -- vim.cmd.colorscheme 'catppuccin'
end, -- end,
}, -- },
{ -- {
'rebelot/kanagawa.nvim', -- 'rebelot/kanagawa.nvim',
priority = 1000, -- priority = 1000,
config = function() -- config = function()
-- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus', -- -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus',
-- vim.cmd.colorscheme 'kanagawa-dragon' -- -- vim.cmd.colorscheme 'kanagawa-dragon'
end, -- end,
}, -- },
{ -- {
'EdenEast/nightfox.nvim', -- 'EdenEast/nightfox.nvim',
priority = 1000, -- priority = 1000,
config = function() -- config = function()
-- 'nightfox', 'dayfox', 'dawnfox', 'duskfox' -- -- 'nightfox', 'dayfox', 'dawnfox', 'duskfox'
-- 'nordfox', 'terafox', 'carbonfox' -- -- 'nordfox', 'terafox', 'carbonfox'
-- vim.cmd.colorscheme 'carbonfox' -- -- vim.cmd.colorscheme 'carbonfox'
end, -- end,
}, -- },
{ -- {
'AlexvZyl/nordic.nvim', -- 'AlexvZyl/nordic.nvim',
priority = 1000, -- priority = 1000,
config = function() -- config = function()
-- vim.cmd.colorscheme 'nordic' -- -- vim.cmd.colorscheme 'nordic'
end, -- end,
}, -- },
---------------------------------------------------------- ----------------------------------------------------------
-- Гандоны не дают выбрать тему нормально -- -- Гандоны не дают выбрать тему нормально --
@ -149,59 +149,59 @@ return {
vim.cmd.colorscheme 'gruvbox' vim.cmd.colorscheme 'gruvbox'
end, end,
}, },
{ -- {
'sainnhe/gruvbox-material', -- 'sainnhe/gruvbox-material',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- 'hard', 'medium', 'soft' -- -- 'hard', 'medium', 'soft'
vim.g.gruvbox_material_background = 'medium' -- vim.g.gruvbox_material_background = 'medium'
-- 'material', 'mix', 'original' -- -- 'material', 'mix', 'original'
vim.g.gruvbox_material_foreground = 'mix' -- vim.g.gruvbox_material_foreground = 'mix'
-- 'grey', 'colored', 'highlighted' -- -- 'grey', 'colored', 'highlighted'
vim.g.gruvbox_material_diagnostic_virtual_text = 'colored' -- vim.g.gruvbox_material_diagnostic_virtual_text = 'colored'
vim.g.gruvbox_material_diagnostic_line_highlight = 1 -- vim.g.gruvbox_material_diagnostic_line_highlight = 1
vim.g.gruvbox_material_diagnostic_text_highlight = 1 -- vim.g.gruvbox_material_diagnostic_text_highlight = 1
-- vim.g.gruvbox_material_inlay_hints_background = 'dimmed' -- -- vim.g.gruvbox_material_inlay_hints_background = 'dimmed'
-- vim.g.gruvbox_material_better_performance = 1 -- -- vim.g.gruvbox_material_better_performance = 1
-- vim.g.gruvbox_material_spell_foreground = 'colored' -- -- vim.g.gruvbox_material_spell_foreground = 'colored'
-- vim.g.gruvbox_material_enable_bold = 1 -- -- vim.g.gruvbox_material_enable_bold = 1
-- vim.g.gruvbox_material_enable_italic = true -- -- vim.g.gruvbox_material_enable_italic = true
-- vim.cmd.colorscheme 'gruvbox-material' -- -- vim.cmd.colorscheme 'gruvbox-material'
end, -- end,
}, -- },
{ -- {
'sainnhe/everforest', -- 'sainnhe/everforest',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- 'hard', 'medium', 'soft' -- -- 'hard', 'medium', 'soft'
vim.g.everforest_background = 'hard' -- vim.g.everforest_background = 'hard'
vim.g.everforest_better_performance = 1 -- vim.g.everforest_better_performance = 1
-- vim.g.everforest_enable_italic = true -- -- vim.g.everforest_enable_italic = true
-- vim.cmd.colorscheme 'everforest' -- -- vim.cmd.colorscheme 'everforest'
end, -- end,
}, -- },
{ -- {
'sainnhe/sonokai', -- 'sainnhe/sonokai',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- Очень разные темы -- -- Очень разные темы
-- 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso' -- -- 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso'
vim.g.sonokai_style = 'shusia' -- vim.g.sonokai_style = 'shusia'
vim.g.sonokai_better_performance = 1 -- vim.g.sonokai_better_performance = 1
-- vim.g.sonokai_enable_italic = true -- -- vim.g.sonokai_enable_italic = true
-- vim.cmd.colorscheme 'sonokai' -- -- vim.cmd.colorscheme 'sonokai'
end, -- end,
}, -- },
{ -- {
'sainnhe/edge', -- 'sainnhe/edge',
priority = 1000, -- priority = 1000,
init = function() -- init = function()
-- 'default', 'aura', 'neon' -- -- 'default', 'aura', 'neon'
vim.g.edge_style = 'default' -- vim.g.edge_style = 'default'
vim.g.edge_better_performance = 1 -- vim.g.edge_better_performance = 1
-- vim.g.edge_enable_italic = true -- -- vim.g.edge_enable_italic = true
-- vim.cmd.colorscheme 'edge' -- -- vim.cmd.colorscheme 'edge'
end, -- end,
}, -- },
} }