feat: adds git conflict and extended rainbow

ImenKedir · Dec 1, 2022 · 16f2f05 · 16f2f05
1 parent 7f748a1
commit 16f2f05
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/init.lua b/init.lua
@@ -32,3 +32,4 @@ require("config.toggleterm")
 require("config.cursorline")
 require("config.color-highlight")
 require("config.tmux")
+require("config.git-conflict")
diff --git a/lua/config/git-conflict.lua b/lua/config/git-conflict.lua
@@ -0,0 +1,3 @@
+import("git-conflict", function (gitConflict)
+  gitConflict.setup()
+end)
diff --git a/lua/config/plugins.lua b/lua/config/plugins.lua
@@ -60,6 +60,7 @@ return packer.startup(function(use)
 	use("yamatsum/nvim-cursorline")
 	use("brenoprata10/nvim-highlight-colors")
 	use("ThePrimeagen/harpoon")
+  use("akinsho/git-conflict.nvim")
 
 	-- Colorschemes
 	use("kvrohit/mellow.nvim")

diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua
@@ -29,7 +29,7 @@ import("nvim-treesitter.configs", function(treesitter)
 		},
 		rainbow = {
 			enable = true,
-			extended_mode = false,
+			extended_mode = true,
 		},
 		autotag = {
 			enable = true,