From 200e308561696754a96a3e4425df2c9fe241880c Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Fri, 10 Jun 2022 17:21:55 +0530
Subject: [PATCH] restructure file module structure

---
 README.md                                      |  2 +-
 lua/{ => base46}/chadlights.lua                |  6 +++---
 lua/{ => base46}/colors.lua                    |  0
 lua/{nv_glassy.lua => base46/glassy.lua}       |  0
 lua/{base46.lua => base46/init.lua}            | 13 +++----------
 lua/{ => base46}/integrations/bufferline.lua   |  5 +++++
 lua/{ => base46}/integrations/cmp.lua          |  0
 lua/{ => base46}/integrations/devicons.lua     |  0
 lua/{ => base46}/integrations/git.lua          |  0
 lua/{ => base46}/integrations/gps.lua          |  0
 lua/{ => base46}/integrations/mail.lua         |  0
 lua/{ => base46}/integrations/misc.lua         |  0
 lua/{ => base46}/integrations/nvchad.lua       |  0
 lua/{ => base46}/integrations/nvimtree.lua     |  0
 lua/{ => base46}/integrations/statusline.lua   |  2 +-
 lua/{ => base46}/integrations/syntax.lua       |  0
 lua/{ => base46}/integrations/telescope.lua    |  0
 lua/{ => base46}/integrations/treesitter.lua   |  0
 lua/base46/term.lua                            | 18 ++++++++++++++++++
 lua/{hl_themes => base46/themes}/aquarium.lua  |  0
 lua/{hl_themes => base46/themes}/ayu-dark.lua  |  0
 lua/{hl_themes => base46/themes}/blossom.lua   |  0
 .../themes}/catppuccin.lua                     |  0
 .../themes}/chadracula.lua                     |  0
 lua/{hl_themes => base46/themes}/chadtain.lua  |  0
 lua/{hl_themes => base46/themes}/chocolate.lua |  0
 lua/{hl_themes => base46/themes}/decay.lua     |  0
 lua/{hl_themes => base46/themes}/doomchad.lua  |  0
 .../themes}/everforest.lua                     |  0
 .../themes}/everforest_light.lua               |  0
 .../themes}/gatekeeper.lua                     |  0
 lua/{hl_themes => base46/themes}/gruvbox.lua   |  0
 .../themes}/gruvbox_light.lua                  |  0
 lua/{hl_themes => base46/themes}/gruvchad.lua  |  0
 .../themes}/jellybeans.lua                     |  0
 lua/{hl_themes => base46/themes}/kanagawa.lua  |  0
 lua/{hl_themes => base46/themes}/monekai.lua   |  0
 lua/{hl_themes => base46/themes}/mountain.lua  |  0
 lua/{hl_themes => base46/themes}/nightfox.lua  |  0
 lua/{hl_themes => base46/themes}/nightlamp.lua |  0
 lua/{hl_themes => base46/themes}/nightowl.lua  |  0
 lua/{hl_themes => base46/themes}/nord.lua      |  0
 lua/{hl_themes => base46/themes}/one_light.lua |  0
 lua/{hl_themes => base46/themes}/onedark.lua   |  2 +-
 lua/{hl_themes => base46/themes}/onenord.lua   |  0
 .../themes}/onenord_light.lua                  |  0
 lua/{hl_themes => base46/themes}/palenight.lua |  0
 .../themes}/pastelDark.lua                     |  0
 lua/{hl_themes => base46/themes}/radium.lua    |  0
 lua/{hl_themes => base46/themes}/rosepine.lua  |  0
 lua/{hl_themes => base46/themes}/rxyhn.lua     |  0
 lua/{hl_themes => base46/themes}/tokyodark.lua |  0
 .../themes}/tokyonight.lua                     |  0
 .../themes}/tomorrow_night.lua                 |  0
 .../themes}/vscode_dark.lua                    |  0
 lua/{hl_themes => base46/themes}/wombat.lua    |  0
 56 files changed, 32 insertions(+), 16 deletions(-)
 rename lua/{ => base46}/chadlights.lua (91%)
 rename lua/{ => base46}/colors.lua (100%)
 rename lua/{nv_glassy.lua => base46/glassy.lua} (100%)
 rename lua/{base46.lua => base46/init.lua} (89%)
 rename lua/{ => base46}/integrations/bufferline.lua (96%)
 rename lua/{ => base46}/integrations/cmp.lua (100%)
 rename lua/{ => base46}/integrations/devicons.lua (100%)
 rename lua/{ => base46}/integrations/git.lua (100%)
 rename lua/{ => base46}/integrations/gps.lua (100%)
 rename lua/{ => base46}/integrations/mail.lua (100%)
 rename lua/{ => base46}/integrations/misc.lua (100%)
 rename lua/{ => base46}/integrations/nvchad.lua (100%)
 rename lua/{ => base46}/integrations/nvimtree.lua (100%)
 rename lua/{ => base46}/integrations/statusline.lua (99%)
 rename lua/{ => base46}/integrations/syntax.lua (100%)
 rename lua/{ => base46}/integrations/telescope.lua (100%)
 rename lua/{ => base46}/integrations/treesitter.lua (100%)
 create mode 100644 lua/base46/term.lua
 rename lua/{hl_themes => base46/themes}/aquarium.lua (100%)
 rename lua/{hl_themes => base46/themes}/ayu-dark.lua (100%)
 rename lua/{hl_themes => base46/themes}/blossom.lua (100%)
 rename lua/{hl_themes => base46/themes}/catppuccin.lua (100%)
 rename lua/{hl_themes => base46/themes}/chadracula.lua (100%)
 rename lua/{hl_themes => base46/themes}/chadtain.lua (100%)
 rename lua/{hl_themes => base46/themes}/chocolate.lua (100%)
 rename lua/{hl_themes => base46/themes}/decay.lua (100%)
 rename lua/{hl_themes => base46/themes}/doomchad.lua (100%)
 rename lua/{hl_themes => base46/themes}/everforest.lua (100%)
 rename lua/{hl_themes => base46/themes}/everforest_light.lua (100%)
 rename lua/{hl_themes => base46/themes}/gatekeeper.lua (100%)
 rename lua/{hl_themes => base46/themes}/gruvbox.lua (100%)
 rename lua/{hl_themes => base46/themes}/gruvbox_light.lua (100%)
 rename lua/{hl_themes => base46/themes}/gruvchad.lua (100%)
 rename lua/{hl_themes => base46/themes}/jellybeans.lua (100%)
 rename lua/{hl_themes => base46/themes}/kanagawa.lua (100%)
 rename lua/{hl_themes => base46/themes}/monekai.lua (100%)
 rename lua/{hl_themes => base46/themes}/mountain.lua (100%)
 rename lua/{hl_themes => base46/themes}/nightfox.lua (100%)
 rename lua/{hl_themes => base46/themes}/nightlamp.lua (100%)
 rename lua/{hl_themes => base46/themes}/nightowl.lua (100%)
 rename lua/{hl_themes => base46/themes}/nord.lua (100%)
 rename lua/{hl_themes => base46/themes}/one_light.lua (100%)
 rename lua/{hl_themes => base46/themes}/onedark.lua (98%)
 rename lua/{hl_themes => base46/themes}/onenord.lua (100%)
 rename lua/{hl_themes => base46/themes}/onenord_light.lua (100%)
 rename lua/{hl_themes => base46/themes}/palenight.lua (100%)
 rename lua/{hl_themes => base46/themes}/pastelDark.lua (100%)
 rename lua/{hl_themes => base46/themes}/radium.lua (100%)
 rename lua/{hl_themes => base46/themes}/rosepine.lua (100%)
 rename lua/{hl_themes => base46/themes}/rxyhn.lua (100%)
 rename lua/{hl_themes => base46/themes}/tokyodark.lua (100%)
 rename lua/{hl_themes => base46/themes}/tokyonight.lua (100%)
 rename lua/{hl_themes => base46/themes}/tomorrow_night.lua (100%)
 rename lua/{hl_themes => base46/themes}/vscode_dark.lua (100%)
 rename lua/{hl_themes => base46/themes}/wombat.lua (100%)

