From 0a5d53fac041c281824959a555d788471db4bf13 Mon Sep 17 00:00:00 2001
From: krolyxon <krolyxon@tutanota.com>
Date: Sat, 10 Sep 2022 15:02:23 +0530
Subject: [PATCH] move load_highlight functions to colors & term_hl

---
 init.lua                           |  4 +---
 lua/colors/init.lua                | 24 ++++++++++++++++++++++++
 lua/colors/term_hl.lua             | 18 ++++++++++++++++++
 lua/core/utils.lua                 | 16 ----------------
 lua/plugins/configs/cmp.lua        |  2 +-
 lua/plugins/configs/treesitter.lua |  2 +-
 6 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 lua/colors/init.lua
 create mode 100644 lua/colors/term_hl.lua

diff --git a/init.lua b/init.lua
index 3a17825..a89e922 100644
--- a/init.lua
+++ b/init.lua
@@ -30,6 +30,4 @@ for _, module in ipairs(modules) do
 end
 
 require("core.utils").load_mappings()
--- require("core.utils").load_highlight "syntax"
--- require("core.utils").load_highlight "nvim"
-require("core.utils").load_highlight "core"
+require("colors").core_setup()
diff --git a/lua/colors/init.lua b/lua/colors/init.lua
new file mode 100644
index 0000000..d3d7641
--- /dev/null
+++ b/lua/colors/init.lua
@@ -0,0 +1,24 @@
+local M = {}
+
+M.load_highlight = function(group)
+  -- if type(group) == "string" and group == "core" then
+  --     local syntax = require("colors.integrations.syntax")
+  --     local nvim = require("colors.integrations.nvim")
+  --     group = merge_tb("force", syntax, nvim)
+  -- end
+  if type(group) == "string" then
+    group = require("colors.integrations." .. group)
+  end
+
+  for hl, col in pairs(group) do
+    vim.api.nvim_set_hl(0, hl, col)
+  end
+end
+
+M.core_setup = function ()
+    require("colors.term_hl")
+    require("colors").load_highlight "syntax"
+    require("colors").load_highlight "nvim"
+end
+
+return M
diff --git a/lua/colors/term_hl.lua b/lua/colors/term_hl.lua
new file mode 100644
index 0000000..cd0fcdd
--- /dev/null
+++ b/lua/colors/term_hl.lua
@@ -0,0 +1,18 @@
+local colors = require("colors.kdark").colors
+
+vim.g.terminal_color_0 = "#" .. colors.black
+vim.g.terminal_color_1 = "#" .. colors.red
+vim.g.terminal_color_2 = "#" .. colors.green
+vim.g.terminal_color_3 = "#" .. colors.yellow
+vim.g.terminal_color_4 = "#" .. colors.blue
+vim.g.terminal_color_5 = "#" .. colors.magenta
+vim.g.terminal_color_6 = "#" .. colors.cyan
+vim.g.terminal_color_7 = "#" .. colors.white
+vim.g.terminal_color_8 = "#" .. colors.bright_black
+vim.g.terminal_color_9 = "#" .. colors.bright_red
+vim.g.terminal_color_10 = "#" .. colors.bright_green
+vim.g.terminal_color_11 = "#" .. colors.bright_yellow
+vim.g.terminal_color_12 = "#" .. colors.bright_blue
+vim.g.terminal_color_13 = "#" .. colors.bright_magenta
+vim.g.terminal_color_14 = "#" .. colors.bright_cyan
+vim.g.terminal_color_15 = "#" .. colors.bright_white
diff --git a/lua/core/utils.lua b/lua/core/utils.lua
index 89bc7c8..d9085f3 100644
--- a/lua/core/utils.lua
+++ b/lua/core/utils.lua
@@ -1,22 +1,6 @@
 local M = {}
 local merge_tb = vim.tbl_deep_extend
 
-
-M.load_highlight = function(group)
-  if type(group) == "string" and group == "core" then
-      local syntax = require("colors.integrations.syntax")
-      local nvim = require("colors.integrations.nvim")
-      group = merge_tb("force", syntax, nvim)
-  end
-  if type(group) == "string" then
-    group = require("colors.integrations." .. group)
-  end
-
-  for hl, col in pairs(group) do
-    vim.api.nvim_set_hl(0, hl, col)
-  end
-end
-
 M.close_buffer = function(bufnr)
     if vim.bo.buftype == "terminal" then
         vim.cmd(vim.bo.buflisted and "set nobl | enew" or "hide")
diff --git a/lua/plugins/configs/cmp.lua b/lua/plugins/configs/cmp.lua
index dd27467..01fee07 100644
--- a/lua/plugins/configs/cmp.lua
+++ b/lua/plugins/configs/cmp.lua
@@ -4,7 +4,7 @@ if not present then
     return
 end
 
-require("core.utils").load_highlight "cmp"
+require("colors").load_highlight "cmp"
 
 vim.opt.completeopt = "menuone,noselect"
 
diff --git a/lua/plugins/configs/treesitter.lua b/lua/plugins/configs/treesitter.lua
index 9fcdae3..e5b3e67 100644
--- a/lua/plugins/configs/treesitter.lua
+++ b/lua/plugins/configs/treesitter.lua
@@ -4,7 +4,7 @@ if not present then
     return
 end
 
-require("core.utils").load_highlight "treesitter"
+require("colors").load_highlight "treesitter"
 
 local options = {
     ensure_installed = {