add diffview.nvim and format lua code

nvim/init.lua

@@ -92,6 +92,9 @@ require('lazy').setup({
     -- Automated session manager
     require 'custom.plugins.sessions',
 
+    -- Plugins for git
+    require 'custom.plugins.git',
+
     -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
     --    This is the easiest way to modularize your config.
     --

nvim/lazy-lock.json

@@ -1,55 +1,56 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
   "auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" },
   "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" },
+  "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "edge": { "branch": "master", "commit": "12ff979b43e3660053e14cd65101d5928e56f422" },
-  "everforest": { "branch": "master", "commit": "730f9dd8ee698ad166d7abfca5dc06e90d4acf5b" },
+  "everforest": { "branch": "master", "commit": "84fbfc99c9853408682f104063a7ef4465dae46a" },
   "fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
   "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
   "go.nvim": { "branch": "master", "commit": "c6d5ca26377d01c4de1f7bff1cd62c8b43baa6bc" },
-  "gruvbox-material": { "branch": "master", "commit": "055aefde5fd49018f3a858bca7b529bc2e08c02b" },
+  "gruvbox-material": { "branch": "master", "commit": "e41451337d33997aff4c078a83165a9f66e2d38d" },
   "guihua.lua": { "branch": "master", "commit": "d783191eaa75215beae0c80319fcce5e6b3beeda" },
-  "image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" },
+  "image.nvim": { "branch": "master", "commit": "f1163cc2f6fff5b0de7c23c7502eee0df23a3e0e" },
   "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
   "kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" },
-  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
   "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
   "luvit-meta": { "branch": "main", "commit": "55709f183b0742a7e4f47688c284f81148ad4dc0" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.nvim": { "branch": "main", "commit": "e91e854299429c986888711668743711acd8a14b" },
+  "mini.nvim": { "branch": "main", "commit": "b1af49d98233180c6045e81f4aef5b663d032b62" },
   "monokai-pro.nvim": { "branch": "master", "commit": "6c15e36834a624a32f46c6db8f9fc063995b24b6" },
   "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
   "nightfox.nvim": { "branch": "main", "commit": "595ffb8f291fc4a9bef3201a28b7c0379a41cdee" },
   "nordic.nvim": { "branch": "main", "commit": "1ee4044077059b34eacd18d93613495a602c131f" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
-  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
+  "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
   "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" },
   "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
   "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" },
-  "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" },
+  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" },
+  "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-treesitter": { "branch": "master", "commit": "5f78e989243f9fb0fb55e0cf54820920d86dfd30" },
+  "nvim-treesitter": { "branch": "master", "commit": "622a4a6ba76d1de52b72a965159213ae655b4ac7" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4adeeaa7a32d46cf3b5833341358c797304f950a" },
+  "nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "rose-pine": { "branch": "main", "commit": "91548dca53b36dbb9d36c10f114385f759731be1" },
-  "rustaceanvim": { "branch": "master", "commit": "6db1fe9e3f005b2e0921c7302d2c195eeb90a451" },
+  "rustaceanvim": { "branch": "master", "commit": "0a1876b970ab946be3f4d341e9d743a5d62d646a" },
-  "sonokai": { "branch": "master", "commit": "1d7ca954792dfddd9e73c53563d85adaeb8c8437" },
+  "sonokai": { "branch": "master", "commit": "836ad3994d3d0eaea68126cabddf6319508584e8" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" },
+  "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
-  "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }
+  "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
 }

nvim/lua/custom/plugins/git.lua

@@ -0,0 +1,21 @@
+return {
+    -- {
+    --     'akinsho/git-conflict.nvim',
+    --     version = '*',
+    --     config = function()
+    --         require('git-conflict').setup {
+    --             default_mappings = false, -- disable buffer local mapping created by this plugin
+    --             default_commands = true, -- disable commands created by this plugin
+    --             disable_diagnostics = false, -- This will disable the diagnostics in a buffer whilst it is conflicted
+    --             list_opener = 'copen', -- command or function to open the conflicts list
+    --             highlights = { -- They must have background color, otherwise the default color will be used
+    --                 incoming = 'DiffAdd',
+    --                 current = 'DiffText',
+    --             },
+    --         }
+    --     end,
+    -- },
+    {
+        'sindrets/diffview.nvim',
+    },
+}

nvim/lua/kickstart/plugins/autoformat.lua

@@ -70,4 +70,5 @@ return {
             },
         },
     },
-}
+}
+

nvim/lua/kickstart/plugins/mini.lua

@@ -39,4 +39,3 @@ return {
         end,
     },
 }
-

nvim/lua/kickstart/plugins/themes.lua

@@ -5,9 +5,9 @@
 -- Чтоб сменить стандартную тему, надо раскомментировать vim.cmd.colorscheme пад именем темы
 -- и закомментировать это же у прошлой темы
 
--- В lazy.nvim параметр priority определяет порядок загрузки плагинов. 
+-- В lazy.nvim параметр priority определяет порядок загрузки плагинов.
--- Чем выше значение priority, тем раньше загружается плагин. 
+-- Чем выше значение priority, тем раньше загружается плагин.
--- Это особенно важно для тем, поскольку они часто требуют загрузки до других плагинов, 
+-- Это особенно важно для тем, поскольку они часто требуют загрузки до других плагинов,
 -- чтобы корректно применить стили.
 
 -- https://dotfyle.com/neovim/colorscheme/top
@@ -17,18 +17,17 @@ local variants = { 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espres
 
 -- Создаем псевдонимы для каждой темы
 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
 
-
 return {
     {
         'folke/tokyonight.nvim',
@@ -62,7 +61,7 @@ return {
         name = 'catppuccin',
         priority = 1000,
         config = function()
-            -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe', 
+            -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe',
             -- 'catppuccin-macchiato', 'catppuccin-mocha'
             -- vim.cmd.colorscheme 'catppuccin'
         end,
@@ -71,12 +70,12 @@ return {
         'rebelot/kanagawa.nvim',
         priority = 1000,
         config = function()
-            -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus', 
+            -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus',
             -- vim.cmd.colorscheme 'kanagawa-dragon'
         end,
     },
     {
-        "EdenEast/nightfox.nvim",
+        'EdenEast/nightfox.nvim',
         priority = 1000,
         config = function()
             -- 'nightfox', 'dayfox', 'dawnfox', 'duskfox'
@@ -147,4 +146,5 @@ return {
             -- vim.cmd.colorscheme 'edge'
         end,
     },
-}
+}
+

nvim/lua/kickstart/plugins/todo-comments.lua

@@ -8,4 +8,3 @@ return {
         opts = { signs = false },
     },
 }
-

nvim/lua/kickstart/plugins/vim-sleuth.lua

@@ -1,4 +1,5 @@
 -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
 return {
     'tpope/vim-sleuth', -- Detect expandtab and shiftwidth automatically
-}
+}
+

nvim/lua/kickstart/settings.lua

@@ -19,6 +19,7 @@ vim.opt.relativenumber = true
 
 -- Табуляция в 4 символа
 vim.opt.tabstop = 4
+-- vim.opt.shiftwidth = 4
 
 -- Enable mouse mode, can be useful for resizing splits for example!
 vim.opt.mouse = 'a'