From bf3234ca18f2b917e74b787ed81776f0eea45b8e Mon Sep 17 00:00:00 2001
From: Adam Bellinson <thread@threadbox.net>
Date: Sun, 17 Dec 2023 00:54:17 -0500
Subject: [PATCH] ..

---
 lua/custom/chadrc.lua   |  4 ++--
 lua/custom/mappings.lua |  3 +++
 lua/custom/plugins.lua  | 13 +++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lua/custom/chadrc.lua b/lua/custom/chadrc.lua
index 14bb152..b997e1f 100644
--- a/lua/custom/chadrc.lua
+++ b/lua/custom/chadrc.lua
@@ -5,8 +5,8 @@ local M = {}
 local highlights = require "custom.highlights"
 
 M.ui = {
-  theme = "ashes",
-  theme_toggle = { "ashes", "one_light" },
+  theme = "chadtain",
+  theme_toggle = { "chadtain", "one_light" },
 
   hl_override = highlights.override,
   hl_add = highlights.add,
diff --git a/lua/custom/mappings.lua b/lua/custom/mappings.lua
index 688234f..67161dd 100644
--- a/lua/custom/mappings.lua
+++ b/lua/custom/mappings.lua
@@ -44,6 +44,9 @@ M.general = {
     ["<leader>b"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
 
     -- ["<A-Space>"] = cmp.mapping.complete(),
+
+    ["gu"] = { "<cmd>diffget //2<CR>", "Select left in conflict"},
+    ["gh"] = { "<cmd>diffget //3<CR>", "Select right in conflict"},
   },
   v = {
     [">"] = { ">gv", "indent" },
diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua
index 4cd97e0..96336cd 100644
--- a/lua/custom/plugins.lua
+++ b/lua/custom/plugins.lua
@@ -126,8 +126,21 @@ local plugins = {
     end,
   },
 
+  {
+    "nvim-treesitter/nvim-treesitter-context",
+    lazy = false,
+    opts = { max_lines = 6 },
+  },
+
   { "tpope/vim-surround", lazy = false },
 
+  { "tpope/vim-fugitive" },
+
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    enabled = false,
+  },
+
   -- To make a plugin not be loaded
   -- {
   --   "NvChad/nvim-colorizer.lua",