diff --git a/init.lua b/init.lua index 53da3a6..7041b39 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,6 @@ require ("core.options") require("core.utils").load_mappings() --- require("colors").core_setup() +-- require("ui").setup_colorscheme() -- add binaries installed by mason.nvim to path vim.env.PATH = vim.env.PATH .. ":" .. vim.fn.stdpath "data" .. "/mason/bin" diff --git a/lua/plugins/configs/cmp.lua b/lua/plugins/configs/cmp.lua index af1114b..237fccd 100644 --- a/lua/plugins/configs/cmp.lua +++ b/lua/plugins/configs/cmp.lua @@ -4,7 +4,7 @@ if not present then return end -require("colors").load_highlight "cmp" +-- require("ui").load_highlight "cmp" vim.o.completeopt = "menu,menuone,noselect" diff --git a/lua/plugins/configs/treesitter.lua b/lua/plugins/configs/treesitter.lua index b8510a6..54f19d1 100644 --- a/lua/plugins/configs/treesitter.lua +++ b/lua/plugins/configs/treesitter.lua @@ -4,7 +4,7 @@ if not present then return end -require("colors").load_highlight "treesitter" +-- require("ui").load_highlight "treesitter" local options = { ensure_installed = { diff --git a/lua/colors/init.lua b/lua/ui/init.lua similarity index 50% rename from lua/colors/init.lua rename to lua/ui/init.lua index 22d4c42..5353cc6 100644 --- a/lua/colors/init.lua +++ b/lua/ui/init.lua @@ -2,12 +2,12 @@ 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") + -- local syntax = require("ui.integrations.syntax") + -- local nvim = require("ui.integrations.nvim") -- group = merge_tb("force", syntax, nvim) -- end if type(group) == "string" then - group = require("colors.integrations." .. group) + group = require("ui.integrations." .. group) end for hl, col in pairs(group) do @@ -15,11 +15,11 @@ M.load_highlight = function(group) end end -M.core_setup = function () +M.setup_colorscheme = function () -- vim.cmd('hi clear') - require("colors.term_hl") - require("colors").load_highlight "syntax" - require("colors").load_highlight "nvim" + require("ui.term_hl") + require("ui").load_highlight "syntax" + require("ui").load_highlight "nvim" end return M diff --git a/lua/colors/integrations/cmp.lua b/lua/ui/integrations/cmp.lua similarity index 96% rename from lua/colors/integrations/cmp.lua rename to lua/ui/integrations/cmp.lua index ac274a6..9a582e1 100644 --- a/lua/colors/integrations/cmp.lua +++ b/lua/ui/integrations/cmp.lua @@ -1,4 +1,4 @@ -local theme = require("colors.kdark").colors +local theme = require("ui.kdark").colors return { CmpItemKindConstant = { fg = theme.bright_red }, diff --git a/lua/colors/integrations/nvim.lua b/lua/ui/integrations/nvim.lua similarity index 97% rename from lua/colors/integrations/nvim.lua rename to lua/ui/integrations/nvim.lua index 057a486..fe1fb34 100644 --- a/lua/colors/integrations/nvim.lua +++ b/lua/ui/integrations/nvim.lua @@ -1,4 +1,4 @@ -local theme = require("colors.kdark").colors +local theme = require("ui.kdark").colors return { Comment = { fg = theme.bright_black }, diff --git a/lua/colors/integrations/syntax.lua b/lua/ui/integrations/syntax.lua similarity index 97% rename from lua/colors/integrations/syntax.lua rename to lua/ui/integrations/syntax.lua index a879f58..105b2d6 100644 --- a/lua/colors/integrations/syntax.lua +++ b/lua/ui/integrations/syntax.lua @@ -1,4 +1,4 @@ -local theme = require("colors.kdark").colors +local theme = require("ui.kdark").colors return { Boolean = { diff --git a/lua/colors/integrations/treesitter.lua b/lua/ui/integrations/treesitter.lua similarity index 98% rename from lua/colors/integrations/treesitter.lua rename to lua/ui/integrations/treesitter.lua index 65978af..9df965e 100644 --- a/lua/colors/integrations/treesitter.lua +++ b/lua/ui/integrations/treesitter.lua @@ -1,4 +1,4 @@ -local theme = require("colors.kdark").colors +local theme = require("ui.kdark").colors return { TSAnnotation = { diff --git a/lua/colors/kdark.lua b/lua/ui/kdark.lua similarity index 100% rename from lua/colors/kdark.lua rename to lua/ui/kdark.lua diff --git a/lua/colors/term_hl.lua b/lua/ui/term_hl.lua similarity index 94% rename from lua/colors/term_hl.lua rename to lua/ui/term_hl.lua index cd0fcdd..cfa9b5a 100644 --- a/lua/colors/term_hl.lua +++ b/lua/ui/term_hl.lua @@ -1,4 +1,4 @@ -local colors = require("colors.kdark").colors +local colors = require("ui.kdark").colors vim.g.terminal_color_0 = "#" .. colors.black vim.g.terminal_color_1 = "#" .. colors.red