From b16dc0991b074273dc59a5088b1b9890a3052df9 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/core/default_config.lua |  5 ++++-
 lua/custom/chadrc.lua       |  4 ++--
 lua/custom/mappings.lua     |  3 +++
 lua/custom/plugins.lua      | 13 +++++++++++++
 lua/plugins/init.lua        | 20 +++++++++-----------
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/lua/core/default_config.lua b/lua/core/default_config.lua
index 639916a..0806907 100644
--- a/lua/core/default_config.lua
+++ b/lua/core/default_config.lua
@@ -34,7 +34,7 @@ M.ui = {
     theme = "default", -- default/vscode/vscode_colored/minimal
     -- default/round/block/arrow separators work only for default statusline theme
     -- round and block will work for minimal theme only
-    separator_style = "default",
+    separator_style = "arrow",
     overriden_modules = nil,
   },
 
@@ -44,6 +44,9 @@ M.ui = {
     enabled = true,
     lazyload = true,
     overriden_modules = nil,
+    buttons = function()
+      return ""
+    end,
   },
 
   -- nvdash (dashboard)
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",
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index 26e0945..03e01a6 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -96,18 +96,16 @@ local default_plugins = {
       vim.api.nvim_create_autocmd({ "BufRead" }, {
         group = vim.api.nvim_create_augroup("GitSignsLazyLoad", { clear = true }),
         callback = function()
-          vim.fn.jobstart({"git", "-C", vim.loop.cwd(), "rev-parse"},
-            {
-              on_exit = function(_, return_code)
-                if return_code == 0 then
-                  vim.api.nvim_del_augroup_by_name "GitSignsLazyLoad"
-                  vim.schedule(function()
-                    require("lazy").load { plugins = { "gitsigns.nvim" } }
-                  end)
-                end
+          vim.fn.jobstart({ "git", "-C", vim.loop.cwd(), "rev-parse" }, {
+            on_exit = function(_, return_code)
+              if return_code == 0 then
+                vim.api.nvim_del_augroup_by_name "GitSignsLazyLoad"
+                vim.schedule(function()
+                  require("lazy").load { plugins = { "gitsigns.nvim" } }
+                end)
               end
-            }
-          )
+            end,
+          })
         end,
       })
     end,