diff --git a/README.md b/README.md
index e887130..e8b731c 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ## Contribute for new themes 
 
-- go to hl_themes and add your file, ex: atheme.lua
+- go to base46/themes and add your file, ex: atheme.lua
 ```lua
 -- atheme.lua file be like 
 
diff --git a/lua/chadlights.lua b/lua/base46/chadlights.lua
similarity index 91%
rename from lua/chadlights.lua
rename to lua/base46/chadlights.lua
index 3162094..d1568de 100644
--- a/lua/chadlights.lua
+++ b/lua/base46/chadlights.lua
@@ -3,7 +3,7 @@ local ui = require("core.utils").load_config().ui
 local merge_tb = require("base46").merge_tb
 
 local highlights = {}
-local hl_dir = vim.fn.stdpath "data" .. "/site/pack/packer/opt/base46/lua/integrations"
+local hl_dir = vim.fn.stdpath "data" .. "/site/pack/packer/opt/base46/lua/base46/integrations"
 
 -- push hl_dir file names to table
 local hl_files = require("plenary.scandir").scan_dir(hl_dir, {})
@@ -12,7 +12,7 @@ for _, file in ipairs(hl_files) do
    local a = vim.fn.fnamemodify(file, ":t")
    a = vim.fn.fnamemodify(a, ":r")
 
-   local integration = require("integrations." .. a)
+   local integration = require("base46.integrations." .. a)
    highlights = merge_tb(highlights, integration)
 end
 
@@ -48,7 +48,7 @@ end
 
 -- local set_transparent = nvchad.load_config().ui.transparency
 if vim.g.transparency then
-   highlights = merge_tb(highlights, require "nv_glassy")
+   highlights = merge_tb(highlights, require "base46.glassy")
 end
 
 -- finally set all highlights :D
diff --git a/lua/colors.lua b/lua/base46/colors.lua
similarity index 100%
rename from lua/colors.lua
rename to lua/base46/colors.lua
diff --git a/lua/nv_glassy.lua b/lua/base46/glassy.lua
similarity index 100%
rename from lua/nv_glassy.lua
rename to lua/base46/glassy.lua
diff --git a/lua/base46.lua b/lua/base46/init.lua
similarity index 89%
rename from lua/base46.lua
rename to lua/base46/init.lua
index c2c46a3..737fe93 100644
--- a/lua/base46.lua
+++ b/lua/base46/init.lua
@@ -3,7 +3,7 @@ local g = vim.g
 local config = require("core.utils").load_config()
 
 M.get_theme_tb = function(name, type)
-   local default_path = "hl_themes." .. name
+   local default_path = "base46.themes." .. name
    local user_path = "custom.themes." .. name
 
    local present1, default_theme = pcall(require, default_path)
@@ -46,15 +46,8 @@ M.load_theme = function()
    local theme_type = M.get_theme_tb(g.nvchad_theme, "type") -- dark/light
    vim.opt.bg = theme_type
 
-   M.clear_highlights "BufferLine"
-   M.clear_highlights "TS"
-
-   -- reload highlights for theme switcher
-   require("plenary.reload").reload_module "integrations"
-   require("plenary.reload").reload_module "chadlights"
-   require("plenary.reload").reload_module "custom"
-
-   require "chadlights"
+   require "base46.term"
+   require "base46.chadlights"
 end
 
 M.override_theme = function(default_theme, theme_name)
diff --git a/lua/integrations/bufferline.lua b/lua/base46/integrations/bufferline.lua
similarity index 96%
rename from lua/integrations/bufferline.lua
rename to lua/base46/integrations/bufferline.lua
index 8f51aa0..d4f3ea8 100644
--- a/lua/integrations/bufferline.lua
+++ b/lua/base46/integrations/bufferline.lua
@@ -7,6 +7,11 @@ return {
       bg = colors.black2,
    },
 
+   BufferlineIndicatorVisible = {
+      fg = colors.black2,
+      bg = colors.black2,
+   },
+
    -- buffers
    BufferLineBufferSelected = {
       fg = colors.white,
diff --git a/lua/integrations/cmp.lua b/lua/base46/integrations/cmp.lua
similarity index 100%
rename from lua/integrations/cmp.lua
rename to lua/base46/integrations/cmp.lua
diff --git a/lua/integrations/devicons.lua b/lua/base46/integrations/devicons.lua
similarity index 100%
rename from lua/integrations/devicons.lua
rename to lua/base46/integrations/devicons.lua
diff --git a/lua/integrations/git.lua b/lua/base46/integrations/git.lua
similarity index 100%
rename from lua/integrations/git.lua
rename to lua/base46/integrations/git.lua
diff --git a/lua/integrations/gps.lua b/lua/base46/integrations/gps.lua
similarity index 100%
rename from lua/integrations/gps.lua
rename to lua/base46/integrations/gps.lua
diff --git a/lua/integrations/mail.lua b/lua/base46/integrations/mail.lua
similarity index 100%
rename from lua/integrations/mail.lua
rename to lua/base46/integrations/mail.lua
diff --git a/lua/integrations/misc.lua b/lua/base46/integrations/misc.lua
similarity index 100%
rename from lua/integrations/misc.lua
rename to lua/base46/integrations/misc.lua
diff --git a/lua/integrations/nvchad.lua b/lua/base46/integrations/nvchad.lua
similarity index 100%
rename from lua/integrations/nvchad.lua
rename to lua/base46/integrations/nvchad.lua
diff --git a/lua/integrations/nvimtree.lua b/lua/base46/integrations/nvimtree.lua
similarity index 100%
rename from lua/integrations/nvimtree.lua
rename to lua/base46/integrations/nvimtree.lua
diff --git a/lua/integrations/statusline.lua b/lua/base46/integrations/statusline.lua
similarity index 99%
rename from lua/integrations/statusline.lua
rename to lua/base46/integrations/statusline.lua
index 078de54..4e91bd5 100644
--- a/lua/integrations/statusline.lua
+++ b/lua/base46/integrations/statusline.lua
@@ -177,7 +177,7 @@ return {
    },
 
    St_cwd_icon = {
-      fg = colors.black,
+      fg = colors.one_bg,
       bg = colors.red,
    },
 
diff --git a/lua/integrations/syntax.lua b/lua/base46/integrations/syntax.lua
similarity index 100%
rename from lua/integrations/syntax.lua
rename to lua/base46/integrations/syntax.lua
diff --git a/lua/integrations/telescope.lua b/lua/base46/integrations/telescope.lua
similarity index 100%
rename from lua/integrations/telescope.lua
rename to lua/base46/integrations/telescope.lua
diff --git a/lua/integrations/treesitter.lua b/lua/base46/integrations/treesitter.lua
similarity index 100%
rename from lua/integrations/treesitter.lua
rename to lua/base46/integrations/treesitter.lua
diff --git a/lua/base46/term.lua b/lua/base46/term.lua
new file mode 100644
index 0000000..79cc970
--- /dev/null
+++ b/lua/base46/term.lua
@@ -0,0 +1,18 @@
+local colors = require("base46").get_colors "base_16"
+
+vim.g.terminal_color_0 = colors.base00
+vim.g.terminal_color_1 = colors.base08
+vim.g.terminal_color_2 = colors.base0B
+vim.g.terminal_color_3 = colors.base0A
+vim.g.terminal_color_4 = colors.base0D
+vim.g.terminal_color_5 = colors.base0E
+vim.g.terminal_color_6 = colors.base0C
+vim.g.terminal_color_7 = colors.base05
+vim.g.terminal_color_8 = colors.base03
+vim.g.terminal_color_9 = colors.base08
+vim.g.terminal_color_10 = colors.base0B
+vim.g.terminal_color_11 = colors.base0A
+vim.g.terminal_color_12 = colors.base0D
+vim.g.terminal_color_13 = colors.base0E
+vim.g.terminal_color_14 = colors.base0C
+vim.g.terminal_color_15 = colors.base07
diff --git a/lua/hl_themes/aquarium.lua b/lua/base46/themes/aquarium.lua
similarity index 100%
rename from lua/hl_themes/aquarium.lua
rename to lua/base46/themes/aquarium.lua
diff --git a/lua/hl_themes/ayu-dark.lua b/lua/base46/themes/ayu-dark.lua
similarity index 100%
rename from lua/hl_themes/ayu-dark.lua
rename to lua/base46/themes/ayu-dark.lua
diff --git a/lua/hl_themes/blossom.lua b/lua/base46/themes/blossom.lua
similarity index 100%
rename from lua/hl_themes/blossom.lua
rename to lua/base46/themes/blossom.lua
diff --git a/lua/hl_themes/catppuccin.lua b/lua/base46/themes/catppuccin.lua
similarity index 100%
rename from lua/hl_themes/catppuccin.lua
rename to lua/base46/themes/catppuccin.lua
diff --git a/lua/hl_themes/chadracula.lua b/lua/base46/themes/chadracula.lua
similarity index 100%
rename from lua/hl_themes/chadracula.lua
rename to lua/base46/themes/chadracula.lua
diff --git a/lua/hl_themes/chadtain.lua b/lua/base46/themes/chadtain.lua
similarity index 100%
rename from lua/hl_themes/chadtain.lua
rename to lua/base46/themes/chadtain.lua
diff --git a/lua/hl_themes/chocolate.lua b/lua/base46/themes/chocolate.lua
similarity index 100%
rename from lua/hl_themes/chocolate.lua
rename to lua/base46/themes/chocolate.lua
diff --git a/lua/hl_themes/decay.lua b/lua/base46/themes/decay.lua
similarity index 100%
rename from lua/hl_themes/decay.lua
rename to lua/base46/themes/decay.lua
diff --git a/lua/hl_themes/doomchad.lua b/lua/base46/themes/doomchad.lua
similarity index 100%
rename from lua/hl_themes/doomchad.lua
rename to lua/base46/themes/doomchad.lua
diff --git a/lua/hl_themes/everforest.lua b/lua/base46/themes/everforest.lua
similarity index 100%
rename from lua/hl_themes/everforest.lua
rename to lua/base46/themes/everforest.lua
diff --git a/lua/hl_themes/everforest_light.lua b/lua/base46/themes/everforest_light.lua
similarity index 100%
rename from lua/hl_themes/everforest_light.lua
rename to lua/base46/themes/everforest_light.lua
diff --git a/lua/hl_themes/gatekeeper.lua b/lua/base46/themes/gatekeeper.lua
similarity index 100%
rename from lua/hl_themes/gatekeeper.lua
rename to lua/base46/themes/gatekeeper.lua
diff --git a/lua/hl_themes/gruvbox.lua b/lua/base46/themes/gruvbox.lua
similarity index 100%
rename from lua/hl_themes/gruvbox.lua
rename to lua/base46/themes/gruvbox.lua
diff --git a/lua/hl_themes/gruvbox_light.lua b/lua/base46/themes/gruvbox_light.lua
similarity index 100%
rename from lua/hl_themes/gruvbox_light.lua
rename to lua/base46/themes/gruvbox_light.lua
diff --git a/lua/hl_themes/gruvchad.lua b/lua/base46/themes/gruvchad.lua
similarity index 100%
rename from lua/hl_themes/gruvchad.lua
rename to lua/base46/themes/gruvchad.lua
diff --git a/lua/hl_themes/jellybeans.lua b/lua/base46/themes/jellybeans.lua
similarity index 100%
rename from lua/hl_themes/jellybeans.lua
rename to lua/base46/themes/jellybeans.lua
diff --git a/lua/hl_themes/kanagawa.lua b/lua/base46/themes/kanagawa.lua
similarity index 100%
rename from lua/hl_themes/kanagawa.lua
rename to lua/base46/themes/kanagawa.lua
diff --git a/lua/hl_themes/monekai.lua b/lua/base46/themes/monekai.lua
similarity index 100%
rename from lua/hl_themes/monekai.lua
rename to lua/base46/themes/monekai.lua
diff --git a/lua/hl_themes/mountain.lua b/lua/base46/themes/mountain.lua
similarity index 100%
rename from lua/hl_themes/mountain.lua
rename to lua/base46/themes/mountain.lua
diff --git a/lua/hl_themes/nightfox.lua b/lua/base46/themes/nightfox.lua
similarity index 100%
rename from lua/hl_themes/nightfox.lua
rename to lua/base46/themes/nightfox.lua
diff --git a/lua/hl_themes/nightlamp.lua b/lua/base46/themes/nightlamp.lua
similarity index 100%
rename from lua/hl_themes/nightlamp.lua
rename to lua/base46/themes/nightlamp.lua
diff --git a/lua/hl_themes/nightowl.lua b/lua/base46/themes/nightowl.lua
similarity index 100%
rename from lua/hl_themes/nightowl.lua
rename to lua/base46/themes/nightowl.lua
diff --git a/lua/hl_themes/nord.lua b/lua/base46/themes/nord.lua
similarity index 100%
rename from lua/hl_themes/nord.lua
rename to lua/base46/themes/nord.lua
diff --git a/lua/hl_themes/one_light.lua b/lua/base46/themes/one_light.lua
similarity index 100%
rename from lua/hl_themes/one_light.lua
rename to lua/base46/themes/one_light.lua
diff --git a/lua/hl_themes/onedark.lua b/lua/base46/themes/onedark.lua
similarity index 98%
rename from lua/hl_themes/onedark.lua
rename to lua/base46/themes/onedark.lua
index a5196f5..dc6be61 100644
--- a/lua/hl_themes/onedark.lua
+++ b/lua/base46/themes/onedark.lua
@@ -29,7 +29,7 @@ M.base_30 = {
    cyan = "#a3b8ef",
    statusline_bg = "#22262e",
    lightbg = "#2d3139",
-   pmenu_bg = "#98c379",
+   pmenu_bg = "#61afef",
    folder_bg = "#61afef",
 }
 
diff --git a/lua/hl_themes/onenord.lua b/lua/base46/themes/onenord.lua
similarity index 100%
rename from lua/hl_themes/onenord.lua
rename to lua/base46/themes/onenord.lua
diff --git a/lua/hl_themes/onenord_light.lua b/lua/base46/themes/onenord_light.lua
similarity index 100%
rename from lua/hl_themes/onenord_light.lua
rename to lua/base46/themes/onenord_light.lua
diff --git a/lua/hl_themes/palenight.lua b/lua/base46/themes/palenight.lua
similarity index 100%
rename from lua/hl_themes/palenight.lua
rename to lua/base46/themes/palenight.lua
diff --git a/lua/hl_themes/pastelDark.lua b/lua/base46/themes/pastelDark.lua
similarity index 100%
rename from lua/hl_themes/pastelDark.lua
rename to lua/base46/themes/pastelDark.lua
diff --git a/lua/hl_themes/radium.lua b/lua/base46/themes/radium.lua
similarity index 100%
rename from lua/hl_themes/radium.lua
rename to lua/base46/themes/radium.lua
diff --git a/lua/hl_themes/rosepine.lua b/lua/base46/themes/rosepine.lua
similarity index 100%
rename from lua/hl_themes/rosepine.lua
rename to lua/base46/themes/rosepine.lua
diff --git a/lua/hl_themes/rxyhn.lua b/lua/base46/themes/rxyhn.lua
similarity index 100%
rename from lua/hl_themes/rxyhn.lua
rename to lua/base46/themes/rxyhn.lua
diff --git a/lua/hl_themes/tokyodark.lua b/lua/base46/themes/tokyodark.lua
similarity index 100%
rename from lua/hl_themes/tokyodark.lua
rename to lua/base46/themes/tokyodark.lua
diff --git a/lua/hl_themes/tokyonight.lua b/lua/base46/themes/tokyonight.lua
similarity index 100%
rename from lua/hl_themes/tokyonight.lua
rename to lua/base46/themes/tokyonight.lua
diff --git a/lua/hl_themes/tomorrow_night.lua b/lua/base46/themes/tomorrow_night.lua
similarity index 100%
rename from lua/hl_themes/tomorrow_night.lua
rename to lua/base46/themes/tomorrow_night.lua
diff --git a/lua/hl_themes/vscode_dark.lua b/lua/base46/themes/vscode_dark.lua
similarity index 100%
rename from lua/hl_themes/vscode_dark.lua
rename to lua/base46/themes/vscode_dark.lua
diff --git a/lua/hl_themes/wombat.lua b/lua/base46/themes/wombat.lua
similarity index 100%
rename from lua/hl_themes/wombat.lua
rename to lua/base46/themes/wombat.lua