diff --git a/nvim/.config/nvim/lua/romanzy/plugins/oil.lua b/nvim/.config/nvim/lua/romanzy/plugins/oil.lua index 99b2c9d..69c66e2 100644 --- a/nvim/.config/nvim/lua/romanzy/plugins/oil.lua +++ b/nvim/.config/nvim/lua/romanzy/plugins/oil.lua @@ -3,8 +3,23 @@ vim.pack.add({ src = "https://github.com/stevearc/oil.nvim", name = "oil.nvim", }, + { + src = "https://github.com/malewicz1337/oil-git.nvim", + name = "oil-git.nvim", + }, }) +local function set_oil_git_highlights() + vim.api.nvim_set_hl(0, "OilGitAdded", { link = "MiniDiffSignAdd" }) + vim.api.nvim_set_hl(0, "OilGitUntracked", { link = "MiniDiffSignAdd" }) + vim.api.nvim_set_hl(0, "OilGitModifiedStaged", { link = "MiniDiffSignChange" }) + vim.api.nvim_set_hl(0, "OilGitModifiedUnstaged", { link = "MiniDiffSignChange" }) + vim.api.nvim_set_hl(0, "OilGitRenamed", { link = "MiniDiffSignChange" }) + vim.api.nvim_set_hl(0, "OilGitCopied", { link = "MiniDiffSignChange" }) + vim.api.nvim_set_hl(0, "OilGitDeleted", { link = "MiniDiffSignDelete" }) + vim.api.nvim_set_hl(0, "OilGitConflict", { link = "MiniDiffSignDelete" }) +end + require("oil").setup({ keymaps = { [""] = false, @@ -27,3 +42,17 @@ require("oil").setup({ end, }, }) + +require("oil-git").setup({ + show_file_highlights = true, + show_directory_highlights = true, + show_file_symbols = true, + show_directory_symbols = true, + symbol_position = "none", +}) + +set_oil_git_highlights() +vim.api.nvim_create_autocmd("ColorScheme", { + group = vim.api.nvim_create_augroup("romanzy_oil_git_highlights", { clear = true }), + callback = set_oil_git_highlights, +}) diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 58cf8b5..1c18167 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -24,6 +24,10 @@ "rev": "4916d6592ede8c07973490d9322f187e07dfefac", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, + "oil-git.nvim": { + "rev": "54de208323d00c519e26280f8b5b4b821d32f955", + "src": "https://github.com/malewicz1337/oil-git.nvim" + }, "oil.nvim": { "rev": "b73018b75affd13fa38e2fc94ef753b465f770d7", "src": "https://github.com/stevearc/oil.nvim"